Fixes alternate organ removal method

- De-braining and de-eying a detached head now sets the organ's vars
correctly.
- Slime people's (and golem's) slime cores are no longer robotic, this
will keep them from getting EMPed.
- As a side effect, this also fixes not being able to transplant slime
people brains.
- Fixes unEquip dropping organs.
This commit is contained in:
DZD
2015-04-20 10:17:40 -04:00
parent 415e2caaa3
commit 15fdcbdecb
3 changed files with 8 additions and 3 deletions
@@ -80,13 +80,11 @@
/obj/item/organ/brain/slime
name = "slime core"
desc = "A complex, organic knot of jelly and crystalline particles."
robotic = 2
icon = 'icons/mob/slimes.dmi'
icon_state = "green slime extract"
/obj/item/organ/brain/golem
name = "chem"
desc = "A tightly furled roll of paper, covered with indecipherable runes."
robotic = 2
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
@@ -111,6 +111,9 @@
if(!. || !I)
return
var/obj/item/organ/O = I //Organs shouldn't be removed unless you call droplimb.
if(istype(O) && O.owner == src)
return
if(I == wear_suit)
if(s_store)
+5 -1
View File
@@ -75,7 +75,11 @@
if(contents.len)
var/obj/item/removing = pick(contents)
removing.loc = get_turf(user.loc)
if(!(user.l_hand && user.r_hand))
var/obj/item/organ/O = removing
if(istype(O))
O.status |= ORGAN_CUT_AWAY
O.removed(user)
else if(!(user.l_hand && user.r_hand))
user.put_in_hands(removing)
user.visible_message("<span class='danger'><b>[user]</b> extracts [removing] from [src] with [W]!")
else