Commit Graph

6752 Commits

Author SHA1 Message Date
hornygranny
6786cd73f4 Merge pull request #6052 from phil235/GoldSlimeSpawnFix
Mining drones no longer spawns with gold slime extract.
2014-11-25 12:39:43 -08:00
hornygranny
4702f16ecb Merge pull request #6037 from tkdrg/imdumb
Fixes hydroponics harvesting in diagonals
2014-11-24 21:05:17 -08:00
hornygranny
a24eeb7f93 Merge pull request #5758 from phil235/TorchFix
Fixes the torch and flare icons.
2014-11-24 15:18:08 -08:00
tkdrg
90b3fed5df Fixes hydroponics harvesting in diagonals 2014-11-24 20:14:57 -03:00
hornygranny
712008e848 Merge pull request #5970 from Xhuis/grammar_fix
Fixes grammar errors in clothing items
2014-11-24 10:44:32 -08:00
hornygranny
c51e95d31b Merge pull request #5988 from Razharas/TeleSci
Fixes telesci runtime on memory setting
2014-11-24 10:39:42 -08:00
hornygranny
2b1b6726e4 Merge pull request #5987 from Razharas/VirFix
Fixes pandemic naming
2014-11-24 10:39:30 -08:00
hornygranny
38f7947eb5 Merge pull request #5976 from wiox/willy
Visor flags for sec gas mask
2014-11-24 10:36:21 -08:00
hornygranny
365ce13098 Merge pull request #6017 from xxalpha/stepfix
Fixes step_action() being called when lying down.
2014-11-24 10:35:31 -08:00
hornygranny
15a34fe3c9 Merge pull request #6022 from phil235/CuffResBlindMsgFix
Fixes blind mob not getting the cuff resist messages.
2014-11-24 10:35:09 -08:00
hornygranny
3f87c8fbff Merge pull request #6021 from phil235/FacehuggerLeapMsgFix
Fix the facehugger leap messages being bold red for third parties.
2014-11-24 10:32:40 -08:00
hornygranny
3c154b45b5 Merge pull request #6012 from phil235/SignallerReadyFix
All assembly items start secured/ready
2014-11-24 10:30:21 -08:00
hornygranny
67711d4ea7 Merge pull request #6024 from phil235/NettleRuntimeFix
Fixes the runtimes when picking up nettles as a non-human.
2014-11-24 10:29:09 -08:00
phil235
795c905ea8 Mining drones no longer spawns with gold slime extract. 2014-11-24 17:59:57 +01:00
hornygranny
a969dee533 Merge pull request #5996 from Razharas/VendRun
Simple fix for brand intellegense runtime
2014-11-23 15:34:40 -08:00
Razharas
eabea41f4d Merge pull request #5989 from Menshin/cables_cutting_fix
Fixes cutting cables always spawning a single red cable
2014-11-23 23:35:21 +03:00
Remie Richards
eead810fcc Merge pull request #5875 from phil235/RevolverMalfFix
Fixes the modified detective revolver blowing up with empty chamber
2014-11-23 15:11:28 +00:00
phil235
3436b96693 Fixes the runtimes when picking up nettles as a non-human. Changing two span class. Maintenance drones no longer take damage when picking up nettles. 2014-11-23 16:09:36 +01:00
Remie Richards
3011261e7f Merge pull request #5980 from Menshin/collectors_anchoring_fix
Radiations collectors anchoring fix
2014-11-23 15:02:28 +00:00
Remie Richards
5e6d0c9994 Merge pull request #5979 from tkdrg/grabthewood
Fixes wood duplicating exploit with bookcase
2014-11-23 15:00:11 +00:00
phil235
76fa089789 Fixes blind mob not getting the cuff resist messages. 2014-11-23 15:00:40 +01:00
phil235
88b6884cd5 Fix the facehugger leap messages being bold red for third parties. 2014-11-23 13:40:57 +01:00
Cheridan
51b6253315 Merge pull request #5964 from phil235/ViroFix1
Fixing viruses not working.
2014-11-23 00:56:29 -06:00
xxalpha
24fdc08a5b Fixes stepping when lying down.
Fixes step_action being called when lying down.
2014-11-23 00:16:21 +00:00
phil235
27302aa6ae Fixes not being able to hear the beeping of infrared beam, timer and proximity sensor in the dark.
All assembly items start secured (ready).
Fixes certain assembly items being usable while unsecured and not getting the unsecured warning message.
2014-11-22 22:56:13 +01:00
phil235
0bc84e120e Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix
Conflicts:
	icons/mob/items_lefthand.dmi

