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
Putnam3145
ed44b3130c
Merge pull request #10172 from Ghommie/Ghommie-cit460
...
Porting several quirks code updates.
2019-12-17 11:51:03 -08: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
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
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
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
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
Artur
4711eb0987
Merge remote-tracking branch 'upstream/master' into Bloodsuckers
2019-12-07 15:53:11 +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
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
Linzolle
e3439f96f0
strange reagent fix
2019-11-28 18:06:18 -06:00
Ghommie
3b8aebbbc2
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-11-29 00:40:16 +01:00
kevinz000
6b53845f06
Merge pull request #9268 from Thalpy/FERMICHEMCurTweaks
...
[READY] [Please merge me] Fermichem tweaks: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
2019-11-26 16:01:48 -07:00
Fermi
79a64d9c63
Makes synthtissue a lil easier.
2019-11-25 03:36:39 +00:00
BlackMajor
786d40032d
Merge pull request #9922 from GrayRachnid/braintraumasport
...
Ports new Brain Traumas from /tg/. Does not include the shitty creeper antag or Wizard Traumas, i'm porting wizard traumas later. Also adds the Desynchronizer and changes the way some heaRing args are handled.
2019-11-25 12:31:15 +13:00
BlackMajor
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
BlackMajor
6f98efb18e
Merge pull request #9902 from Useroth/new-tg-plants
...
[TESTMERGE READY] Ported a bunch of tg hydroponics content.
2019-11-25 11:30:43 +13:00
Fermi
614a462176
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
...
This reverts commit 1509d9d183
2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67
Revert "PLASE"
...
This reverts commit 8af225e6e3
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0
Revert "Revert "PLASE""
...
This reverts commit 00601a0c87
2019-11-24 03:04:52 +00:00
Fermi
1509d9d183
Revert "Merge remote-tracking branch 'upstream/master'"
...
This reverts commit 135608551fce7e9ac452
2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf
Revert "pls"
...
This reverts commit 8c97511871
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035
Revert "Revert "pls""
...
This reverts commit b23f2a4460
2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e
Revert "pls2"
...
This reverts commit 0eb635b908
2019-11-24 03:02:04 +00:00
Fermi
0eb635b908
pls2
...
ugh
2019-11-24 02:52:17 +00:00
