diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index bec6dc1012..3c6ea63441 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -265,48 +265,45 @@
var/list/possible_mobs = list()
for(var/obj/belly/B in src.vore_organs)
for(var/mob/living/H in B)
- if( (ishuman(H) || isrobot(H)) && H.ckey )
+ if((ishuman(H) || isrobot(H)) && H.ckey)
possible_mobs += H
else
continue
- var/mob/living/carbon/human/M
- var/input = tgui_input_list(src, "Select a mob to take over:", "Take Over Prey", possible_mobs)
- if(!input)
- return
- M = input
- if(!M)
+ var/mob/living/L = tgui_input_list(src, "Select a mob to take over:", "Take Over Prey", possible_mobs)
+ if(!L)
return
// Adding a ishuman check here, since silicon mobs don't have a resleeve_lock from what I can tell.
- if(ishuman(M))
+ if(ishuman(L))
+ var/mob/living/carbon/human/M = L
if(M.resleeve_lock && ckey != M.resleeve_lock)
to_chat(src, "\The [M] cannot be impersonated!")
return
- if(tgui_alert(src, "You selected [M] to attempt to take over. Are you sure?", "Take Over Prey",list("No","Yes")) == "Yes")
- log_admin("[key_name_admin(src)] offered [M] to swap bodies as a morph.")
- if(tgui_alert(M, "\The [src] has elected to attempt to take over your body and control you. Is this something you will allow to happen?", "Allow Morph To Take Over",list("No","Yes")) == "Yes")
- if(tgui_alert(M, "Are you sure? The only way to undo this on your own is to OOC Escape.", "Allow Morph To Take Over",list("No","Yes")) == "Yes")
+ if(tgui_alert(src, "You selected [L] to attempt to take over. Are you sure?", "Take Over Prey",list("No","Yes")) == "Yes")
+ log_admin("[key_name_admin(src)] offered [L] to swap bodies as a morph.")
+ if(tgui_alert(L, "\The [src] has elected to attempt to take over your body and control you. Is this something you will allow to happen?", "Allow Morph To Take Over",list("No","Yes")) == "Yes")
+ if(tgui_alert(L, "Are you sure? The only way to undo this on your own is to OOC Escape.", "Allow Morph To Take Over",list("No","Yes")) == "Yes")
if(buckled)
buckled.unbuckle_mob()
- if(M.buckled)
- M.buckled.unbuckle_mob()
+ if(L.buckled)
+ L.buckled.unbuckle_mob()
if(LAZYLEN(buckled_mobs))
for(var/buckledmob in buckled_mobs)
riding_datum.force_dismount(buckledmob)
- if(LAZYLEN(M.buckled_mobs))
- for(var/p_buckledmob in M.buckled_mobs)
- M.riding_datum.force_dismount(p_buckledmob)
+ if(LAZYLEN(L.buckled_mobs))
+ for(var/p_buckledmob in L.buckled_mobs)
+ L.riding_datum.force_dismount(p_buckledmob)
if(pulledby)
pulledby.stop_pulling()
- if(M.pulledby)
- M.pulledby.stop_pulling()
+ if(L.pulledby)
+ L.pulledby.stop_pulling()
stop_pulling()
original_ckey = ckey
- log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(M)] as a morph at [get_area(src)] - [COORD(src)].")
- new /mob/living/simple_mob/vore/morph/dominated_prey(M.vore_selected, M.ckey, src, M)
+ log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(L)] as a morph at [get_area(src)] - [COORD(src)].")
+ new /mob/living/simple_mob/vore/morph/dominated_prey(L.vore_selected, L.ckey, src, L)
else
- to_chat(src, "\The [M] declined your request for control.")
+ to_chat(src, "\The [L] declined your request for control.")
else
- to_chat(src, "\The [M] declined your request for control.")
+ to_chat(src, "\The [L] declined your request for control.")
/mob/living/simple_mob/vore/morph/dominated_prey
name = "subservient node"