cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

no item acid effect on itemsafe modes

Browse Source
This commit is contained in:
Verkister
2023-04-11 14:11:15 +03:00
parent 87c321a7da
commit 4b3b635ebf
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/reagents/reagents/dispenser.dm
View File

@@ -373,9 +373,14 @@
if(alien == IS_GREY) //ywedit if(alien == IS_GREY) //ywedit
return return
if(ishuman(M)) if(ishuman(M))
var/item_digestion = TRUE //CHOMPEdit Start
if(isbelly(M.loc))
var/obj/belly/B = M.loc
if(B.item_digest_mode == IM_HOLD || B.item_digest_mode == IM_DIGEST_FOOD)
item_digestion = FALSE
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
if(H.head) if(H.head)
if(H.head.unacidable || is_type_in_list(H.head,item_digestion_blacklist)) //CHOMPEdit if(H.head.unacidable || is_type_in_list(H.head,item_digestion_blacklist) || !item_digestion)
to_chat(H, "<span class='danger'>Your [H.head] protects you from the acid.</span>") to_chat(H, "<span class='danger'>Your [H.head] protects you from the acid.</span>")
remove_self(volume) remove_self(volume)
return return
@@ -389,7 +394,7 @@
return return
if(H.wear_mask) if(H.wear_mask)
if(H.wear_mask.unacidable || is_type_in_list(H.wear_mask,item_digestion_blacklist)) //CHOMPEdit if(H.wear_mask.unacidable || is_type_in_list(H.wear_mask,item_digestion_blacklist) || !item_digestion)
to_chat(H, "<span class='danger'>Your [H.wear_mask] protects you from the acid.</span>") to_chat(H, "<span class='danger'>Your [H.wear_mask] protects you from the acid.</span>")
remove_self(volume) remove_self(volume)
return return
@@ -403,7 +408,7 @@
return return
if(H.glasses) if(H.glasses)
if(H.glasses.unacidable || is_type_in_list(H.glasses,item_digestion_blacklist)) //CHOMPEdit if(H.glasses.unacidable || is_type_in_list(H.glasses,item_digestion_blacklist) || !item_digestion) //CHOMPEdit End
to_chat(H, "<span class='danger'>Your [H.glasses] partially protect you from the acid!</span>") to_chat(H, "<span class='danger'>Your [H.glasses] partially protect you from the acid!</span>")
removed /= 2 removed /= 2
else if(removed > meltdose) else if(removed > meltdose)
@@ -433,7 +438,12 @@
/datum/reagent/acid/touch_obj(var/obj/O) /datum/reagent/acid/touch_obj(var/obj/O)
..() ..()
if(O.unacidable || is_type_in_list(O,item_digestion_blacklist)) //CHOMPEdit) var/item_digestion = TRUE //CHOMPEdit Start
if(isbelly(O.loc))
var/obj/belly/B = O.loc
if(B.item_digest_mode == IM_HOLD || B.item_digest_mode == IM_DIGEST_FOOD)
item_digestion = FALSE
if(O.unacidable || is_type_in_list(O,item_digestion_blacklist) || !item_digestion) //CHOMPEdit End
return return
if((istype(O, /obj/item) || istype(O, /obj/effect/plant)) && (volume > meltdose)) if((istype(O, /obj/item) || istype(O, /obj/effect/plant)) && (volume > meltdose))
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc) var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)