shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,050 Commits 5 Branches 0 Tags
ff069ecde2c5ce4f7ed2ec331da2969bb86c545d
Commit Graph

1313 Commits

Author SHA1 Message Date
Ghom
869ed7a4aa Merge pull request #10427 from Hatterhat/beakers-but-quirky 
beaker tweaks: setting transfer values verb on altclick, value tweaks
 2020-01-05 23:08:23 +01:00
Ghom
a8741a8462 As you command. 2020-01-05 23:01:35 +01:00
Ghom
fdff70b702 Merge pull request #10256 from Putnam3145/alcohol-intolerance 
Adds an alcohol intolerance trait (NOT light drinker)
 2020-01-05 15:19:48 +01:00
Ghom
0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248 
Fixes Fermi plushie reaction. Removes carbonation of caramel
 2020-01-05 15:17:14 +01:00
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Hatterhat
e65583c403 set_AFTFT verb, tweaking shit 2020-01-04 00:44:01 -06:00
Lin
b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
Lin
4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489 
randomized recipes fallback fix.
 2020-01-02 23:56:43 +00:00
kevinz000
16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff 
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
 2020-01-01 22:07:40 -08:00
Hatterhat
200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -06:00
Ghom
4660465115 Merge pull request #10362 from Trilbyspaceclone/patch-258 
Corrects bottle/pill/patch/condiments "#$39;"
 2019-12-31 14:39:34 +01:00
Ghom
78e4c608ad Merge pull request #10319 from Seris02/coconutsyep 
porting azarak's coconuts from hyper station
 2019-12-31 13:16:07 +01:00
Hatterhat
dcb5c58784 hypovial users dont deserve rights 2019-12-30 22:33:40 -06:00
Hatterhat
dc339b6962 beaker capacity buff 2019-12-30 22:24:41 -06:00
Trilbyspaceclone
ea43069222 Update chem_master.dm 2019-12-30 18:05:34 -05:00
kevinz000
eb00538843 Merge pull request #10331 from Trilbyspaceclone/patch-254 
Buffs borg hypo's
 2019-12-30 00:20:35 -08:00
Trilbyspaceclone
75a24449c8 Update borghydro.dm 2019-12-28 21:36:21 -05:00
Trilbyspaceclone
3177b5786a Update food_reagents.dm 2019-12-28 05:26:46 -05:00
Seris02
4a2b7c2438 cocooooonuuuuuuts 2019-12-28 16:02:53 +08:00
kappa-sama
e97ca5f924 yeah fair enough 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-26 14:22:03 -05:00
kappa-sama
4689d805a3 e 2019-12-26 02:54:38 -05:00
Putnam
88222c0901 uh, actually did that 2019-12-24 23:58:22 -08:00
Putnam
0b1b249eba just makes alcohol toxic rather than drunk-inducing 2019-12-24 23:53:33 -08:00
Trilbyspaceclone
ca387d2bdb Update others.dm 2019-12-23 20:51:37 -05:00
Ghommie
0b96e469dd Oh shit. 2019-12-22 13:07:37 +01:00
Ghommie
9034980871 randomized recipes fallback fix. 2019-12-22 12:58:11 +01:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Trilbyspaceclone
f5a55aaecf Nerfs fun 2019-12-21 21:09:22 -05: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
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
Putnam
758e66ac2d yeah alcohol intolerance 2019-12-20 16:46:38 -08: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
Trilbyspaceclone
0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05: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
Ghommie
5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01: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