shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,604 Commits 5 Branches 0 Tags
5e1cbd717455cbfda14dbc284e85e5bbc7a8ca7b
Commit Graph

12349 Commits

Author SHA1 Message Date
Ghom 6b2fe333f4 Merge pull request #9830 from DeltaFire15/cbt-clockvsbloodtorture 
Stun warfare rebalance - CBT edition
 2019-12-21 19:02:00 +01:00
Ghom a33065a728 Merge pull request #10190 from Trilbyspaceclone/honeysoda 
The new buzz around the new soft drink
 2019-12-21 18:34:35 +01:00
Ghommie 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Ghom 2b2a3c2721 Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1 
Nerfs the Clockwork Marauder meta
 2019-12-21 17:26:04 +01:00
Ghom 2bc401e2d2 Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123 
nanites can no longer spread through atmospherics-blocking objects
 2019-12-21 16:48:56 +01:00
Ghom 2a76743747 I'm playing dirty because we have too many PRs to merge anyway. 2019-12-21 16:42:27 +01:00
Ghom 5c3d3f4cc5 Is merging someone else's PR you personally fixed considerable as self-merging? 2019-12-21 16:40:32 +01:00
Ghom daf099388e Unnecessary OOC note. 2019-12-21 16:37:28 +01:00
Ghom 4624a1739a typo 2019-12-21 16:30:02 +01:00
Ghom aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision 
Night vision trait but it just boosts barely-lit visibility
 2019-12-21 15:30:32 +01:00
Ghom a384b1782b Merge pull request #10164 from kappa-sama/martialartist 
What ho, Muscle Wizard! Might you cast us a spell?
 2019-12-21 15:24:06 +01:00
Michiyamenotehifunana 3920e6a38d Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis 2019-12-21 22:22:12 +08:00
Michiyamenotehifunana 0b2568a9cf Modernizes Polychromic Uniform Code 
No more modular_citadel, but the neck polychrome crap needs more work in another PR
 2019-12-21 21:38:04 +08:00
Ghom f30be0ace6 Merge pull request #10077 from ForrestWick/uplinkchanges 
Moves brainwash surgery from role restricted to devices and tools in the uplink
 2019-12-21 12:43:18 +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 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
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
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 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
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
Putnam f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00
Putnam 9ec2c8a7f1 MKUltra made double opt-in 2019-12-19 09:54:34 -08:00