shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,162 Commits 5 Branches 0 Tags
aac71758b7d17badf83bbc5a80da53d11bd47ad8
Commit Graph

13849 Commits

Author SHA1 Message Date
Lasse Andersen
aac71758b7 Cloning console board memory 
Makes the cloning console circuit board have local memory of the records of the console.
 2019-07-23 14:25:03 +02:00
kevinz000
c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 
Towels.
 2019-07-20 12:06:54 -07:00
kevinz000
66ddaf3ae8 Merge pull request #8903 from Trilbyspaceclone/patch-192 
Re-words brass flasks to not be wrong
 2019-07-20 11:59:30 -07:00
kevinz000
ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT 
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
 2019-07-20 11:59:05 -07:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
kevinz000
3176cf958f Merge pull request #8917 from deathride58/fuckwarpwhistles 
Fixes warp whistles
 2019-07-20 11:54:48 -07:00
kevinz000
f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries 
Batch check injuries
 2019-07-20 11:52:45 -07:00
kevinz000
8c93e48a01 Merge pull request #8896 from Bapldap/patch-1 
Updates Blood Brother
 2019-07-20 11:51:54 -07:00
kevinz000
3fada5c624 Merge pull request #8922 from BurgerLUA/Voting-Transparency 
Gamemode Voting Results are now displayed at the end of round screen
 2019-07-20 11:50:21 -07:00
kevinz000
08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix 
Makes the autolathe shock wire actually shock you
 2019-07-20 11:49:39 -07:00
BurgerLua
b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07:00
BurgerLua
9d183beb9c Added 2019-07-17 18:15:55 -07:00
Ghommie
44063e523d missing flag. 2019-07-18 02:14:00 +02:00
Ghommie
4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
kevinz000
28ac38d800 Merge pull request #8910 from Ghommie/Ghommie-cit144 
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
 2019-07-17 15:08:36 -07:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina 
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
 2019-07-17 18:07:57 -04:00
kevinz000
884299e152 Merge pull request #8915 from Ghommie/Ghommie-cit148 
Gives cult conversions an alert popup and four extra seconds wait time.
 2019-07-17 15:07:38 -07:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58
edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55 
nanite metabolic synthesis now drains you until you're starving
 2019-07-17 17:55:27 -04:00
deathride58
adaac8322c Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47 
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
 2019-07-17 17:53:39 -04:00
deathride58
77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15 
Fixes and buffs nano-boost symptom
 2019-07-17 17:53:02 -04:00
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
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
Ghommie
676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02:00
Trilbyspaceclone
4c971ea012 from afar 2019-07-15 22:12:20 -04:00
Trilbyspaceclone
3422dad9ec Update bottle.dm 2019-07-15 17:07:53 -04:00
Bapldap
2fec4a51b0 Update traitor_bro.dm 2019-07-15 13:26:21 -05: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
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
kevinz000
102bede4be Merge pull request #7544 from deathride58/nanitepoolnerf 
Nerfs nanite pools
 2019-07-14 14:15:53 -07:00