shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,621 Commits 5 Branches 0 Tags
5e3abec7046ebe5ae1d8b72444a96572d0eef8cd
Commit Graph
11280 Commits
Author SHA1 Message Date
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 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
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
B1gb3astandGitHub 84a413a43a Chef buffs chef buffs tastier food. 
"The strong flavor of" was always in game but someone put it behind an else if statement that would never proc.
Now if there's more than 45% (or 30% if you are a lizzard, hissss) of a reagent in a beaker, you will taste a strong flavor! 
Hurrah!
 2019-12-18 17:37:08 +01:00
Linzolle 70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
kappa-samaandGitHub 8da0ddda1b oops 2019-12-17 16:40:06 -05:00
TrilbyspacecloneandGitHub 17a5fd849e Update snacks.dm 2019-12-17 15:58:01 -05:00
TrilbyspacecloneandGitHub d6b1b76037 ?? 2019-12-17 15:28:48 -05:00
TrilbyspacecloneandGitHub 0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05:00
Putnam3145andGitHub 6b8f9427d0 Merge pull request #10153 from Linzolle/fireman-clarity 
make unable to carry fireman message more clear when unable to carry non-humans
 2019-12-17 12:09:08 -08:00
TrilbyspacecloneandGitHub 952880eecc Update drinks.dm 2019-12-17 15:01:23 -05:00
Putnam3145andGitHub c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437 
Fixes alien tech node not being unlockable with subtypes of the accepted items.
 2019-12-17 11:58:39 -08:00
Putnam3145andGitHub b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145andGitHub ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Putnam3145andGitHub 7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474 
Porting a few martial art code updates.
 2019-12-17 11:47:19 -08:00
Putnam3145andGitHub 37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa 
neovgre qol changes
 2019-12-17 11:40:43 -08:00
Putnam3145andGitHub 7a6541936c Merge pull request #10111 from kappa-sama/patch-11 
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
 2019-12-17 11:38:35 -08:00
Putnam3145andGitHub 0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -08:00
Putnam3145andGitHub 634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -08:00
Putnam3145andGitHub 670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470 
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
 2019-12-17 11:26:36 -08:00
TrilbyspacecloneandGitHub 47df4f452d Update drink_reagents.dm 2019-12-17 14:26:21 -05:00
Putnam3145andGitHub 5945f30523 Merge pull request #10225 from Ghommie/Ghommie-cit475 
Two slimepeople fixes.
 2019-12-17 11:22:30 -08:00
BlackMajorandGitHub 95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13:00
Ghommie f2cf146255 Two slimepeople fixes. 2019-12-17 12:49:04 +01:00
BlackMajor 5245898c25 whoops 2019-12-17 23:46:15 +13:00
BlackMajor 03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00
Ghommie 3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +01:00
Ghommie 6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
LinandGitHub 6f70ba1477 Merge pull request #10181 from Ghommie/Ghommie-cit463 
Fixing a few pill bottle issues with the ChemMaster.
 2019-12-17 01:08:27 +00:00
LinandGitHub 237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462 
[s] virtual reality component improvements, fixes and documentation.
 2019-12-17 01:05:10 +00:00
TrilbyspacecloneandGitHub c036c2c835 Update drink_reagents.dm 2019-12-16 19:05:16 -05:00
Ghommie 1c3682cd15 Brings carbon action intent hotkeys down to living. 2019-12-17 00:03:39 +01:00
TrilbyspacecloneGitHubGhom
 		fe1576583c Update code/modules/vending/cola.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-16 15:01:16 -05:00