From 2a30bd9d3dc0a23f74625c86a2951e670451617b Mon Sep 17 00:00:00 2001 From: Rob Nelson Date: Mon, 3 Feb 2014 22:26:34 -0800 Subject: [PATCH] More sculpture fixes. Conflicts: baystation12.dme --- baystation12.dme | 1 + code/WorkInProgress/Cael_Aislinn/sculpture.dm | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 6ea31a8b6d6..2624afaac9e 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1382,6 +1382,7 @@ #include "code\WorkInProgress\fireworks.dm" #include "code\WorkInProgress\periodic_news.dm" #include "code\WorkInProgress\Apples\artifacts.dm" +#include "code\WorkInProgress\Cael_Aislinn\sculpture.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\falsewall.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle.dm" #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_animals.dm" diff --git a/code/WorkInProgress/Cael_Aislinn/sculpture.dm b/code/WorkInProgress/Cael_Aislinn/sculpture.dm index a4d900174e0..a7548d2562a 100644 --- a/code/WorkInProgress/Cael_Aislinn/sculpture.dm +++ b/code/WorkInProgress/Cael_Aislinn/sculpture.dm @@ -22,10 +22,8 @@ /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 - G.affecting = target + G = new /obj/item/weapon/grab(src, target) + G.loc=src target.grabbed_by += G G.synch() target.LAssailant = src @@ -48,8 +46,8 @@ continue else if(istype(thisturf, /turf/simulated/wall)) continue -// else if(istype(thisturf, /turf/simulated/mineral)) -// continue + else if(istype(thisturf, /turf/unsimulated/mineral)) + continue else if(istype(thisturf, /turf/simulated/shuttle/wall)) continue else if(istype(thisturf, /turf/unsimulated/wall)) @@ -209,8 +207,8 @@ continue else if(istype(thisturf, /turf/simulated/wall)) continue -// else if(istype(thisturf, /turf/simulated/mineral)) -// continue + else if(istype(thisturf, /turf/unsimulated/mineral)) + continue else if(istype(thisturf, /turf/simulated/shuttle/wall)) continue else if(istype(thisturf, /turf/unsimulated/wall))