coffeeshits/kiwistation
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
31,205 Commits 9 Branches 11 Tags
21f04b36ff3caab3a58bdb050e2cc4e6ef06cd3c
Commit Graph

24924 Commits

Author SHA1 Message Date
Nerd Lord 21f04b36ff Sleeping Carp attacks now have attack animations 2016-03-09 22:53:19 -05:00
Cheridan da1040d6f0 Merge pull request #15935 from tkdrg/wot 
Attempts to fix lattices not GCing sometimes
 2016-03-08 13:28:00 -06:00
Cheridan efe9d7e90d Merge pull request #15952 from Robustin/culttweak 
Cult scaling tweak
 2016-03-08 13:22:39 -06:00
Cheridan 5b38a76e22 Merge pull request #15962 from Iamgoofball/patch-1 
You can now hear the tesla from 4 screens away.
 2016-03-08 12:35:54 -06:00
Cheridan c5653f28b6 Merge pull request #15963 from ChangelingRain/oneatatime 
Damage Converter symptom now does toxin damage for each limb healed
 2016-03-08 11:26:55 -06:00
Cheridan a171e94dfe Merge pull request #15955 from ChangelingRain/fuckthat 
Fixes two posibrain names
 2016-03-08 11:21:57 -06:00
duncathan salt 40ee6f66ba Merge pull request #15805 from bgobandit/catfixes 
Cat fixes
 2016-03-08 10:37:16 -06:00
Jordie 3a6a038322 Merge pull request #15945 from Shadowlight213/Snpcbuttonmove 
Moves SNPC admin buttons to the debug tab
 2016-03-08 18:38:48 +11:00
Cheridan 2cac0fb63f Merge pull request #15944 from Core0verload/plantrefactor3 
Plant Refactor: The Icons strike back
 2016-03-07 23:55:07 -06:00
Cheridan bdcd48532e Merge pull request #15937 from KorPhaeron/nuclear2 
Lowers nuclear emergency min population
 2016-03-07 20:00:12 -06:00
Cheridan 244a4cfc21 Merge pull request #15950 from MrStonedOne/patch-164 
De-nerfs the Tesla slightly
 2016-03-07 18:30:47 -06:00
Cheridan 2b414621bd Merge pull request #15929 from tkdrg/timmy 
Makes the admin add reagent list sorted
 2016-03-07 18:10:26 -06:00
Joan Lung a5bcdb086a Merge pull request #15924 from lordpidey/adminantaghud 
Adds admin antag-hud
 2016-03-07 17:42:22 -05:00
bgobandit dbd01d8a43 fixed 2016-03-07 12:28:35 -05:00
Nerd Lord d064a68254 actually the alternative is better 2016-03-07 12:08:01 -05:00
Cheridan d8d1032df5 Merge pull request #15917 from ChangelingRain/selfattack 
Blobs can now attack mobs on top of blob tiles
 2016-03-07 10:59:34 -06:00
Nerd Lord 91e4ac0420 Damage converter symptom now only heals one limb at a time 2016-03-07 11:59:00 -05:00
Iamgoofball b64836d27d You can now hear the tesla from 4 screens away. 
If you still don't have warning that the tesla is loose after this, consider investing in speakers or a headset.
 2016-03-07 08:54:19 -08:00
bgobandit ed67d189a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into catfixes 
Conflicts:
	icons/mob/pets.dmi
 2016-03-07 07:13:30 -05:00
bgobandit 128cf1e19d test 2016-03-07 07:07:34 -05:00
c0 08bdcc3024 Plant Refactor 4 2016-03-07 12:46:12 +03:00
Nerd Lord bb007e4527 Fixes two posibrain names 2016-03-06 23:35:36 -05:00
c0 9f302e6ed4 Fixes a nasty banana teleport bug 2016-03-07 05:38:47 +03:00
c0 3d0792c003 Plant Refactor: Icons 2016-03-07 05:38:45 +03:00
Remie Richards c71de63ed5 Merge pull request #15934 from ChangelingRain/nautglow 
Blobbernaut damage glow is more visible
 2016-03-06 23:10:51 +00:00
