Unarmed Attack+Martial Arts Update+Golem Refactor

This commit is contained in:
Fox-McCloud
2016-02-11 00:11:20 -05:00
parent f7b40b6753
commit 34e45a656e
8 changed files with 141 additions and 92 deletions
+1 -1
View File
@@ -642,7 +642,7 @@ var/global/list/multiverse = list()
if(heresy)
spawnheresy(M)//oh god why
else
M.makeSkeleton()
M.set_species("Skeleton")
M.visible_message("<span class = 'warning'> A massive amount of flesh sloughs off [M] and a skeleton rises up!</span>")
M.revive()
equip_skeleton(M)
-6
View File
@@ -44,12 +44,6 @@
if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad
return
var/mob/M = target
if(ishuman(M) || issmall(M))
var/mob/living/carbon/C_target = M
var/obj/item/organ/brain/B
if(C_target.brain_op_stage != 4) // Their brain is already taken out
B = new(C_target.loc)
B.transfer_identity(C_target)
var/datum/effect/system/spark_spread/sparks = new
sparks.set_up(4, 0, M.loc) //no idea what the 0 is
sparks.start()