cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Let's be really careful about this

Browse Source
This commit is contained in:
Incoming5643
2015-10-27 13:39:39 -04:00
parent 222b4962e7
commit e63f6e0c58
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spells/lichdom.dm
+8 -7
View File
@@ -53,10 +53,11 @@
if(!marked_item || qdeleted(marked_item)) //Wait nevermind
user << "<span class='warning'>Your phylactery is gone!</span>"
return
var/turf/user_turf = get_turf(user)
var/turf/item_turf = get_turf(marked_item)
var/turf/item_loc = get_turf(marked_item)
if(user.z != item_loc.z)
if(user_turf.z != item_turf.z)
user << "<span class='warning'>Your phylactery is out of range!</span>"
return
@@ -64,7 +65,7 @@
var/mob/dead/observer/O = user
O.reenter_corpse()
var/mob/living/carbon/human/lich = new /mob/living/carbon/human(item_loc)
var/mob/living/carbon/human/lich = new /mob/living/carbon/human(item_turf)
lich.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(lich), slot_shoes)
lich.equip_to_slot_or_del(new /obj/item/clothing/under/color/black(lich), slot_w_uniform)
@@ -85,10 +86,10 @@
var/mob/living/carbon/C = old_body
for(var/obj/item/W in C)
C.unEquip(W)
var/wheres_wizdo = dir2text(get_dir(get_turf(old_body), item_loc))
var/wheres_wizdo = dir2text(get_dir(get_turf(old_body), item_turf))
if(wheres_wizdo)
old_body.visible_message("<span class='warning'>Suddenly [old_body.name]'s corpse falls to pieces! You see a strange energy rise from the remains, and speed off towards the [wheres_wizdo]!</span>")
old_body.Beam(item_loc,icon_state="drain_life",icon='icons/effects/effects.dmi',time=10+10*resurrections,maxdistance=INFINITY)
old_body.Beam(item_turf,icon_state="drain_life",icon='icons/effects/effects.dmi',time=10+10*resurrections,maxdistance=INFINITY)
old_body.dust()
if(!marked_item) //linking item to the spell
@@ -124,4 +125,4 @@
H.unEquip(H.wear_suit)
H.unEquip(H.head)
H.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(H), slot_wear_suit)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)
H.equip_to_slot_or_del(new /obj/item/clothing/head/wizard/black(H), slot_head)