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
Ghom 3df8619980 Merge pull request #10141 from Putnam3145/dynamic-statbus 
Adds a bunch of statbus logging to dynamic
 2019-12-21 11:45:44 +01:00
Ghom 71d0c3e257 Merge pull request #10232 from DeltaFire15/cc-headmessages 
All heads of staff can now spam CC.
 2019-12-21 11:27:04 +01:00
Ghom 848ad4b39b Merge pull request #9940 from Putnam3145/dynamic-roundstart-overhaul 
Dynamic rulesets that have fired in recent rounds have lower weight
 2019-12-21 11:20:24 +01:00
Ghom 19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update 
Bring abductors up-to-date with /tg/.
 2019-12-21 11:15:29 +01:00
Ghom a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi 
you can pick up corgis now
 2019-12-21 11:05:36 +01:00
lolman360 b490873f2a ff 2019-12-21 13:13:37 +11:00
lolman360 4c7cc3615e ff 2019-12-21 12:48:09 +11:00
lolman360 3043a4f8c9 ghom help 2019-12-21 12:47:36 +11:00
lolman360 7048e4e5ab hhh 2019-12-21 12:43:48 +11:00
lolman360 b02ffa2e2d Update inhand_holder.dm 2019-12-21 12:40:41 +11:00
Putnam 758e66ac2d yeah alcohol intolerance 2019-12-20 16:46:38 -08:00
r4d6 efdded7e48 Remove extra indentations 2019-12-20 18:38:47 -05:00
r4d6 bc70bc3882 Fix the nose boop. 2019-12-20 18:10:02 -05:00
Putnam ef360838da errors 2019-12-20 14:50:08 -08:00
Putnam c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00
Ghommie 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Ghom a398b7c413 Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125 
Adds 8 character save slots
 2019-12-20 22:55:22 +01:00
Ghom 9a38612ec4 Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128 
flashbangs process flash/bang separately based on blindness/hearing and uses viewers(), which means xray users suffer too if they see them go off
 2019-12-20 16:27:47 +01:00
DeltaFire 685425ed55 Atomises out the magicnumber change 2019-12-20 15:26:16 +01:00
Ghom 4016835b0a Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114 
Radiation storms no longer do random mutations in of itself, but are far more lethal
 2019-12-20 14:32:42 +01:00
Ghom b581f97fba Merge pull request #9563 from Thalpy/Superbases-goodbye 
[TESTMERGE] Goodbye, superpH, you were too wild for our world.
 2019-12-20 14:28:21 +01:00
Ghom d33feb6c35 Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116 
The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire
 2019-12-20 14:26:50 +01:00
Ghom f56684a473 Merge pull request #9925 from Linzolle/cosmic-brain 
change cosmic coat crafting recipe
 2019-12-20 14:26:24 +01:00
Ghom 6d824c99cf Merge pull request #10051 from kappa-sama/patch-9 
puts our legion more up to date with tg's
 2019-12-20 14:25:09 +01:00
Ghom d52a469933 Merge pull request #10142 from Trilbyspaceclone/patch-244 
Feast or Famine is shit. Makes CE hardsuit raditation proof hat wise, buffes its rest of body by 5
 2019-12-20 13:36:02 +01:00
Ghom e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks 
Makes HE pipes realistically radiate away heat
 2019-12-20 13:34:47 +01:00
Ghom 1748a5ee4b Merge pull request #10054 from kappa-sama/patch-10 
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
 2019-12-20 13:27:35 +01:00
Ghom 9567d53007 I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive? 2019-12-20 13:24:48 +01:00
Ghom 481371bca7 Merge pull request #10193 from Commandersand/yeet 
gamer is now filtered for clowns
 2019-12-20 13:15:54 +01:00
Seris02 61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00
lolman360 6188ec034d h 2019-12-20 16:10:13 +11:00
r4d6 61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
kevinz000 0feb54bf70 Update mob.dm 2019-12-19 17:54:01 -07:00
kevinz000 2f78c0a5db Update mob.dm 2019-12-19 17:51:23 -07:00
Lin 8d54e8afcc Merge pull request #10214 from Ghommie/Ghommie-cit472 
Brings carbon action intent hotkeys down to living.
 2019-12-19 23:42:06 +00:00
Lin 8511c44f0f Merge pull request #10199 from Ghommie/Ghommie-cit467 
Fixing and cleaning up the blood bank generator code.
 2019-12-19 23:39:17 +00:00
Lin 138b460af3 Merge pull request #10079 from Ghommie/Ghommie-cit438 
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
 2019-12-19 23:26:53 +00:00
Lin 3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390 
Unmodularize gamemodes folder.
 2019-12-19 23:23:20 +00:00
Linzolle f3aa363a2e drop 2019-12-19 17:19:07 -06:00
Lin 42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2019-12-19 23:03:48 +00:00
Lin 66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 
Ports improved and simplier fire alarms.
 2019-12-19 23:00:52 +00:00
nik707 c1be6ba222 Merge pull request #10067 from Sishen1542/botnayn 
You can change a plant's name, description and its seed's description by using a pen on the seed
 2019-12-19 16:03:22 -06:00
r4d6 4608b3852d Add the file for making the submaps actual ruins 2019-12-19 15:28:46 -05:00
r4d6 dbf3e7d246 Add the landmarks 2019-12-19 15:27:45 -05:00
r4d6 22d89a9435 Add the stuff to seed the station with rooms 2019-12-19 15:26:43 -05:00
r4d6 9672f98de3 Fix a possible alert 2019-12-19 15:24:56 -05:00
r4d6 ac1719810f Adding a list for the stations rooms 2019-12-19 15:23:23 -05:00
nik707 63dd3487b3 Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed 
the one where the combat medic kit gets buffed
 2019-12-19 14:11:27 -06:00
nik707 dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code 
i dont make good code
 2019-12-19 14:10:18 -06:00
Putnam f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00