almost ready for review

This commit is contained in:
Aurorablade
2016-02-11 23:21:13 -05:00
parent 545d3abf19
commit b42d865c83
17 changed files with 59 additions and 54 deletions
@@ -128,11 +128,11 @@
/obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
owner = target
status = status & ~ORGAN_DESTROYED
forceMove(owner)
if(istype(owner))
owner.organs_by_name[limb_name] = src
owner.organs |= src
for(var/obj/item/organ/organ in src)
organ.loc = owner
organ.replaced(owner,src)
if(parent_organ)
@@ -141,6 +141,12 @@
if(!parent.children)
parent.children = list()
parent.children.Add(src)
//Remove all stump wounds since limb is not missing anymore
for(var/datum/wound/lost_limb/W in parent.wounds)
parent.wounds -= W
qdel(W)
break
parent.update_damages()
/obj/item/organ/external/robotize()
..()
@@ -361,10 +361,9 @@
if(!owner)
return
world << "[lasthonk]"
if(lasthonk == 0)
lasthonk = world.time
if(lasthonk > world.time + 600|| lasthonk == 0)
if(lasthonk > world.time + 60|| lasthonk == 0)
lasthonk = world.time
owner << "<font color='red' size='7'>HONK</font>"
owner.sleeping = 0
@@ -115,7 +115,7 @@
/obj/item/organ/internal/xenos/acidgland
name = "xeno acid gland"
parent_organ = "head"
slot = "acidgland"
slot = "acid"
origin_tech = "biotech=5;materials=2;combat=2"
alien_powers = list(/mob/living/carbon/alien/humanoid/proc/corrosive_acid)
@@ -140,7 +140,7 @@
name = "xeno neurotoxin gland"
icon_state = "neurotox"
parent_organ = "head"
slot = "neurotoxingland"
slot = "neurotox"
origin_tech = "biotech=5;combat=5"
alien_powers = list(/mob/living/carbon/alien/humanoid/proc/neurotoxin)
@@ -148,7 +148,7 @@
name = "xeno resin organ"//...there tiger....
parent_organ = "mouth"
icon_state = "liver-x"
slot = "resinspinner"
slot = "hivenode"
origin_tech = "biotech=5;materials=4"
alien_powers = list(/mob/living/carbon/alien/humanoid/proc/resin)