0c179d29bf
Merge pull request #2621 from Neerti/SecBeltsReloadedAgain
...
Sec Belt quickfix
2014-02-05 13:13:59 +00:00
c3a2861bf8
Update fitness.dm
...
Extra kits in the lockers
2014-02-04 21:53:17 -05:00
061b6aab4a
Merge pull request #2607 from adrix89/Fix_1653
...
Fix 1653
2014-02-04 17:40:30 -08:00
b8329e7f2b
Fixed a few map bugs on MiniStation.
...
Added the missing mini-hoe and hatchet to the garden area.
Added reverse stations which will send pods in the opposite direction, after their stop.
Added tube terminators for you to put on the end of non-looping tubes.
2014-02-04 20:13:07 +00:00
1e9a85b672
Merge branch 'master' of https://github.com/tgstation/-tg-station
...
Merge branch 'master' of https://github.com/tgstation/-tg-station
Spray bottles doesn't make floor wet anymore.
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.
Soap cleaning and uses.
Reworked spray
Revert soap uses, if there are not easily accessible,they are fine.
Revert fixes
2014-02-04 20:00:57 +02:00
7aa8225e2a
Revert stuff keep fixes
2014-02-04 19:38:58 +02:00
bdd288174a
I love invalid paths, don't you?
2014-02-04 10:28:55 -05:00
a1104a459d
Merge branch 'hrefs-in-log' of https://github.com/Limeliz/-tg-station into hrefs-in-log
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-02-04 08:34:18 -03:00
ba1c517ad1
Grill bugfix
2014-02-04 11:49:22 +02:00
45dd35d1a7
Merge branch 'master' of https://github.com/tgstation/-tg-station into nukeops
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
Resolved
2014-02-04 01:41:27 -07:00
8dc864d819
Merge pull request #2605 from Neerti/SecBeltsReloaded
...
Attempt 2: Stun Batons can now go on your belt.
2014-02-03 21:49:45 -08:00
9092bf5c1c
Merge pull request #2438 from adrix89/attack_override
...
Attack override
2014-02-03 21:31:35 -08:00
ee3b0a77ca
Merge pull request #2598 from tkdrg/morebagsyay
...
Book bags for the librarian
2014-02-03 20:20:04 -08:00
35976a9cf8
Update fitness.dm
...
Adds LaserTag helmets to fitness lockers.
2014-02-03 23:02:12 -05:00
2f0ca13d45
Merge pull request #2575 from Jordie0608/truebagshavenolimitations
...
Bag of holding now holds everything
2014-02-03 10:47:44 -08:00
ad235cf18f
Merge pull request #2563 from Razharas/NewTables
...
New PR for crafting tables
2014-02-03 08:46:56 -08:00
5bfe0cbd61
Merge branch 'master' of https://github.com/tgstation/-tg-station into attack_override
...
Conflicts:
code/_onclick/item_attack.dm
2014-02-03 18:07:45 +02:00
c1ae410869
Fixes 1653
...
Projectiles now have a layer threshold 2.75 which is the spiderlings layer.
2014-02-03 17:15:49 +02:00
100585b33a
Enables the baton and classic baton to go on your belt. Adds an additional slot in the belt so you won't have to make room.
2014-02-03 01:31:39 -05:00
5b5d7eecb9
Merge pull request #2592 from Tenebrosity/git_gud_shoes
...
Fixes grammar of examine messages for objects that are pairs
2014-02-02 16:36:57 -08:00
e60ecbb1f4
Merge pull request #2590 from GarrusVakarian/issue#2436fix
...
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 16:08:45 -08:00
f9c0e171f1
Revert soap uses, if there are not easily accessible,they are fine.
2014-02-02 20:57:51 +02:00
6ae7051977
Removes an if check based on Pete's suggestion
...
Thanks
2014-02-03 06:18:34 +13:00
94bbf55ce3
Adapted code to Jordie0608's fix
2014-02-02 18:01:46 +01:00
869f4efa0a
I finally realize what was causing the click issues,so now it works with proximity flag.
2014-02-02 15:31:56 +02:00
68abd1f0e4
Merge pull request #2510 from Tenebrosity/throwsounds
...
Removes throwtapsound var from items
2014-02-02 04:33:23 -08:00
6fb71e6174
Added book bags. The librarian now spawns holding one.
2014-02-02 04:46:34 -03:00
30c4694487
Adapted to fit programming standard
2014-02-02 05:22:39 +01:00
f3da1a0904
Fixes examine message for pair objects
...
Before:
This is some brown shoes. It is a normal-sized item.
After:
These are some brown shoes. They are a normal-sized item.
2014-02-02 15:49:20 +13:00
1d54687b2b
Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds
...
Attack sounds for all melee weapons
2014-02-01 18:01:59 -08:00
a270bb5696
Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
...
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
2014-02-01 17:11:21 -08:00
f71ffde259
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 02:05:15 +01:00
831608e664
Increased max_combined to 35
2014-02-01 15:54:08 +11:00
97b99e47f6
Merge pull request #2558 from MrPerson/rollerbeds
...
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-31 14:13:51 -08:00
782148ddd3
Soap cleaning and uses.
2014-01-31 23:26:16 +02:00
8a41cf9c69
Spray bottles doesn't make floor wet anymore.
...
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.
2014-01-31 23:05:55 +02:00
f8e359cc35
Bag of holding now holds everything
2014-02-01 04:11:15 +11:00
b4f011bacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/power/cable.dm
Fixing conflicts
2014-01-31 05:20:59 +04:00
2133f12dc4
Merge branch 'master' of https://github.com/tgstation/-tg-station into miningpoints
2014-01-30 16:37:37 -08:00
6c07d2bae2
Merge pull request #2549 from Incoming5643/PussyGalore
...
Fixes the fucking cat crate jesus christ goddamn
2014-01-30 14:56:50 -08:00
302376eeeb
Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
...
Conflicts:
code/game/objects/items/toys.dm
2014-01-30 19:14:43 +00:00
3a0d12838a
Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity
...
Adds sanity checks to Robotlimb repairs [BUGFIX]
2014-01-30 10:40:12 -08:00
cb318996b5
Merge pull request #2524 from Incoming5643/ImUpset
...
Removes the "SmoothOperator" bundle
2014-01-30 10:25:26 -08:00
86d064451a
Merge pull request #2543 from Petethegoat/whyGOD
...
Removes unused vars from /obj/item
2014-01-30 08:31:37 -08:00
a8aff5e534
Fixes the Fix, wouldn't want people getting two corgis for the price of one, no that'd be terrrrrrrible
2014-01-30 10:52:32 -05:00
b4d2ba33cb
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-30 06:02:46 -08:00
40cd679747
Fixes Cat Crates, Corgi Crates and Chick crates.
...
File bug reports you guys, seriously.
2014-01-29 19:20:26 -05:00
8906d8a28d
Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs
2014-01-29 12:27:26 -08:00
e766b585c1
Equipment Locker and Ore Redemption Unit v1.0
2014-01-29 11:47:34 -08:00
4460869113
Removes unused vars from /obj/item
2014-01-29 17:19:20 +00:00
fleure
Mercenaryblue
Razharas
Giacomand
adrix89
Neerti
Aranclanos
KazeEspada
Cheridan
Tenebrosity
GarrusVakarian
Tkdrg
Ergovisavi
Jordie0608
Razharas
Malkevin
Incoming
MrPerson
Pete Goodfellow