This commit is contained in:
Fox McCloud
2018-07-09 04:16:25 -04:00
parent 078a22fb2c
commit a3b5cf83e4
5 changed files with 16 additions and 17 deletions
-1
View File
@@ -68,7 +68,6 @@
/obj/item/organ/internal/eyes/robotize()
colourmatrix = null
dark_view = 2
..() //Make sure the organ's got the robotic status indicators before updating the client colour.
if(owner)
owner.update_client_colour(0) //Since mechanical eyes give dark_view of 2 and full colour vision atm, just having this here is fine.
+1 -1
View File
@@ -347,7 +347,7 @@
if(emp_proof)
return
if(owner)
owner.losebreath = 20
owner.LoseBreath(20)
/obj/item/organ/internal/lungs/cybernetic/upgraded
@@ -134,19 +134,19 @@
// Brain is defined in brain_item.dm.
/obj/item/organ/internal/robotize() //If icon bypass isn't null, skip the processing here and go straight to the parent call.
if(!is_robotic()) //Don't override the icons for the already-mechanical IPC organs.
/obj/item/organ/internal/robotize()
if(!is_robotic())
var/list/states = icon_states('icons/obj/surgery.dmi') //Insensitive to specially-defined icon files for species like the Drask or whomever else. Everyone gets the same robotic heart.
if(slot == "heart" && ("[slot]-prosthetic-on" in states) && ("[slot]-prosthetic-off" in states)) //Give the robotic heart its robotic heart icons if they exist.
if(slot == "heart" && ("[slot]-c-on" in states) && ("[slot]-c-off" in states)) //Give the robotic heart its robotic heart icons if they exist.
var/obj/item/organ/internal/heart/H = src
H.icon = icon('icons/obj/surgery.dmi')
H.icon_base = "[slot]-prosthetic"
H.dead_icon = "[slot]-prosthetic-off"
H.icon_base = "[slot]-c"
H.dead_icon = "[slot]-c-off"
H.update_icon()
else if("[slot]-prosthetic" in states) //Give the robotic organ its robotic organ icons if they exist.
else if("[slot]-c" in states) //Give the robotic organ its robotic organ icons if they exist.
icon = icon('icons/obj/surgery.dmi')
icon_state = "[slot]-prosthetic"
name = "mechanical [slot]"
icon_state = "[slot]-c"
name = "cybernetic [slot]"
..() //Go apply all the organ flags/robotic statuses.
/obj/item/organ/internal/appendix