diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index caa99d7d98..28b1ff024d 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -73,6 +73,11 @@ //For all those ID-having mobs /mob/living/simple_mob/GetIdCard() + if(get_active_hand()) //CHOMPAdd Start + var/obj/item/I = get_active_hand() + var/id = I.GetID() + if(id) + return id //CHOMPAdd End if(myid) return myid diff --git a/code/modules/reagents/reagents/_reagents.dm b/code/modules/reagents/reagents/_reagents.dm index 6aa0b8e4d2..7ed50d71fd 100644 --- a/code/modules/reagents/reagents/_reagents.dm +++ b/code/modules/reagents/reagents/_reagents.dm @@ -64,7 +64,7 @@ return if(!affects_dead && M.stat == DEAD) return - if(!affects_robots && M.isSynthetic() && M.synth_reag_processing) //CHOMPEdit + if(M.isSynthetic() && (!M.synth_reag_processing || !affects_robots)) //CHOMPEdit return if(!istype(location)) return diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm index 2d0c0df718..4c0d701060 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/swoopie.dm @@ -163,6 +163,9 @@ say_got_target = list("PEST DETECTED!") /mob/living/simple_mob/vore/aggressive/corrupthound/swoopie/ClickOn(var/atom/A, var/params) + var/list/modifiers = params2list(params) + if(modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"] || modifiers["alt"]) + return ..() if(istype(Vac) && A.Adjacent(src)) face_atom(A) if(A == src)