Merge pull request #4480 from Incoming5643/statuefix

fixes #4479
This commit is contained in:
Alex
2014-08-19 10:20:56 +01:00
2 changed files with 5 additions and 2 deletions
@@ -23,6 +23,8 @@
L.client.eye = src
L.loc = src
L.sdisabilities += MUTE
L.faction += "mimic" //Stops mimics from instaqdeling people in statues
health = L.health + 100 //stoning damaged mobs will result in easier to shatter statues
intialTox = L.getToxLoss()
intialFire = L.getFireLoss()
@@ -79,6 +81,7 @@
M.loc = src.loc
M.sdisabilities -= MUTE
M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
M.faction -= "mimic"
if(M.client)
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
@@ -154,4 +157,4 @@
qdel(src)
/obj/structure/closet/statue/container_resist()
return
return
@@ -196,7 +196,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
maxHealth = health
if(creator)
src.creator = creator
faction = list("\ref[creator]") // very unique
faction += "\ref[creator]" // very unique
if(destroy_original)
qdel(O)
return 1