coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
15,632 Commits 9 Branches 11 Tags
7cec307bf457b4fdf0fd3927544412f5a2b31c8d
Commit Graph

6771 Commits

Author SHA1 Message Date
hornygranny 7cec307bf4 Merge pull request #5917 from RemieRichards/FixAcidBalance 
Nerfs acid and cleans up /spray afterattack
 2014-11-26 11:12:11 -08:00
hornygranny 88896cea50 Merge pull request #5948 from tkdrg/monkeytrouble 
Makes condensed capsaicin work on monkeys
 2014-11-26 11:02:30 -08:00
Remie Richards 5343f2d1fa Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAcidBalance 
Conflicts:
	code/modules/mob/living/living_defense.dm
 2014-11-26 19:01:17 +00:00
hornygranny b24c51a992 Merge pull request #6065 from Razharas/BorgChemFix 
Fix for omnious reagent transfer error in #1673
 2014-11-26 10:51:40 -08:00
hornygranny c79ea305a0 Merge pull request #6056 from tkdrg/paintsl 
Fixes pAI NTRC
 2014-11-25 17:42:29 -08:00
hornygranny 21b8df82d5 Merge pull request #5908 from tkdrg/hud 
Makes data and antag huds passive and creates /datum/atom_hud
 2014-11-25 12:53:03 -08:00
hornygranny 0cf197ca95 Merge pull request #6050 from phil235/ReagentDispenserMsgFix 
Fix reagent dispenser's message when empty
 2014-11-25 12:41:12 -08:00
hornygranny 1032cca0b7 Merge pull request #6051 from phil235/BigCarpSpriteFix 
Fixing the megacarp sprite
 2014-11-25 12:39:54 -08:00
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
Razharas 67c2ddb734 Fix for omnious reagent transfer error 2014-11-25 15:29:59 +03:00
hornygranny 4702f16ecb Merge pull request #6037 from tkdrg/imdumb 
Fixes hydroponics harvesting in diagonals
 2014-11-24 21:05:17 -08:00
tkdrg 2090a93783 Fixes pAI NTSL 2014-11-24 21:31:26 -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
phil235 16ea9974d9 Fix the empty msg of reagent dispenser not making it clear that it cannot be refilled. 2014-11-24 19:49:34 +01: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
phil235 a8cbab01c8 Fixing the megacarp sprite by adding a pixel_x offset like the alien empress. Also giving it a mob_size of 2 (doesn't fit in regular closets). 2014-11-24 17:49:45 +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