Autakh unathi fixes. (#6020)

This pr fixes some issues with the Aut'akh unathi subspecies, such as them counting as synthetic, having full internal robotic organs and organ action buttons not updating properly.
This commit is contained in:
Alberyk
2019-02-04 23:54:07 +02:00
committed by Erki
parent 88cdaa2932
commit 8d01599af4
4 changed files with 11 additions and 8 deletions
+7 -2
View File
@@ -33,6 +33,8 @@
var/robotic_name
var/robotic_sprite
var/robotize_type // If set, this organ type will automatically be roboticized with this manufacturer.
/obj/item/organ/New(loc, ...)
..()
if (!initialized && istype(loc, /mob/living/carbon/human/dummy/mannequin))
@@ -295,8 +297,9 @@
robotic = 1
min_bruised_damage = 15
min_broken_damage = 35
name = initial(name)
icon_state = initial(icon_state)
if(!robotize_type)
name = initial(name)
icon_state = initial(icon_state)
/obj/item/organ/emp_act(severity)
if(!(status & ORGAN_ASSISTED))
@@ -347,6 +350,7 @@
msg_admin_attack("[user.name] ([user.ckey]) removed a vital organ ([src]) from [owner.name] ([owner.ckey]) (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)",ckey=key_name(user),ckey_target=key_name(owner))
owner.death()
owner.update_action_buttons()
owner = null
/obj/item/organ/proc/replaced(var/mob/living/carbon/human/target,var/obj/item/organ/external/affected)
@@ -373,6 +377,7 @@
target.internal_organs_by_name[organ_tag] = src
if(robotic)
robotize()
owner.update_action_buttons()
/obj/item/organ/eyes/replaced(var/mob/living/carbon/human/target)
-2
View File
@@ -17,8 +17,6 @@
var/brute_mod = 1
var/burn_mod = 1
var/robotize_type // If set, this organ type will automatically be roboticized with this manufacturer.
var/icon_name = null
var/body_part = null
var/icon_position = 0
+3 -3
View File
@@ -4,8 +4,8 @@
robotize_type = PROSTHETIC_AUTAKH
/obj/item/organ/external/head/autakh/Initialize()
mechassist()
. = ..()
mechassist()
/obj/item/organ/external/chest/autakh
dislocated = -1
@@ -13,8 +13,8 @@
robotize_type = PROSTHETIC_AUTAKH
/obj/item/organ/external/chest/autakh/Initialize()
mechassist()
. = ..()
mechassist()
/obj/item/organ/external/groin/autakh
dislocated = -1
@@ -22,8 +22,8 @@
robotize_type = PROSTHETIC_AUTAKH
/obj/item/organ/external/groin/autakh/Initialize()
mechassist()
. = ..()
mechassist()
/obj/item/organ/external/arm/autakh
dislocated = -1