diff --git a/code/WorkInProgress/Cael_Aislinn/sculpture.dm b/code/WorkInProgress/Cael_Aislinn/sculpture.dm index 0b59bfd6f60..cc0ed849852 100644 --- a/code/WorkInProgress/Cael_Aislinn/sculpture.dm +++ b/code/WorkInProgress/Cael_Aislinn/sculpture.dm @@ -20,8 +20,8 @@ var/hibernate = 0 var/random_escape_chance = 0.5 -/mob/living/simple_animal/sculpture/proc/GrabMob(var/mob/target) - if(target && target != src) +/mob/living/simple_animal/sculpture/proc/GrabMob(var/mob/living/target) + if(target && target != src && ishuman(target)) G = new /obj/item/weapon/grab(target) G.assailant = src G.layer = 20 @@ -38,9 +38,9 @@ G.killing = 1 desc = "It's some kind of human sized, doll-like sculpture, with weird discolourations on some parts of it. It appears to be quite solid. [G ? "\red The sculpture is holding [G.affecting] in a vice-like grip." : ""]" - target.attack_log += text("\[[time_stamp()]\] Has been grabbed by an SCP-173, and is being strangled!") - log_admin("[target] ([target.ckey]) has been grabbed and is being strangled by a SCP-173.") - message_admins("Alert: [target.real_name] has been grabbed and is being strangled by a SCP-173. Set var/allow_escape = 1 to allow this player to escape temporarily, or var/hibernate = 1 to disable it entirely.") + target.attack_log += text("\[[time_stamp()]\] Has been grabbed by SCP-173, and is being strangled!") + log_admin("[target] ([target.ckey]) has been grabbed and is being strangled by SCP-173.") + message_admins("Alert: [target.real_name] has been grabbed and is being strangled by SCP-173. Set var/allow_escape = 1 to allow this player to escape temporarily, or var/hibernate = 1 to disable it entirely.") /mob/living/simple_animal/sculpture/proc/Escape() var/list/turfs = new/list() @@ -130,7 +130,7 @@ //account for darkness var/turf/T = get_turf(src) var/in_darkness = 0 - if(T.sd_lumcount == 0) + if(T.sd_lumcount == 0 && !istype(T, /turf/simulated)) in_darkness = 1 //see if we're able to do stuff