shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,425 Commits 5 Branches 0 Tags
2ca4c2e66a4e8808d06f97da7af85a739478dbe3
Commit Graph
11316 Commits
Author SHA1 Message Date
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update 
Bring abductors up-to-date with /tg/.
 2019-12-21 11:15:29 +01:00
GhomandGitHub a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi 
you can pick up corgis now
 2019-12-21 11:05:36 +01:00
lolman360andGitHub b490873f2a ff 2019-12-21 13:13:37 +11:00
lolman360andGitHub 4c7cc3615e ff 2019-12-21 12:48:09 +11:00
lolman360andGitHub 3043a4f8c9 ghom help 2019-12-21 12:47:36 +11:00
lolman360andGitHub 7048e4e5ab hhh 2019-12-21 12:43:48 +11:00
lolman360andGitHub b02ffa2e2d Update inhand_holder.dm 2019-12-21 12:40:41 +11:00
r4d6andGitHub efdded7e48 Remove extra indentations 2019-12-20 18:38:47 -05:00
r4d6andGitHub bc70bc3882 Fix the nose boop. 2019-12-20 18:10:02 -05:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub f56684a473 Merge pull request #9925 from Linzolle/cosmic-brain 
change cosmic coat crafting recipe
 2019-12-20 14:26:24 +01:00
GhomandGitHub 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
GhomandGitHub 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
GhomandGitHub e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks 
Makes HE pipes realistically radiate away heat
 2019-12-20 13:34:47 +01:00
GhomandGitHub 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
GhomandGitHub 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
lolman360andGitHub 6188ec034d h 2019-12-20 16:10:13 +11:00
kevinz000andGitHub 0feb54bf70 Update mob.dm 2019-12-19 17:54:01 -07:00
kevinz000andGitHub 2f78c0a5db Update mob.dm 2019-12-19 17:51:23 -07:00
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2019-12-19 23:03:48 +00:00
LinandGitHub 66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 
Ports improved and simplier fire alarms.
 2019-12-19 23:00:52 +00:00
nik707andGitHub 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
nik707andGitHub 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
Ghommie a46982efe3 F 2019-12-19 17:40:22 +01:00
Ghommie fb2b259d92 Ports "Refactors can_see_reagents" 2019-12-19 17:17:18 +01:00
Ghommie f1154bf840 wew 2019-12-19 16:45:08 +01:00
Ghommie 88978209fa Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly" 2019-12-19 16:42:25 +01:00
kevinz000andGitHub e8e97021b3 Merge pull request #10229 from B1gb3ast/master 
Fixes nonfunctional code so that tongues can taste strong flavors
 2019-12-19 04:06:07 -07:00
kevinz000andGitHub 23f7815c52 Merge pull request #10204 from r4d6/patch-2 
Port boops and handshakes
 2019-12-19 04:01:52 -07:00
kevinz000andGitHub dcca9eb0d6 Merge pull request #10223 from BlackMajor/Yeehaw 
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
 2019-12-19 03:24:36 -07:00
Ghommie b56d2ff276 Stops humanoids whose skin_tone variable is set to "albino" from showing up as pale when examined should their species not use skintones anyway. 2019-12-19 11:19:00 +01:00
lolman360andGitHub e8dc9480b0 AAAAAAAAAAAAAAAAAAAA 2019-12-19 18:30:38 +11:00
lolman360andGitHub d8f0e983f1 lolman acctually knows how the stuff work 2019-12-19 18:24:24 +11:00
lolman360andGitHub 8fc095d63e Update carbon.dm 2019-12-19 17:29:35 +11:00
B1gb3astandGitHub 21c77cbdf1 modular man bad. 
now mörge this so chefs can make delicious dish, hemk.
 2019-12-18 23:36:32 +01:00
B1gb3astandGitHub d011a7a3d9 oh hey macros. 
slightly less ugly ™
 2019-12-18 19:35:36 +01:00
B1gb3astandGitHub 19b20f8385 im baby dumb and removed "a hint of" by accident. 
Okay whoops haha there we go now both strong and weak should work.
 2019-12-18 19:29:57 +01:00
B1gb3astandGitHub 7841faa3a9 Actually hold on 
So that not everything in the game now tastes like STRONG FLAVOUR. That'd be annoying.
 2019-12-18 19:24:25 +01:00
Ghommie f945577655 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320 2019-12-18 19:20:38 +01:00