cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 21:48:21 +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 19:00:02 +00:00
committed by GitHub
co-authored by Ryan Henri215
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/modules/research/designs/autolathe_designs.dm
+3 -3
View File
@@ -276,7 +276,7 @@
id = "drinking_glass"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 100)
build_path = /obj/item/reagent_containers/food/drinks/drinkingglass
build_path = /obj/item/reagent_containers/drinks/drinkingglass
category = list("initial","Dinnerware")
/datum/design/shot_glass
@@ -284,7 +284,7 @@
id = "shot_glass"
build_type = AUTOLATHE
materials = list(MAT_GLASS = 50)
build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass
build_path = /obj/item/reagent_containers/drinks/drinkingglass/shotglass
category = list("initial","Dinnerware")
/datum/design/shaker
@@ -292,7 +292,7 @@
id = "shaker"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1500)
build_path = /obj/item/reagent_containers/food/drinks/shaker
build_path = /obj/item/reagent_containers/drinks/shaker
category = list("initial","Dinnerware")
/datum/design/cultivator
code/modules/research/designs/biogenerator_designs.dm
+8 -8
View File
@@ -23,7 +23,7 @@
id = "milk_carton"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 100)
build_path = /obj/item/reagent_containers/food/condiment/milk
build_path = /obj/item/reagent_containers/condiment/milk
category = list("initial","Food")
/datum/design/cream_carton
@@ -31,7 +31,7 @@
id = "cream_carton"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 300)
build_path = /obj/item/reagent_containers/food/drinks/bottle/cream
build_path = /obj/item/reagent_containers/drinks/bottle/cream
category = list("initial","Food")
/datum/design/black_pepper
@@ -47,7 +47,7 @@
id = "pepper_mill"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 50)
build_path = /obj/item/reagent_containers/food/condiment/peppermill
build_path = /obj/item/reagent_containers/condiment/peppermill
make_reagents = list()
category = list("initial","Food")
@@ -56,7 +56,7 @@
id = "mcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube
build_path = /obj/item/food/snacks/monkeycube
category = list("initial", "Food")
/datum/design/farwa_cube
@@ -64,7 +64,7 @@
id = "fcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube/farwacube
build_path = /obj/item/food/snacks/monkeycube/farwacube
category = list("initial", "Food")
/datum/design/wolpin_cube
@@ -72,7 +72,7 @@
id = "wcube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube/wolpincube
build_path = /obj/item/food/snacks/monkeycube/wolpincube
category = list("initial", "Food")
/datum/design/stok_cube
@@ -80,7 +80,7 @@
id = "scube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube/stokcube
build_path = /obj/item/food/snacks/monkeycube/stokcube
category = list("initial", "Food")
/datum/design/neaera_cube
@@ -88,7 +88,7 @@
id = "ncube"
build_type = BIOGENERATOR
materials = list(MAT_BIOMASS = 250)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube/neaeracube
build_path = /obj/item/food/snacks/monkeycube/neaeracube
category = list("initial", "Food")
/datum/design/ez_nut
code/modules/research/designs/bluespace_designs.dm
+1 -1
View File
@@ -98,5 +98,5 @@
id = "bluespaceshotglass"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_BLUESPACE = 500)
build_path = /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/bluespace
build_path = /obj/item/reagent_containers/drinks/drinkingglass/shotglass/bluespace
category = list("Bluespace")
code/modules/research/experimentor.dm
+5 -5
View File
@@ -30,8 +30,8 @@
var/list/item_reactions = list()
var/list/valid_items = list() //valid items for special reactions like transforming
var/list/critical_items = list() //items that can cause critical reactions
var/list/blocked_items = list(/obj/item/reagent_containers/food/drinks/bottle/dragonsbreath,
/obj/item/reagent_containers/food/drinks/bottle/immortality)
var/list/blocked_items = list(/obj/item/reagent_containers/drinks/bottle/dragonsbreath,
/obj/item/reagent_containers/drinks/bottle/immortality)
/// Used for linking with rnd consoles
var/range = 5
@@ -55,7 +55,7 @@
valid_items += I
probWeight++
if(ispath(I,/obj/item/reagent_containers/food))
if(ispath(I,/obj/item/food))
var/obj/item/tempCheck = I
if(I in blocked_items)
continue
@@ -340,7 +340,7 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
playsound(loc, 'sound/machines/ding.ogg', 50, 1)
var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src))))
chosenchem = pick("plasma","capsaicin","ethanol")
C.reagents.remove_any(25)
C.reagents.add_reagent(chosenchem , 50)
@@ -391,7 +391,7 @@
visible_message("[src] lowers [exp_on]'s temperature.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("<span class='warning'>[src]'s emergency coolant system gives off a small ding!</span>")
var/obj/item/reagent_containers/food/drinks/coffee/C = new /obj/item/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src))))
playsound(loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
chosenchem = pick("uranium","frostoil","ephedrine")
C.reagents.remove_any(25)
code/modules/research/xenobiology/xenobio_camera.dm
+2 -2
View File
@@ -177,7 +177,7 @@
return ..()
/obj/machinery/computer/camera_advanced/xenobio/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/reagent_containers/food/snacks/monkeycube))
if(istype(O, /obj/item/food/snacks/monkeycube))
if(user.drop_item())
monkeys++
to_chat(user, "<span class='notice'>You feed [O] to [src]. It now has [monkeys] monkey cubes stored.</span>")
@@ -192,7 +192,7 @@
else if(istype(O, /obj/item/storage/bag) || istype(O, /obj/item/storage/box))
var/obj/item/storage/P = O
var/loaded = 0
for(var/obj/item/reagent_containers/food/snacks/monkeycube/MC in P.contents)
for(var/obj/item/food/snacks/monkeycube/MC in P.contents)
loaded = 1
monkeys++
P.remove_from_storage(MC)