shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,249 Commits 5 Branches 0 Tags
f43eb2bc4853e588fd55eb824595ea25a1bedefa
Commit Graph

1278 Commits

Author SHA1 Message Date
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
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
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
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
B1gb3ast
21c77cbdf1 modular man bad. 
now mörge this so chefs can make delicious dish, hemk.
 2019-12-18 23:36:32 +01:00
B1gb3ast
d011a7a3d9 oh hey macros. 
slightly less ugly ™
 2019-12-18 19:35:36 +01:00
B1gb3ast
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
B1gb3ast
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
B1gb3ast
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
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Trilbyspaceclone
47df4f452d Update drink_reagents.dm 2019-12-17 14:26:21 -05:00
Lin
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
Trilbyspaceclone
c036c2c835 Update drink_reagents.dm 2019-12-16 19:05:16 -05:00
Ghommie
843f4ed0da FLAK 2019-12-16 02:44:58 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Ghommie
d3d1f8328f compiles now. 2019-12-15 22:16:02 +01:00
Trilbyspaceclone
499c2a30e7 corrections for .4 metaballic rate 2019-12-15 13:59:54 -05:00
TrilbySpaceClone
5febc54fb8 whats all the buzz around this new drink? 2019-12-15 01:13:15 -05:00
Ghommie
12b87b4f3d Better. 2019-12-14 19:29:51 +01:00
Ghommie
2ccfaf38fb consistency. 2019-12-14 19:27:39 +01:00
Ghommie
6117434c7f Ok 2019-12-14 19:24:43 +01:00
Ghommie
70252d2914 Fixing a few pill bottle issues with the ChemMaster. 2019-12-14 19:20:02 +01:00
Hatterhat
a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Hatterhat
379a01c3fe packin some more doo dee doo 2019-12-08 01:42:56 -06:00
Hatterhat
6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
Thalpy
f59bdbe14e Tweaks botany related ragent pHes so they're less likely to blow up. 2019-12-07 17:42:29 +00:00
Thalpy
60c555c7e1 Merge branch 'master' into Superbases-goodbye 2019-12-07 17:37:05 +00:00
Artur
4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Artur
19ab4a5f70 Review fixes and tweaks 2019-12-07 00:43:02 +02:00
kevinz000
54be35a243 Merge pull request #9997 from Sishen1542/nuked 
removes superspeed from nuka cola
 2019-12-05 21:48:34 -07:00
kevinz000
176bde7829 Merge pull request #9990 from Linzolle/strange-reagent 
Fixes to strange reagent and very slight nerf I guess.
 2019-12-05 21:45:09 -07:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
BlackMajor
b7d0cc6516 Merge pull request #9884 from Useroth/blackpowder-alternative 
Black powder fix. Alternative to #9861
 2019-12-06 11:32:17 +13:00
Artur
af4eaf7f0f Fixeesss 2019-12-03 23:09:11 +02:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Putnam3145
aaf9f12e11 Merge pull request #9981 from Ghommie/Ghommie-cit407 
Rags are no longer transparent reagent containers. Also allows squeezing their reagents into another container.
 2019-11-30 22:44:06 -08:00
Putnam3145
44c621e5e9 Merge pull request #9895 from Thalpy/OrganQoL 
[READY] Organ quality of life fixes. Adds Organ fridges with items, Tweaks scanner, new surgery, tweaks chems
 2019-11-30 22:22:52 -08:00
Linzolle
4863deb978 blood ratio 2019-11-29 12:59:25 -06:00
Sishen
69e11e4203 olllll 2019-11-28 23:01:15 -07:00
Sishen
3a1e4dec5a Revert "lol" 
This reverts commit 7f6a1a6fda.
 2019-11-28 23:00:13 -07:00
Sishen
7f6a1a6fda lol 2019-11-28 22:53:39 -07:00
Linzolle
66971236d5 when you forget to hit ctrl+S 2019-11-28 21:02:28 -06:00
Linzolle
a940110dee spawn instead of sleep 2019-11-28 20:51:50 -06:00