mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
Prosthetic organs have sprites and take emp damage properly
This commit is contained in:
@@ -111,7 +111,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
else
|
||||
O.robotize()
|
||||
|
||||
for(var/name in list(O_HEART,O_EYES,O_BRAIN))
|
||||
for(var/name in list(O_HEART,O_EYES,O_LUNGS,O_BRAIN))
|
||||
var/status = pref.organ_data[name]
|
||||
if(!status)
|
||||
continue
|
||||
@@ -178,6 +178,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
organ_name = "eyes"
|
||||
if(O_BRAIN)
|
||||
organ_name = "brain"
|
||||
if(O_LUNGS)
|
||||
organ_name = "lungs"
|
||||
|
||||
if(status == "cyborg")
|
||||
++ind
|
||||
@@ -211,6 +213,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
switch(organ_name)
|
||||
if("heart")
|
||||
. += "\tPacemaker-assisted [organ_name]"
|
||||
if("lungs")
|
||||
. += "\tAssisted [organ_name]"
|
||||
if("voicebox") //on adding voiceboxes for speaking skrell/similar replacements
|
||||
. += "\tSurgically altered [organ_name]"
|
||||
if("eyes")
|
||||
@@ -539,7 +543,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
|
||||
else if(href_list["organs"])
|
||||
|
||||
var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes", "Brain")
|
||||
var/organ_name = input(user, "Which internal function do you want to change?") as null|anything in list("Heart", "Eyes", "Lungs", "Brain")
|
||||
if(!organ_name) return
|
||||
|
||||
var/organ = null
|
||||
@@ -548,6 +552,8 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
|
||||
organ = O_HEART
|
||||
if("Eyes")
|
||||
organ = O_EYES
|
||||
if("Lungs")
|
||||
organ = O_LUNGS
|
||||
if("Brain")
|
||||
if(pref.organ_data[BP_HEAD] != "cyborg")
|
||||
user << "<span class='warning'>You may only select an assisted or synthetic brain if you have a full prosthetic body.</span>"
|
||||
|
||||
@@ -11,9 +11,6 @@
|
||||
/obj/item/organ/internal/eyes/robotize()
|
||||
..()
|
||||
name = "optical sensor"
|
||||
icon = 'icons/obj/robot_component.dmi'
|
||||
icon_state = "camera"
|
||||
dead_icon = "camera_broken"
|
||||
verbs |= /obj/item/organ/internal/eyes/proc/change_eye_color
|
||||
|
||||
/obj/item/organ/internal/eyes/robot
|
||||
|
||||
@@ -33,4 +33,18 @@
|
||||
if(istype(E)) E.internal_organs -= src
|
||||
..()
|
||||
|
||||
/obj/item/organ/internal/robotize()
|
||||
..()
|
||||
name = "prosthetic [initial(name)]"
|
||||
icon_state = "[initial(icon_state)]_prosthetic"
|
||||
if(dead_icon)
|
||||
dead_icon = "[initial(dead_icon)]_prosthetic"
|
||||
|
||||
/obj/item/organ/internal/mechassist()
|
||||
..()
|
||||
name = "assisted [initial(name)]"
|
||||
icon_state = "[initial(icon_state)]_assisted"
|
||||
if(dead_icon)
|
||||
dead_icon = "[initial(dead_icon)]_assisted"
|
||||
|
||||
// Brain is defined in brain.dm
|
||||
@@ -266,7 +266,7 @@ var/list/organ_cache = list()
|
||||
robotize()
|
||||
|
||||
/obj/item/organ/emp_act(severity)
|
||||
if(!(robotic >= ORGAN_ROBOT))
|
||||
if(!(robotic >= ORGAN_ASSISTED))
|
||||
return
|
||||
switch (severity)
|
||||
if (1)
|
||||
|
||||
Reference in New Issue
Block a user