21cfb2914b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-27 17:49:59 +01:00
b4c0433d6d
more work.
2019-12-27 17:45:19 +01:00
e97ca5f924
yeah fair enough
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-26 14:22:03 -05:00
4689d805a3
e
2019-12-26 02:54:38 -05:00
88222c0901
uh, actually did that
2019-12-24 23:58:22 -08:00
0b1b249eba
just makes alcohol toxic rather than drunk-inducing
2019-12-24 23:53:33 -08:00
57cecd2499
work
2019-12-25 06:54:44 +01:00
53d142b4c0
more work.
2019-12-25 01:34:33 +01:00
ca387d2bdb
Update others.dm
2019-12-23 20:51:37 -05:00
d571bbd292
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
2019-12-24 00:07:32 +01:00
d88f50ac15
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
2019-12-23 05:02:31 +01:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
0b96e469dd
Oh shit.
2019-12-22 13:07:37 +01:00
9034980871
randomized recipes fallback fix.
2019-12-22 12:58:11 +01:00
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
f5a55aaecf
Nerfs fun
2019-12-21 21:09:22 -05:00
0b63e79098
Merge branch 'master' into glassware
2019-12-21 15:41:45 -05:00
a33065a728
Merge pull request #10190 from Trilbyspaceclone/honeysoda
...
The new buzz around the new soft drink
2019-12-21 18:34:35 +01:00
19fc981cc1
Merge pull request #9596 from Linzolle/abductor-update
...
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
758e66ac2d
yeah alcohol intolerance
2019-12-20 16:46:38 -08:00
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
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
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
21c77cbdf1
modular man bad.
...
now mörge this so chefs can make delicious dish, hemk.
2019-12-18 23:36:32 +01:00
d011a7a3d9
oh hey macros.
...
slightly less ugly ™
2019-12-18 19:35:36 +01:00
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
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
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
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
ddd3676903
Merge branch 'master' into glassware
2019-12-17 15:18:30 -05:00
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
ed44b3130c
Merge pull request #10172 from Ghommie/Ghommie-cit460
...
Porting several quirks code updates.
2019-12-17 11:51:03 -08:00
47df4f452d
Update drink_reagents.dm
2019-12-17 14:26:21 -05:00
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
5bf252a58c
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2019-12-17 01:57:56 +01:00
c036c2c835
Update drink_reagents.dm
2019-12-16 19:05:16 -05:00
843f4ed0da
FLAK
2019-12-16 02:44:58 +01:00
c39a5d0462
Merge pull request #10011 from Arturlang/Bloodsuckers
...
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
d3d1f8328f
compiles now.
2019-12-15 22:16:02 +01:00
499c2a30e7
corrections for .4 metaballic rate
2019-12-15 13:59:54 -05:00
5febc54fb8
whats all the buzz around this new drink?
2019-12-15 01:13:15 -05:00
12b87b4f3d
Better.
2019-12-14 19:29:51 +01:00
2ccfaf38fb
consistency.
2019-12-14 19:27:39 +01:00
6117434c7f
Ok
2019-12-14 19:24:43 +01:00
70252d2914
Fixing a few pill bottle issues with the ChemMaster.
2019-12-14 19:20:02 +01:00
a1cc129d0b
slightly better storage, cucks the surgery duffel
2019-12-13 21:10:12 -06:00
9faf3d1dac
Mooaar fixeees
2019-12-14 01:01:38 +02:00
b39ae815f3
Porting several quirks code updates.
2019-12-13 16:12:04 +01:00
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
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