cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mind Binder food and cryo fixes (#8148)

Browse Source
This commit is contained in:
Eli
2024-04-05 16:46:01 +11:00
committed by GitHub
parent 948991b060
commit b324c516f6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/machinery/cryopod.dm
View File

@@ -423,9 +423,11 @@
for(var/obj/item/W in items) for(var/obj/item/W in items)
if(islist(W.possessed_voice)) //CHOMPAdd if(islist(W.possessed_voice)) //CHOMPAdd
W.forceMove(get_turf(src)) //CHOMPAdd - this crashes the MC, so now they get spat back out. for(var/mob/living/V in W.possessed_voice) //CHOMPEdit - Revert temporary patch
items -= W //CHOMPEdit Start - Don't try and despawn, instead just ghost and delete, same as item destruction
continue //CHOMPAdd V.ghostize(0)
qdel(V)
//CHOMPEdit End
//VOREStation Addition Start //VOREStation Addition Start
if(istype(W, /obj/item/device/pda)) if(istype(W, /obj/item/device/pda))
var/obj/item/device/pda/found_pda = W var/obj/item/device/pda/found_pda = W

1
code/modules/food/food.dm
View File

@@ -56,6 +56,7 @@
pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass["y"] pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass["y"]
/obj/item/weapon/reagent_containers/food/container_resist(mob/living/M) /obj/item/weapon/reagent_containers/food/container_resist(mob/living/M)
if(istype(M, /mob/living/voice)) return // CHOMPAdd - Stops sentient food from astral projecting
if(food_inserted_micros) if(food_inserted_micros)
food_inserted_micros -= M food_inserted_micros -= M
M.forceMove(get_turf(src)) M.forceMove(get_turf(src))