cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes food not a subtype of reagent holders (#23379)

Browse Source 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
DGamerL
2024-01-21 20:00:02 +01:00
committed by GitHub
parent 22fbd9aced
commit db578cdc6f
276 changed files with 10289 additions and 10287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/outfit_admin.dm
+7 -7
View File
@@ -50,7 +50,7 @@
/obj/item/storage/box/engineer = 1,
/obj/item/flashlight = 1,
/obj/item/card/emag = 1,
/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1
/obj/item/food/snacks/syndidonkpocket = 1
)
var/id_icon = "syndie"
@@ -103,7 +103,7 @@
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/crowbar/red = 1,
/obj/item/grenade/plastic/c4 = 1,
/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
/obj/item/food/snacks/syndidonkpocket = 1,
/obj/item/flashlight = 1,
/obj/item/clothing/shoes/combat = 1
)
@@ -377,13 +377,13 @@
l_ear = /obj/item/radio/headset
glasses = /obj/item/clothing/glasses/thermal/monocle
id = /obj/item/card/id
l_pocket = /obj/item/reagent_containers/food/snacks/grown/banana
l_pocket = /obj/item/food/snacks/grown/banana
r_pocket = /obj/item/bikehorn
r_hand = /obj/item/fireaxe
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/flashlight = 1,
/obj/item/reagent_containers/food/drinks/bottle/bottleofbanana = 1,
/obj/item/reagent_containers/drinks/bottle/bottleofbanana = 1,
/obj/item/grenade/clown_grenade = 1,
/obj/item/melee/baton/cattleprod = 1,
/obj/item/stock_parts/cell/super = 1,
@@ -416,14 +416,14 @@
pda = /obj/item/pda/mime
backpack_contents = list(
/obj/item/storage/box/survival = 1,
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1,
/obj/item/reagent_containers/drinks/bottle/bottleofnothing = 1,
/obj/item/toy/crayon/mime = 1,
/obj/item/gun/projectile/automatic/pistol = 1,
/obj/item/ammo_box/magazine/m10mm = 1,
/obj/item/suppressor = 1,
/obj/item/card/emag = 1,
/obj/item/radio/uplink = 1,
/obj/item/reagent_containers/food/snacks/syndidonkpocket = 1,
/obj/item/food/snacks/syndidonkpocket = 1,
/obj/item/flashlight = 1
)
@@ -1307,7 +1307,7 @@
/obj/item/stamp/clown = 1,
/obj/item/toy/crayon/rainbow = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/food/snacks/grown/banana = 1,
)
shoes = /obj/item/clothing/shoes/clown_shoes
code/datums/outfits/outfit_debug.dm
+1 -1
View File
@@ -313,7 +313,7 @@
// put cool admin-only shit here :)
/obj/item/storage/box/debug/misc_debug/populate_contents()
new /obj/item/badminBook(src)
new /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka(src)
new /obj/item/reagent_containers/drinks/bottle/vodka/badminka(src)
new /obj/item/crowbar/power(src) // >admin only lol
new /obj/item/clothing/gloves/fingerless/rapid/admin(src)
new /obj/item/clothing/under/misc/acj(src)
code/datums/recipe.dm
+1 -1
View File
@@ -36,7 +36,7 @@
/datum/recipe
var/list/reagents // example: = list("berryjuice" = 5) // do not list same reagent twice
var/list/items // example: =list(/obj/item/crowbar, /obj/item/welder) // place /foo/bar before /foo
var/result //example: = /obj/item/reagent_containers/food/snacks/donut
var/result //example: = /obj/item/food/snacks/donut
var/time = 100 // 1/10 part of second
/// Whether or not an upgraded kitchen machine will create more products using the same amount of ingredients
var/duplicate = TRUE
code/datums/uplink_items/uplink_traitor.dm
+1 -1
View File
@@ -91,7 +91,7 @@
name = "Chef Excellence's Special Sauce"
desc = "A custom sauce made from the highly poisonous fly amanita mushrooms. Anyone who ingests it will take variable toxin damage depending on how long it has been in their system, with a higher dosage taking longer to metabolize."
reference = "CESS"
item = /obj/item/reagent_containers/food/condiment/syndisauce
item = /obj/item/reagent_containers/condiment/syndisauce
cost = 10
job = list("Chef")
surplus = 0 // Far too specific in its use.