mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Mind Binder food and cryo fixes (#8148)
This commit is contained in:
@@ -423,9 +423,11 @@
|
||||
|
||||
for(var/obj/item/W in items)
|
||||
if(islist(W.possessed_voice)) //CHOMPAdd
|
||||
W.forceMove(get_turf(src)) //CHOMPAdd - this crashes the MC, so now they get spat back out.
|
||||
items -= W
|
||||
continue //CHOMPAdd
|
||||
for(var/mob/living/V in W.possessed_voice) //CHOMPEdit - Revert temporary patch
|
||||
//CHOMPEdit Start - Don't try and despawn, instead just ghost and delete, same as item destruction
|
||||
V.ghostize(0)
|
||||
qdel(V)
|
||||
//CHOMPEdit End
|
||||
//VOREStation Addition Start
|
||||
if(istype(W, /obj/item/device/pda))
|
||||
var/obj/item/device/pda/found_pda = W
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
pixel_y = (CELLSIZE * (0.5 + cell_y)) - center_of_mass["y"]
|
||||
|
||||
/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)
|
||||
food_inserted_micros -= M
|
||||
M.forceMove(get_turf(src))
|
||||
|
||||
Reference in New Issue
Block a user