cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +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/surgery/organs/organ_internal.dm
+4 -4
View File
@@ -106,7 +106,7 @@
/obj/item/organ/internal/proc/prepare_eat()
if(is_robotic())
return //no eating cybernetic implants!
var/obj/item/reagent_containers/food/snacks/organ/S = new
var/obj/item/food/snacks/organ/S = new
S.name = name
S.desc = desc
S.icon = icon
@@ -126,19 +126,19 @@
/obj/item/organ/internal/proc/render()
return
/obj/item/reagent_containers/food/snacks/organ
/obj/item/food/snacks/organ
name = "appendix"
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
/obj/item/reagent_containers/food/snacks/organ/Initialize(mapload)
/obj/item/food/snacks/organ/Initialize(mapload)
. = ..()
reagents.add_reagent("nutriment", 5)
/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
if(M == user && ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/reagent_containers/food/snacks/S = prepare_eat()
var/obj/item/food/snacks/S = prepare_eat()
if(S)
H.drop_item()
H.put_in_active_hand(S)
code/modules/surgery/organs_internal.dm
+4 -4
View File
@@ -377,11 +377,11 @@
name = "implant an organ"
allowed_tools = list(
/obj/item/organ/internal = 100,
/obj/item/reagent_containers/food/snacks/organ = 0 // there for the flavor text
/obj/item/food/snacks/organ = 0 // there for the flavor text
)
/datum/surgery_step/internal/manipulate_organs/implant/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(istype(tool, /obj/item/reagent_containers/food/snacks/organ))
if(istype(tool, /obj/item/food/snacks/organ))
to_chat(user, "<span class='warning'>[tool] was bitten by someone! It's too damaged to use!</span>")
return SURGERY_BEGINSTEP_SKIP
@@ -469,8 +469,8 @@
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/syringe = 100,
/obj/item/reagent_containers/glass/bottle = 90,
/obj/item/reagent_containers/food/drinks/drinkingglass = 85,
/obj/item/reagent_containers/food/drinks/bottle = 80,
/obj/item/reagent_containers/drinks/drinkingglass = 85,
/obj/item/reagent_containers/drinks/bottle = 80,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 60,
/obj/item/reagent_containers/glass/bucket = 50
code/modules/surgery/other.dm
+2 -2
View File
@@ -220,8 +220,8 @@
allowed_tools = list(
/obj/item/reagent_containers/dropper = 100,
/obj/item/reagent_containers/glass/bottle = 90,
/obj/item/reagent_containers/food/drinks/drinkingglass = 85,
/obj/item/reagent_containers/food/drinks/bottle = 80,
/obj/item/reagent_containers/drinks/drinkingglass = 85,
/obj/item/reagent_containers/drinks/bottle = 80,
/obj/item/reagent_containers/glass/beaker = 75,
/obj/item/reagent_containers/spray = 60,
/obj/item/reagent_containers/glass/bucket = 50