Just deleted about 400 bot accounts and a bunch of spam. To mitigate this in the future, we've enabled reCaptcha on signup. Let me know if someone got caught in the crossfire.

Commit 5d36ff74 authored by DeityLink's avatar DeityLink Committed by clusterfack
Browse files

[Hotfix] soulstone update stuff (#9570)

* fixes

* also that

* AND THAT
parent d33494c2
......@@ -53,7 +53,7 @@
/obj/item/device/soulstone/Topic(href, href_list)
var/mob/U = usr
var/mob/living/carbon/U = usr
if (!in_range(src, U)||U.machine!=src)
U << browse(null, "window=aicard")
U.unset_machine()
......@@ -72,6 +72,9 @@
for(var/mob/living/simple_animal/shade/A in src)
eject_shade(U)
src.icon_state = "soulstone"
src.item_state = "shard-soulstone"
U.update_inv_l_hand()
U.update_inv_r_hand()
src.name = "Soul Stone Shard"
attack_self(U)
......@@ -325,7 +328,7 @@
qdel(add_target)
/obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/U as mob)
/obj/item/proc/transfer_soul(var/choice as text, var/target, var/mob/living/carbon/U as mob)
var/deleteafter = 0
switch(choice)
if("VICTIM")
......@@ -357,6 +360,9 @@
T.canmove = 0
T.health = T.maxHealth
C.icon_state = "soulstone2"
C.item_state = "shard-soulstone2"
U.update_inv_l_hand()
U.update_inv_r_hand()
C.name = "Soul Stone: [T.real_name]"
to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form")
to_chat(U, "<span class='notice'><b>Capture successful!</b>: </span>[T.name]'s has been recaptured and stored within the soul stone.")
......
......@@ -1179,8 +1179,8 @@
updatehealth()
UpdateDamageIcon()
B.loc = src
affected.organ_item = B //this stores the organ for continuity
if(B.brainmob.mind)
B.brainmob.mind.transfer_to(src)
if(B.borer)
B.borer.perform_infestation(src)
......@@ -1188,6 +1188,8 @@
decapitated = null
qdel(B)
for(var/datum/organ/internal/I in internal_organs)
I.damage = 0
......
......@@ -230,8 +230,7 @@
affected.internal_organs += copied
user.u_equip(B,1)
B.loc = target
affected.organ_item = B //this stores the organ for continuity
qdel(B)
/datum/surgery_step/head/attach/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment