cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Attempting to fix icon procs for organs.

Browse Source
This commit is contained in:
Zuhayr
2015-04-03 21:03:06 -07:00
parent be270bb0d3
commit 3493b60faf
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/organs/organ_external.dm
View File

@@ -700,11 +700,6 @@ Note that amputating the affected organ does in fact remove the infection from t
/obj/item/organ/external/proc/is_stump() /obj/item/organ/external/proc/is_stump()
return 0 return 0
/obj/item/organ/external/replaced()
get_icon()
icon = mob_icon
return ..()
/obj/item/organ/external/proc/release_restraints(var/mob/living/carbon/human/holder) /obj/item/organ/external/proc/release_restraints(var/mob/living/carbon/human/holder)
if(!holder) if(!holder)
holder = owner holder = owner
@@ -865,7 +860,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return return
var/is_robotic = status & ORGAN_ROBOT var/is_robotic = status & ORGAN_ROBOT
var/mob/living/carbon/human/victim = owner var/mob/living/carbon/human/victim = owner
get_icon()
..() ..()
status |= ORGAN_DESTROYED status |= ORGAN_DESTROYED

9
code/modules/organs/organ_icon.dm
View File

@@ -5,13 +5,12 @@ var/global/list/limb_icon_cache = list()
/obj/item/organ/external/proc/compile_icon() /obj/item/organ/external/proc/compile_icon()
overlays.Cut() overlays.Cut()
get_icon()
// This is a kludge, only one icon has more than one generation of children though. // This is a kludge, only one icon has more than one generation of children though.
for(var/obj/item/organ/external/organ in contents) for(var/obj/item/organ/external/organ in contents)
if(organ.children && organ.children.len) if(organ.children && organ.children.len)
for(var/obj/item/organ/external/child in organ.children) for(var/obj/item/organ/external/child in organ.children)
overlays += child.get_icon() overlays += child.mob_icon
overlays += organ.get_icon() overlays += organ.mob_icon
/obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human) /obj/item/organ/external/proc/sync_colour_to_human(var/mob/living/carbon/human/human)
s_tone = null s_tone = null
@@ -28,6 +27,10 @@ var/global/list/limb_icon_cache = list()
var/obj/item/organ/eyes/eyes = owner.internal_organs_by_name["eyes"] var/obj/item/organ/eyes/eyes = owner.internal_organs_by_name["eyes"]
if(eyes) eyes.update_colour() if(eyes) eyes.update_colour()
/obj/item/organ/external/head/removed()
get_icon()
..()
/obj/item/organ/external/head/get_icon() /obj/item/organ/external/head/get_icon()
..() ..()