shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

19834 Commits

Author SHA1 Message Date
deathride58 7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57 
Nanites in non /livings are no longer immune to EMPs
 2019-07-17 17:51:15 -04:00
deathride58 80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53 
adds an adminspawned nanite hub that draws from admin techweb datum instead
 2019-07-17 17:50:46 -04:00
deathride58 51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51 
Makes aggressive replication not useless
 2019-07-17 17:49:08 -04:00
deathride58 d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54 
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
 2019-07-17 17:48:38 -04:00
deathride58 8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56 
Nerfs chain detonation (removes dev radius)
 2019-07-17 17:47:36 -04:00
deathride58 9ebdad68b7 Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61 
Fixes RPD infinite transit tube stacking
 2019-07-17 17:47:09 -04:00
deathride58 c36f25144b Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59 
Nerfs nanite armor
 2019-07-17 17:46:41 -04:00
kevinz000 70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134 
Fixing a reagent ID typo.
 2019-07-17 14:44:54 -07:00
BurgerLUA 03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT 2019-07-17 14:17:33 -07:00
deathride58 ea5837bfb1 double the sanity check, double the stability 2019-07-17 16:54:02 -04:00
deathride58 42aae8f45f fixing warp whistles in literally two fucking lines 2019-07-17 16:49:46 -04:00
Trilbyspaceclone bc158f4fd8 Update code/modules/food_and_drinks/drinks/drinks/bottle.dm 
weh

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-17 16:39:14 -04:00
Ghommie 9384af188e Gives cult conversions an alert popup and a couple extra seconds. 2019-07-17 17:50:54 +02:00
Ghommie 05d839029a Late night coding that was yesterday's. 2019-07-17 16:03:05 +02:00
Ghommie b818b1eedd Updating spraycans and crayons code. 2019-07-17 15:45:48 +02:00
kevinz000 b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy 
Adds discount plushies and a way to get random plushies at shift start
 2019-07-17 00:50:21 -07:00
TrilbySpaceClone ba63926905 Sitting on the job 2019-07-16 22:42:57 -04:00
Ghommie 8bd64598c5 umh mh... 2019-07-17 01:32:33 +02:00
Ghommie 408c9aec51 Nothing the power of copypasta won't stop. 2019-07-17 01:01:33 +02:00
Ghommie ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie c7db3ad8f9 Porting a couple atmos performance improvements. 2019-07-16 23:51:38 +02:00
Ghommie 676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02:00
Ghommie b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Ghommie 9f6a3f428c last bit. 2019-07-16 16:15:31 +02:00
Ghommie 0d1988b6be More fixes. 2019-07-16 16:10:16 +02:00
Ghommie 75a8cbcc39 Makes Zelus flasks a subtype of bottle. 2019-07-16 15:39:30 +02:00
Trilbyspaceclone 4c971ea012 from afar 2019-07-15 22:12:20 -04:00
kevinz000 9995876a59 Update ert.dm 2019-07-15 17:00:31 -07:00
kevinz000 bdf4f11ab8 Update ert.dm 2019-07-15 16:56:51 -07:00
kevinz000 f16328c6e7 Update ert.dm 2019-07-15 16:55:40 -07:00
Trilbyspaceclone 3422dad9ec Update bottle.dm 2019-07-15 17:07:53 -04:00
Thalpy 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Bapldap 2fec4a51b0 Update traitor_bro.dm 2019-07-15 13:26:21 -05:00
Ghommie dbb17a258a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:52:34 +02:00
Ghommie 16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:46:13 +02:00
Ghommie fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie 1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie 4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
Seris02 59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Carlen White bb81a0850b Merge branch 'master' into batch-check-injuries 
# Conflicts:
#	code/modules/mob/living/carbon/human/human_defense.dm
 2019-07-14 20:49:52 -04:00
Carlen White 3504f15c01 Travis Bump 2019-07-14 20:29:23 -04:00
Trilbyspaceclone 2a78caa127 Merge branch 'master' into Unmodular 2019-07-14 18:27:37 -04:00
kevinz000 61bc43a0d7 Merge pull request #8693 from Ghommie/Ghommie-cit70 
Ports "clothes burning only spam You of Your clothes"
 2019-07-14 14:52:29 -07:00
kevinz000 628244c0ba Merge pull request #8869 from Ghommie/Ghommie-cit129 
Ports "Show codewords on round end screen"
 2019-07-14 14:49:11 -07:00
kevinz000 c06d495731 Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC 
REMOVE #C8A5DC. COLOR STRONG.
 2019-07-14 14:48:49 -07:00
kevinz000 1564f38ff8 Merge pull request #8725 from Trilbyspaceclone/meme_tools 
Adds more bronze tools
 2019-07-14 14:48:27 -07:00
kevinz000 2c41141d2f Merge pull request #8676 from Trilbyspaceclone/patch-176 
Adds a Rapier for 8 Trilby cats
 2019-07-14 14:46:44 -07:00
kevinz000 9de885da32 Merge pull request #8880 from CameronWoof/air-alarms-should-be-green 
Makes Air Alarms Green
 2019-07-14 14:20:54 -07:00
kevinz000 705b12fc50 Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup 
Brakes up Blue space Rnd tech nodes
 2019-07-14 14:20:03 -07:00
kevinz000 33250dfcbe buffs it a bit 2019-07-14 14:16:44 -07:00