cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00: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

20
code/game/objects/structures/crates_lockers/closets/secure/bar.dm
View File

@@ -11,13 +11,13 @@
close_sound_volume = 50
/obj/structure/closet/secure_closet/bar/populate_contents()
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/food/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)
new /obj/item/reagent_containers/drinks/cans/beer(src)

2
code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
View File

@@ -27,7 +27,7 @@
new /obj/item/clothing/accessory/medal/supply(src)
new /obj/item/rcs(src)
new /obj/item/destTagger(src)
new /obj/item/reagent_containers/food/drinks/mug/qm(src)
new /obj/item/reagent_containers/drinks/mug/qm(src)
new /obj/item/flash(src)
new /obj/item/cartridge/qm(src)
new /obj/item/storage/bag/mail(src)

2
code/game/objects/structures/crates_lockers/closets/secure/engineering_lockers.dm
View File

@@ -24,7 +24,7 @@
new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/door_remote/chief_engineer(src)
new /obj/item/rpd(src)
new /obj/item/reagent_containers/food/drinks/mug/ce(src)
new /obj/item/reagent_containers/drinks/mug/ce(src)
new /obj/item/organ/internal/eyes/cybernetic/meson(src)
new /obj/item/clothing/accessory/medal/engineering(src)
new /obj/item/holosign_creator/atmos(src)

16
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
View File

@@ -15,9 +15,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/populate_contents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/condiment/flour(src)
new /obj/item/reagent_containers/food/condiment/rice(src)
new /obj/item/reagent_containers/food/condiment/sugar(src)
new /obj/item/reagent_containers/condiment/flour(src)
new /obj/item/reagent_containers/condiment/rice(src)
new /obj/item/reagent_containers/condiment/sugar(src)
/obj/structure/closet/secure_closet/freezer/kitchen/mining
@@ -30,9 +30,9 @@
/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/populate_contents()
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/condiment/milk(src)
new /obj/item/reagent_containers/condiment/milk(src)
for(var/i = 0, i < 5, i++)
new /obj/item/reagent_containers/food/condiment/soymilk(src)
new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i = 0, i < 2, i++)
new /obj/item/storage/fancy/egg_box(src)
@@ -43,7 +43,7 @@
/obj/structure/closet/secure_closet/freezer/meat/populate_contents()
for(var/i in 1 to 4)
new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/food/snacks/meat/monkey(src)
/obj/structure/closet/secure_closet/freezer/meat/open
req_access = null
@@ -56,8 +56,8 @@
/obj/structure/closet/secure_closet/freezer/fridge/populate_contents()
for(var/i in 1 to 5)
new /obj/item/reagent_containers/food/condiment/milk(src)
new /obj/item/reagent_containers/food/condiment/soymilk(src)
new /obj/item/reagent_containers/condiment/milk(src)
new /obj/item/reagent_containers/condiment/soymilk(src)
for(var/i in 1 to 2)
new /obj/item/storage/fancy/egg_box(src)

4
code/game/objects/structures/crates_lockers/closets/secure/medical_lockers.dm
View File

@@ -135,7 +135,7 @@
new /obj/item/storage/pill_bottle/psychiatrist(src)
new /obj/random/plushie(src)
for(var/i in 0 to 3)
var/candy = pick(subtypesof(/obj/item/reagent_containers/food/snacks/candy/fudge))
var/candy = pick(subtypesof(/obj/item/food/snacks/candy/fudge))
new candy(src)
/obj/structure/closet/secure_closet/CMO
@@ -163,7 +163,7 @@
new /obj/item/reagent_containers/hypospray/CMO(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
new /obj/item/door_remote/chief_medical_officer(src)
new /obj/item/reagent_containers/food/drinks/mug/cmo(src)
new /obj/item/reagent_containers/drinks/mug/cmo(src)
new /obj/item/clothing/accessory/medal/medical(src)
new /obj/item/storage/briefcase(src)
new /obj/item/clothing/mask/gas(src)

4
code/game/objects/structures/crates_lockers/closets/secure/miscjobs.dm
View File

@@ -17,7 +17,7 @@
new /obj/item/clown_recorder(src)
new /obj/item/bikehorn(src)
new /obj/item/reagent_containers/spray/waterflower(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
new /obj/item/reagent_containers/drinks/bottle/bottleofbanana(src)
new /obj/item/toy/crayon/rainbow(src)
new /obj/item/seeds/banana(src)
new /obj/item/restraints/handcuffs/toy(src)
@@ -44,7 +44,7 @@
new /obj/item/clothing/shoes/black(src)
new /obj/item/storage/backpack/mime(src)
new /obj/item/toy/crayon/mime(src)
new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
new /obj/item/reagent_containers/drinks/bottle/bottleofnothing(src)
new /obj/item/cane(src)
/obj/structure/closet/secure_closet/syndicate_officer

2
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -57,7 +57,7 @@
new /obj/item/flash(src)
new /obj/item/laser_pointer(src)
new /obj/item/door_remote/research_director(src)
new /obj/item/reagent_containers/food/drinks/mug/rd(src)
new /obj/item/reagent_containers/drinks/mug/rd(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic(src)
new /obj/item/clothing/accessory/medal/science(src)

8
code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
View File

@@ -18,7 +18,7 @@
new /obj/item/gun/energy/gun(src)
new /obj/item/flash(src)
new /obj/item/door_remote/captain(src)
new /obj/item/reagent_containers/food/drinks/mug/cap(src)
new /obj/item/reagent_containers/drinks/mug/cap(src)
new /obj/item/tank/internals/emergency_oxygen/double(src)
/obj/structure/closet/secure_closet/hop
@@ -35,7 +35,7 @@
new /obj/item/gun/energy/gun/mini(src)
new /obj/item/flash(src)
new /obj/item/door_remote/civillian(src)
new /obj/item/reagent_containers/food/drinks/mug/hop(src)
new /obj/item/reagent_containers/drinks/mug/hop(src)
new /obj/item/clothing/accessory/medal/service(src)
new /obj/item/storage/bag/garment/head_of_personnel(src)
@@ -62,10 +62,10 @@
new /obj/item/storage/belt/security/full(src)
new /obj/item/gun/energy/gun/hos(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/reagent_containers/food/drinks/mug/hos(src)
new /obj/item/reagent_containers/drinks/mug/hos(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/security(src)
new /obj/item/clothing/accessory/medal/security(src)
new /obj/item/reagent_containers/food/drinks/flask/barflask(src)
new /obj/item/reagent_containers/drinks/flask/barflask(src)
new /obj/item/clothing/mask/gas/sechailer(src)
/obj/structure/closet/secure_closet/warden