Adding PR 5829 to my PR so both can be merged now.
2014-11-22 18:56:31 +01:00
phil235
3a97e8d878 Fixes not being able to have more than one virus. (two typos fixed) 2014-11-22 18:30:19 +01:00
Razharas
343e2ca1f5 Simple fix for brand intellegense runtime
Should fix #5672
2014-11-22 20:09:19 +03:00
Menshin
56bd52e95b Fixed cutting cables always spawning a single red cable 2014-11-22 15:59:18 +01:00
Razharas
e0e75b9ec5 Fixes telesci runtime on memory settting
Fix #5778
2014-11-22 17:53:44 +03:00
Razharas
ebeb3367c2 Merge pull request #5938 from hornygranny/piperuntimes
disposals fixes
2014-11-22 14:50:42 +03:00
Razharas
9ebefa3efd Fixes pandemic disease naming
Fix #5817
2014-11-22 14:03:32 +03:00
tkdrg
64e5f0b6b9 Fixes wood duplicating exploit with bookcase 2014-11-21 20:54:29 -03:00
Menshin
c2cfa31d87 Make collectors actually connect to the powernet when wrenched down. 2014-11-22 00:32:52 +01:00
Xhuis
7b874dd72a Edits the laser tag armor descriptions. 2014-11-21 17:35:00 -05:00
William Wallace
762b0f7d1e Visor flags for sec gas mask
Required for changes in 32e9cd70c4
2014-11-21 21:04:49 +00:00
Xhuis
2bd8c684fa Merge branch 'master' into grammar_fix 2014-11-21 12:44:31 -05:00
Cheridan
6ec91732c8 Merge pull request #5911 from Razharas/MechFix
Microwave message fix, small and lazy
2014-11-21 10:53:09 -06:00
Cheridan
448d0fab7f Merge pull request #5913 from tkdrg/yearslater
Makes cyborg modules NODROP
2014-11-21 10:17:53 -06:00
Xhuis
047de23ee0 Reverts chef description and fixes radiation suit label. 2014-11-21 10:59:15 -05:00
Xhuis
9d889797f5 Fixes collectable hat capitalization and changes the descriptions on some items. 2014-11-21 10:24:12 -05:00
Xhuis
2eb28a2a80 Fixes spelling errors in clothing item descriptions and adds/edits descriptions for others. 2014-11-20 23:26:10 -05:00
hornygranny
b2fba4a48f Merge pull request #5944 from Jordie0608/orangeslikesgoatbutts
Fixes select job equipment cancel
2014-11-20 11:21:13 -08:00
Cheridan
a1efd6cfde Merge pull request #5946 from tkdrg/tktp
Fixes TK teleporting pictures and growns
2014-11-20 13:05:11 -06:00
Cheridan
0da09e3f6b Merge pull request #5557 from Incoming5643/magicmania1.76
Magic Mania 1.76: Lets outrun the feature freeze
2014-11-20 09:07:41 -06:00
Cheridan
8bfed4258b Merge pull request #5922 from Steelpoint/BeretHoS
HoS Beret + Warden Drill Hat
2014-11-19 10:26:27 -06:00
Cheridan
1208c48af3 Merge pull request #5652 from Menshin/atmos_z_level_fix
Atmos z level fix + radio controller code sanitization
2014-11-18 17:05:14 -06:00
Cheridan
c98448b5c2 Merge pull request #5650 from phil235/MechAtkFix1
All mechs get a melee attack
2014-11-18 12:53:52 -06:00
tkdrg
0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Jordie0608
ce6a1d0d89 Fixes select job equipment cancel 2014-11-18 22:50:33 +11:00