cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +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/fish/fish_items.dm
+10 -10
View File
@@ -66,7 +66,7 @@
can_hold = list(
/obj/item/fish,
/obj/item/fish_eggs,
/obj/item/reagent_containers/food/snacks/shrimp,
/obj/item/food/snacks/shrimp,
)
resistance_flags = FLAMMABLE
@@ -74,7 +74,7 @@
// Fish Items //
//////////////////////////////////////////////
/obj/item/reagent_containers/food/snacks/shrimp
/obj/item/food/snacks/shrimp
name = "shrimp"
desc = "A single raw shrimp."
icon = 'icons/obj/food/seafood.dmi'
@@ -82,12 +82,12 @@
filling_color = "#FF1C1C"
bitesize = 1
/obj/item/reagent_containers/food/snacks/shrimp/Initialize(mapload)
/obj/item/food/snacks/shrimp/Initialize(mapload)
. = ..()
desc = pick("Anyway, like I was sayin', shrimp is the fruit of the sea.", "You can barbecue it, boil it, broil it, bake it, saute it.")
reagents.add_reagent("protein", 1)
/obj/item/reagent_containers/food/snacks/feederfish
/obj/item/food/snacks/feederfish
name = "feeder fish"
desc = "A tiny feeder fish. Sure doesn't look very filling..."
icon = 'icons/obj/food/seafood.dmi'
@@ -95,7 +95,7 @@
filling_color = "#FF1C1C"
bitesize = 1
/obj/item/reagent_containers/food/snacks/feederfish/Initialize(mapload)
/obj/item/food/snacks/feederfish/Initialize(mapload)
. = ..()
reagents.add_reagent("protein", 1)
@@ -170,8 +170,8 @@
/obj/item/fish/catfish/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
new /obj/item/reagent_containers/food/snacks/catfishmeat(get_turf(src))
new /obj/item/food/snacks/catfishmeat(get_turf(src))
new /obj/item/food/snacks/catfishmeat(get_turf(src))
qdel(src)
return
..()
@@ -189,8 +189,8 @@
/obj/item/fish/salmon/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
new /obj/item/reagent_containers/food/snacks/salmonmeat(get_turf(src))
new /obj/item/food/snacks/salmonmeat(get_turf(src))
new /obj/item/food/snacks/salmonmeat(get_turf(src))
qdel(src)
return
..()
@@ -205,7 +205,7 @@
/obj/item/fish/babycarp/attackby(obj/item/O, mob/user as mob)
if(is_sharp(O))
to_chat(user, "You carefully clean and gut \the [src.name].")
new /obj/item/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
new /obj/item/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall.
qdel(src)
return
..()
code/modules/fish/fish_types.dm
+2 -2
View File
@@ -52,13 +52,13 @@
/datum/fish/shrimp
fish_name = "shrimp"
egg_item = /obj/item/fish_eggs/shrimp
fish_item = /obj/item/reagent_containers/food/snacks/shrimp
fish_item = /obj/item/food/snacks/shrimp
crossbreeder = 0
/datum/fish/feederfish
fish_name = "feeder fish"
egg_item = /obj/item/fish_eggs/feederfish
fish_item = /obj/item/reagent_containers/food/snacks/feederfish
fish_item = /obj/item/food/snacks/feederfish
/datum/fish/feederfish/special_interact(obj/machinery/fishtank/my_tank)
if(!my_tank || !istype(my_tank))