shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

9278 Commits

Author SHA1 Message Date
TrilbySpaceClone
d981b756e3 Update packs.dm 2019-07-19 23:49:53 -04:00
Fermi
e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi
75d6768ba7 Changed how the box works so it's not a storage. 2019-07-19 22:12:05 +01:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie
b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. 2019-07-19 20:09:16 +02:00
Fermi
4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
Fermi
fbf542134a Cidadel makes me want to hurt myself. 2019-07-19 05:18:35 +01:00
Fermi
a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01: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
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
deathride58
2970ee54a9 fix ur code catman 2019-07-17 18:05:34 -04: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
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
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
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
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
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
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
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