cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 20:47:10 +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/game/objects/effects/effects.dm
+1 -1
View File
@@ -99,7 +99,7 @@
reagents.add_reagent_list(scoop_reagents)
/obj/effect/decal/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks))
if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/drinks))
scoop(I, user)
else if(issimulatedturf(loc))
I.melee_attack_chain(user, loc)
code/game/objects/effects/meteors.dm
+4 -4
View File
@@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 2
heavy = TRUE
meteorsound = 'sound/effects/blobattack.ogg'
meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
meteordrop = list(/obj/item/food/snacks/meat/human, /obj/item/organ/internal/heart, /obj/item/organ/internal/lungs, /obj/item/organ/internal/appendix)
var/meteorgibs = /obj/effect/gibspawner/generic
/obj/effect/meteor/meaty/make_debris()
@@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
//Meaty Ore Xeno edition
/obj/effect/meteor/meaty/xeno
color = "#5EFF00"
meteordrop = list(/obj/item/reagent_containers/food/snacks/monstermeat/xenomeat)
meteordrop = list(/obj/item/food/snacks/monstermeat/xenomeat)
meteorgibs = /obj/effect/gibspawner/xeno
/obj/effect/meteor/meaty/xeno/Initialize(mapload, target)
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 10
hitpwr = EXPLODE_DEVASTATE
meteorsound = 'sound/effects/blobattack.ogg'
meteordrop = list(/obj/item/reagent_containers/food/snacks/meat)
meteordrop = list(/obj/item/food/snacks/meat)
var/meteorgibs = /obj/effect/gibspawner/generic
/obj/effect/meteor/goreops/make_debris()
@@ -370,7 +370,7 @@ GLOBAL_LIST_INIT(meteors_ops, list(/obj/effect/meteor/goreops)) //Meaty Ops
hits = 10
heavy = TRUE
dropamt = 1
meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin)
meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/food/snacks/grown/pumpkin)
/obj/effect/meteor/pumpkin/Initialize(mapload, target)
. = ..()
code/game/objects/effects/spawners/lootdrop.dm
+12 -12
View File
@@ -421,20 +421,20 @@
lootcount = 3
lootdoubles = FALSE
var/soups = list(
/obj/item/reagent_containers/food/snacks/soup/beetsoup,
/obj/item/reagent_containers/food/snacks/soup/stew,
/obj/item/reagent_containers/food/snacks/soup/hotchili,
/obj/item/reagent_containers/food/snacks/soup/nettlesoup,
/obj/item/reagent_containers/food/snacks/soup/meatballsoup)
/obj/item/food/snacks/soup/beetsoup,
/obj/item/food/snacks/soup/stew,
/obj/item/food/snacks/soup/hotchili,
/obj/item/food/snacks/soup/nettlesoup,
/obj/item/food/snacks/soup/meatballsoup)
var/salads = list(
/obj/item/reagent_containers/food/snacks/salad/herb,
/obj/item/reagent_containers/food/snacks/salad/valid,
/obj/item/reagent_containers/food/snacks/salad/aesir)
/obj/item/food/snacks/salad/herb,
/obj/item/food/snacks/salad/valid,
/obj/item/food/snacks/salad/aesir)
var/mains = list(
/obj/item/reagent_containers/food/snacks/enchiladas,
/obj/item/reagent_containers/food/snacks/stewedsoymeat,
/obj/item/reagent_containers/food/snacks/burger/bigbite,
/obj/item/reagent_containers/food/snacks/burger/superbite)
/obj/item/food/snacks/enchiladas,
/obj/item/food/snacks/stewedsoymeat,
/obj/item/food/snacks/burger/bigbite,
/obj/item/food/snacks/burger/superbite)
/obj/effect/spawner/lootdrop/three_course_meal/Initialize(mapload)
loot = list(pick(soups) = 1,pick(salads) = 1,pick(mains) = 1)
code/game/objects/effects/spawners/random_spawners.dm
+1 -1
View File
@@ -266,7 +266,7 @@
spawn_inside = null
result = list(/datum/nothing = 1,
/obj/item/wrench = 1,
/obj/item/reagent_containers/food/snacks/syndicake = 1,
/obj/item/food/snacks/syndicake = 1,
/obj/item/coin/antagtoken/syndicate = 1,
/obj/item/gun/projectile/automatic/pistol = 1)