Nerd Lord 9fc8fa3691 use correct flag 2016-03-06 17:59:50 -05:00
Robustin 2e139beda2 Update cult.dm 2016-03-06 16:45:34 -05:00
Kyle Spier-Swenson f3870e93a2 de-nerfs the tesla slightly 2016-03-06 12:09:48 -08:00
Cheridan f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted 
Replaced last occurences of gc_destroyed by qdeleted()
 2016-03-06 12:29:30 -06:00
Joan Lung 818ec0ce96 Merge pull request #15827 from GunHog/Hardsuit_Jetpack_Upgrade_4_Miners 
Hardsuit Jetpack Upgrade
 2016-03-06 12:52:21 -05:00
Cheridan 51817ef700 Merge pull request #15930 from tkdrg/runtimes 
Fixes camera runtime
 2016-03-06 11:16:23 -06:00
Cheridan 531940cc25 Merge pull request #15932 from Impisi/Maintloot2 
Fixes MaintLoot Drop Table
 2016-03-06 11:15:43 -06:00
Shadowlight213 b5c398a252 Moves SNPC admin buttons to the debug tab 2016-03-05 19:05:54 -08:00
Mike Long daf13e0f19 Now works with gangs too (provided the gang was created BEFORE antaghud was turned on) 2016-03-05 15:00:29 -05:00
KorPhaeron 38fde6675e Nuclear 2016-03-05 13:30:23 -06:00
Mike Long cdd9fa5116 traitor/changeling/abductee/abductor/ninja no longer see their own huds. 2016-03-05 14:23:19 -05:00
Tkdrg e6c0cd286f Attempts to fix lattices not GCing sometimes 2016-03-05 14:01:06 -03:00
Nerd Lord 218d456e5a naut 'damage' glow is more visible on all blob types 2016-03-05 10:59:53 -05:00
Razharas a1d67b58c4 Merge pull request #15911 from sawu-tg/snpcupdate 
SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS
 2016-03-05 16:39:29 +03:00
Impisi 2bb60c13a3 Fixes loottable 2016-03-05 05:31:02 -08:00
Impisi 9eda2e0932 Reduces empty lootdrop slots to rebalance the table according the the original creators instructions. 2016-03-05 05:22:07 -08:00
Tkdrg 9633cae728 Fixes camera runtime 2016-03-05 08:51:48 -03:00
Tkdrg af7e42c6f1 Makes the admin add reagent list sorted 2016-03-05 08:24:38 -03:00
tkdrg 442c769eeb Merge pull request #15888 from ChangelingRain/robustin-can-never-be-satisfied 
Robustin-Sponsored Blobbernaut Nerf PR
 2016-03-05 08:12:29 -03:00
Sawu 430bca51d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into snpcupdate 
Conflicts:
	code/modules/mob/interactive.dm
 2016-03-05 22:09:16 +11:00
Mike Long 27e781e3cf Corrected mistake. It now works with changelings too. 2016-03-05 03:12:00 -05:00
Mike Long c0d678e18b Fixes the inexplicable runtime errors. 2016-03-05 02:50:34 -05:00
Mike Long 8eb7267030 Theoretically makes the new huds not runtime. 
In actuality, it just causes an UBSURD amount of runtimes on startup.  No clue why.
 2016-03-05 01:55:58 -05:00
Mike Long 12f4d11f7e Adds antag hud for traitors/changlings/abductors/abductees/ninjas 
Right now, it's admin only.

Has not been tested.
 2016-03-05 00:52:59 -05:00
Cheridan 5658a4d14b Merge pull request #15904 from KorPhaeron/lmao2cat 
Nerfs catsplosion
 2016-03-04 20:55:01 -06:00