Commit Graph

2268 Commits

Author SHA1 Message Date
PacifistDalek f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/food_and_drinks/food/foods/pizza.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
Patrick Meade 1be9e97c1e Fixes iteration bug in space cleaner (#14631) 2020-10-17 00:38:04 -04:00
Aquilar 9206af653d updates haloperidol and nanocalcium to take less effort to modify. (#14612) 2020-10-15 16:33:44 -04:00
AffectedArc07 0ad3254026 Merge pull request #14528 from TDSSS/cleaner-log-tweak
spraybottle logging change
2020-10-05 16:12:24 +01:00
AffectedArc07 3ca95d7e13 Merge pull request #14185 from Cocacolagua/go-rp-with-chef
Hot Chocolate and Chicken Soup nerf
2020-10-04 18:29:51 +01:00
AffectedArc07 54547a7ac5 Merge pull request #14440 from warior4356/cryoxadone-fix
Changes cryoxadone to check external temp instead of internal temp
2020-10-04 18:19:51 +01:00
TDSSS d2c928cc7a spraybottle logging change 2020-10-04 00:03:03 +02:00
warior4356 cb68c8b430 Bugfix 2020-10-01 13:12:16 -07:00
biotear 259a18a421 Add recipe for Iced Coco (#14489) 2020-09-30 20:25:59 -04:00
warior4356 f6965a2a76 Changes cryoxadone to check external temp 2020-09-25 22:01:07 -07:00
Qwertytoforty 59292bed7e Makes Curare have the can_synth flag = false (#14421)
Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
2020-09-25 16:10:28 -04:00
SteelSlayer 01da8413de Adds the proximity monitor component. Performance improvement for turf/Entered (#14196)
* proximity monitor

* Update code/__HELPERS/unsorted.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* farie review tweaks

* actually I need this

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2020-09-20 13:31:16 -04:00
TDSSS 33f600d0d3 Spray logging improvement (#14331)
* better logging

* now with target
2020-09-18 19:41:46 -04:00
Kugamo 3df2f3ac4e Adds Botany Jugs, and fixes hydroponic trays draining sealed containers [now without map edits] (#14212)
* Adds Botany Jugs, and lid test for hydro trays

* adds 1u and 2u transfer amounts back to changed items

* fixed item references in some .dmm

* improves weed/pest killer jug sprites, and corrects overlays procs

* removes uneeded image def

* improves sprites further

* adjusts coloring of l4z reagant

* Buffs Jugs to 80u each (from 50u)

* balances nutrient vending numbers

* resizes jugs

* fixes conflict in .dmi

* Resizes Jugs again

* removes commented out code

* Fixes

* futher fixes

* Fixes some issues, adds sounds for jugs.

* reverts to using New()

* removes jug.dm and reverts all nutrient back to bottles
2020-09-18 01:14:19 -04:00
Marginalorb 45507f0efe Adds abstract meat to silver slime blacklist 2020-09-17 12:21:15 -04:00
AzuleUtama 52eaaf5003 Reworks minor addictions for all addiction stages (#14297) 2020-09-16 14:40:04 -04:00
AffectedArc07 90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
SteelSlayer dab29cc668 Merge remote-tracking branch 'upstream/master' into spawn-removal 2020-09-16 09:38:20 -05:00
joep van der velden 0bfe9d994e Merge remote-tracking branch 'upstream/master' into bombing-logging-and-co 2020-09-16 15:26:19 +02:00
variableundefined ac1d7478fd Merge pull request #14211 from Qwertytoforty/ACKCHYUALLY
Corrects the description of Stimulants and Stimulative Agent
2020-09-15 21:01:01 -04:00
Qwertytoforty 862edd13ec Even more correct for henk 2020-09-06 11:07:34 -04:00
Qwertytoforty 62038304ce Corrects the mistake 2020-09-01 12:35:13 -04:00
mochi c2a6934f1b TM polish pass 2 2020-09-01 12:30:15 +02:00
Cocacolagua e222702fd3 hot choco and chicken soup nerf 2020-08-29 12:48:24 -03:00
mochi bd2dfeea52 Integrate #13529 2020-08-18 09:49:04 +02:00
mochi 1ebb300071 Merge branch 'master' into tgui-medical 2020-08-18 09:29:47 +02:00
AffectedArc07 5a463d22de Merge pull request #14019 from CornMyCob/gluttony
Makes it so you can no longer synth the Gluttony's Blessing reagent
2020-08-16 19:52:50 +01:00
SteelSlayer 04740436b2 hides the verb for automenders too 2020-08-08 13:18:17 -05:00
SteelSlayer e18c3ec598 Merge branch 'master' into no-transfer-verb 2020-08-08 13:11:51 -05:00
AffectedArc07 601a5db433 Merge pull request #13378 from Fox-McCloud/applicator-tweaks
Applicator QoL Tweaks
2020-08-08 16:53:18 +01:00
SteelSlayer d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
AffectedArc07 606e661ab5 Merge pull request #13523 from dearmochi/fix-stuff
Minor fixes: Cmd. amplification, nitroglycerin reagent
2020-08-07 12:48:27 +01:00
mochi e2d554202a use default null 2020-08-07 13:34:09 +02:00
mochi 038bb7a3a6 Merge branch 'master' into fix-stuff 2020-08-07 10:07:18 +02:00
CornMyCob 9e8d22d02e no more synthing 2020-08-06 20:42:09 +01:00
SteelSlayer ba2543810f Hides the "Set transfer amount" verb on certain items like syringes 2020-08-05 14:26:00 -05:00
Kyep 4e676f30c7 inline 2020-07-31 14:09:01 -07:00
Kyep b2b42d10fd updates comment 2020-07-31 14:08:30 -07:00
Kyep ef230a92d0 Stops force-feeding non-carbon mobs reagents 2020-07-29 18:54:15 -07:00
AffectedArc07 debcf5dad0 Replaces all "var " with "var/" 2020-07-29 10:06:00 +01:00
mochi f6e8f317b3 Fix ghost interact, ENTER works on modal, knob position 2020-07-20 11:57:54 +02:00
warior4356 0911425f2b Final tweaks and fixes 2020-07-14 01:43:00 -07:00
mochi aaee6b039d First polish pass 2020-07-12 11:46:42 +02:00
AffectedArc07 650c638d41 Removes semicolons 2020-07-11 18:51:45 +01:00
mochi afbff79208 TGUI Medical: ChemMaster 3000 2020-07-06 18:41:24 +02:00
mochi e35f5d053a Merge branch 'master' into tgui-medical 2020-07-06 18:36:22 +02:00
AffectedArc07 e305530d59 Obliterates Zombies 2020-07-02 21:22:55 +01:00
mochi d3ed185f7a Medical TGUI: Chemical Dispenser 2020-07-01 17:39:28 +02:00
mochi 331f59899c Merge branch 'master' into tgui-medical 2020-07-01 10:21:33 +02:00
mochi 213a773eef Medical TGUI: Chemical Heater 2020-07-01 10:19:37 +02:00