Commit Graph

12571 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
Razharas
5c66d5ba82 Merge pull request #6036 from Aranclanos/pipenetfix
Pipenet hotfix!
2014-11-25 03:12:11 +03: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
6030fc88c4 Merge pull request #5926 from tkdrg/plasmagrenadeopplsnerf
Fixes chem grenade phasing through windows/windoors
2014-11-24 13:19:21 -08:00
hornygranny
402d5a368b Merge pull request #5997 from tkdrg/guyspls
Fixes HTML injection exploit with blueprints
2014-11-24 13:18:11 -08:00
hornygranny
fed73fc639 Merge pull request #6033 from tkdrg/grabmyrod
Fixes rods reinforcing broken plating
2014-11-24 13:16:31 -08: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
6d6835e22a Merge pull request #5910 from Razharas/PipeFix
Fixes qdel kidnapping pipes
2014-11-24 10:41:26 -08:00
hornygranny
cd9a8a5125 Merge pull request #5909 from Razharas/InputFix
Fix of atmos input exploit
2014-11-24 10:40:51 -08:00
hornygranny
65415cfb01 Merge pull request #5906 from Razharas/MachinePower
Fix for machines and their power problems
2014-11-24 10:40:41 -08:00
hornygranny
bbacd93739 Merge pull request #6010 from Menshin/motion_alarm_fix
Fixes runtimes related to motion cameras sensors and silicons
2014-11-24 10:40:21 -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
39ab001b43 Merge pull request #5972 from Razharas/Light
Fixes light going through walls
2014-11-24 10:39:19 -08:00
hornygranny
c4140c91dc Merge pull request #5991 from Razharas/MechClick
Fixes runtimes of the mechs
2014-11-24 10:39:12 -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
9a5aeadfda Merge pull request #6002 from tkdrg/floorpls
Fixes some flooring not dropping floor tiles.
2014-11-24 10:34:40 -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
9f90461b75 Revert "Fix for starting up" 2014-11-24 10:31:01 -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
81fa25aaac Merge pull request #6003 from Razharas/StartUp
Fix for starting up
2014-11-24 10:29:37 -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
Aranclanos
bc0de70e08 Fixes addMember() not adding the pipe brought in the argument if it had no other connections. 2014-11-23 21:17:39 -03:00
tkdrg
ce27dea26f Fixes rods reinforcing broken plating. 2014-11-23 21:08:42 -03:00
hornygranny
a969dee533 Merge pull request #5996 from Razharas/VendRun
Simple fix for brand intellegense runtime
2014-11-23 15:34:40 -08:00
hornygranny
3d01e77dba Merge pull request #5998 from Razharas/SpellRun
Fixes disabilities spell runtime
2014-11-23 15:34:22 -08:00
Razharas
717fb78278 Merge pull request #5994 from phil235/RadLaserAnimFix
Traitor health analyzer stops doing attack animation and hitsound
2014-11-23 23:41:46 +03: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
Razharas
24512fdeb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MachinePower 2014-11-23 12:01:16 +03:00
Cheridan
2b556b9bab Merge pull request #5871 from Carn/bygex
Interface for using boost::regex in byond.
2014-11-23 01:18:41 -06:00
Cheridan
51b6253315 Merge pull request #5964 from phil235/ViroFix1
Fixing viruses not working.
2014-11-23 00:56:29 -06:00
tkdrg
4828de94fd Merge remote-tracking branch 'upstream/master' into floorpls
Conflicts:
	code/game/turfs/simulated/floor/misc_floor.dm
2014-11-23 03:21:01 -03:00
xxalpha
24fdc08a5b Fixes stepping when lying down.
Fixes step_action being called when lying down.
2014-11-23 00:16:21 +00:00
Cheridan
e1b5a6815b Merge pull request #5856 from tkdrg/anotherbrickinthewall
Wall cleanup, attempt #2
2014-11-22 17:04:34 -06: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
Menshin
c3fa54a56c Fixes runtimes related to motion cameras sensors and silicons 2014-11-22 21:50:59 +01:00
Swag McYolosteinen
002ecddba3 Merge pull request #5849 from phil235/SoapMsgFix
Fixes the mouth washing message
2014-11-22 19:08:55 +01:00
Razharas
7199f03d82 Fix for starting up
As i understand its new player mob is being left without client
Fix #5666
2014-11-22 21:07:38 +03: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