Спрайты орагов и одежды в руках и немного логики для обновления спрайтов в руках

Author: FlitchTime

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -21,14 +21,6 @@
 	/// TRUE giving to a user sci hud and active research scanner
 	var/smart_mind = FALSE
 
-/obj/item/organ/internal/brain/xeno
-	name = "xenomorph brain"
-	desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
-	icon_state = "brain-x"
-	origin_tech = "biotech=6"
-	mmi_icon = 'icons/mob/alien.dmi'
-	mmi_icon_state = "AlienMMI"
-
 /obj/item/organ/internal/brain/Destroy()
 	QDEL_NULL(brainmob)
 	return ..()
@@ -137,15 +129,6 @@
 /obj/item/organ/internal/brain/prepare_eat()
 	return // Too important to eat.
 
-/obj/item/organ/internal/brain/slime
-	species_type = /datum/species/slime
-	name = "slime core"
-	desc = "A complex, organic knot of jelly and crystalline particles."
-	icon = 'icons/mob/slimes.dmi'
-	icon_state = "green slime extract"
-	mmi_icon_state = "slime_mmi"
-	parent_organ_zone = BODY_ZONE_CHEST
-
 /obj/item/organ/internal/brain/golem
 	name = "Runic mind"
 	desc = "A tightly furled roll of paper, covered with indecipherable runes."

code/modules/surgery/organs/heart.dm

@@ -7,13 +7,16 @@
 	var/beating = TRUE
 	dead_icon = "heart-off"
 	var/icon_base = "heart"
+	var/item_base = "heart"
 
 
 /obj/item/organ/internal/heart/update_icon_state()
 	if(beating)
 		icon_state = "[icon_base]-on"
+		item_state = "[item_base]-on"
 	else
 		icon_state = "[icon_base]-off"
+		item_state = "[item_base]-off"
 
 
 /obj/item/organ/internal/heart/remove(mob/living/carbon/human/target, special = ORGAN_MANIPULATION_DEFAULT)

code/modules/surgery/organs/lungs.dm

@@ -309,60 +309,6 @@
 	S.reagents.add_reagent("salbutamol", 5)
 	return S
 
-/obj/item/organ/internal/lungs/plasmaman
-	name = "plasma filter"
-	desc = "A spongy rib-shaped mass for filtering plasma from the air."
-	icon = 'icons/obj/species_organs/plasmaman.dmi'
-	icon_state = "lungs"
-
-	safe_oxygen_min = 0 //We don't breath this
-	safe_toxins_min = 16 //We breathe THIS!
-	safe_toxins_max = 0
-
-/obj/item/organ/internal/lungs/vox
-	name = "Vox lungs"
-	desc = "They're filled with dust....wow."
-	icon = 'icons/obj/species_organs/vox.dmi'
-	icon_state = "lungs"
-
-	safe_oxygen_min = 0 //We don't breathe this
-	safe_oxygen_max = 0.05 //This is toxic to us
-	safe_nitro_min = 16 //We breathe THIS!
-	oxy_damage_type = TOX //And it poisons us
-
-/obj/item/organ/internal/lungs/drask
-	icon = 'icons/obj/species_organs/drask.dmi'
-
-	cold_message = "an invigorating coldness"
-	cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold
-	cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2
-	cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3
-	cold_damage_types = list(BRUTE = 0.5, BURN = 0.25)
-
-	var/cooling_start_temp = DRASK_LUNGS_COOLING_START_TEMP
-	var/cooling_stop_temp = DRASK_LUNGS_COOLING_STOP_TEMP
-
-/obj/item/organ/internal/lungs/drask/insert(mob/living/carbon/target, special = ORGAN_MANIPULATION_DEFAULT)
-	. = ..()
-
-	if(!.)
-		return FALSE
-
-	RegisterSignal(owner, COMSIG_HUMAN_EARLY_HANDLE_ENVIRONMENT, PROC_REF(regulate_temperature))
-
-/obj/item/organ/internal/lungs/drask/proc/regulate_temperature(mob/living/source, datum/gas_mixture/environment)
-	SIGNAL_HANDLER
-
-	if(source.stat == DEAD)
-		return
-
-	if(owner.bodytemperature > cooling_start_temp && environment.temperature <= cooling_stop_temp)
-		owner.adjust_bodytemperature(-5)
-
-/obj/item/organ/internal/lungs/drask/remove(mob/living/user, special = ORGAN_MANIPULATION_DEFAULT)
-	UnregisterSignal(owner, COMSIG_HUMAN_EARLY_HANDLE_ENVIRONMENT)
-	return ..()
-
 /obj/item/organ/internal/lungs/cybernetic
 	name = "cybernetic lungs"
 	desc = "A cybernetic version of the lungs found in traditional humanoid entities. It functions the same as an organic lung and is merely meant as a replacement."

code/modules/surgery/organs/subtypes/drask.dm

@@ -4,31 +4,70 @@
 	name = "drask organ"
 	icon = 'icons/obj/species_organs/drask.dmi'
 	icon_state = "innards"
+	item_state = "drask_innards"
 	desc = "A greenish, slightly translucent organ. It is extremely cold."
 
 /obj/item/organ/internal/heart/drask
 	species_type = /datum/species/drask
 	name = "drask heart"
 	icon = 'icons/obj/species_organs/drask.dmi'
+	item_state = "drask_heart-on"
+	item_base = "drask_heart"
 	parent_organ_zone = BODY_ZONE_HEAD
 
 /obj/item/organ/internal/liver/drask
 	species_type = /datum/species/drask
 	name = "metabolic strainer"
 	icon = 'icons/obj/species_organs/drask.dmi'
 	icon_state = "kidneys"
+	item_state = "drask_liver"
 	alcohol_intensity = 0.8
 
 /obj/item/organ/internal/brain/drask
 	species_type = /datum/species/drask
 	icon = 'icons/obj/species_organs/drask.dmi'
 	icon_state = "brain2"
+	item_state = "drask_brain"
 	mmi_icon = 'icons/obj/species_organs/drask.dmi'
 	mmi_icon_state = "mmi_full"
 
 /obj/item/organ/internal/eyes/drask
 	species_type = /datum/species/drask
 	name = "drask eyeballs"
 	icon = 'icons/obj/species_organs/drask.dmi'
+	item_state = "drask_eyes"
 	desc = "Drask eyes. They look even stranger disembodied."
 	see_in_dark = 5
+
+/obj/item/organ/internal/lungs/drask
+	icon = 'icons/obj/species_organs/drask.dmi'
+	item_state = "drask_lungs"
+	cold_message = "an invigorating coldness"
+	cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold
+	cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2
+	cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3
+	cold_damage_types = list(BRUTE = 0.5, BURN = 0.25)
+
+	var/cooling_start_temp = DRASK_LUNGS_COOLING_START_TEMP
+	var/cooling_stop_temp = DRASK_LUNGS_COOLING_STOP_TEMP
+
+/obj/item/organ/internal/lungs/drask/insert(mob/living/carbon/target, special = ORGAN_MANIPULATION_DEFAULT)
+	. = ..()
+
+	if(!.)
+		return FALSE
+
+	RegisterSignal(owner, COMSIG_HUMAN_EARLY_HANDLE_ENVIRONMENT, PROC_REF(regulate_temperature))
+
+/obj/item/organ/internal/lungs/drask/proc/regulate_temperature(mob/living/source, datum/gas_mixture/environment)
+	SIGNAL_HANDLER
+
+	if(source.stat == DEAD)
+		return
+
+	if(owner.bodytemperature > cooling_start_temp && environment.temperature <= cooling_stop_temp)
+		owner.adjust_bodytemperature(-5)
+
+/obj/item/organ/internal/lungs/drask/remove(mob/living/user, special = ORGAN_MANIPULATION_DEFAULT)
+	UnregisterSignal(owner, COMSIG_HUMAN_EARLY_HANDLE_ENVIRONMENT)
+	return ..()

code/modules/surgery/organs/subtypes/grey.dm

@@ -3,13 +3,15 @@
 	name = "grey liver"
 	desc = "A small, odd looking liver."
 	icon = 'icons/obj/species_organs/grey.dmi'
+	item_state = "grey_liver"
 	alcohol_intensity = 1.4
 
 /obj/item/organ/internal/brain/grey
 	species_type = /datum/species/grey
 	desc = "A large brain"
 	icon = 'icons/obj/species_organs/grey.dmi'
 	icon_state = "brain2"
+	item_state = "grey_brain"
 	mmi_icon = 'icons/obj/species_organs/grey.dmi'
 	mmi_icon_state = "mmi_full"
 	smart_mind = TRUE // nerd brains show us sci-hud and research scanner
@@ -27,20 +29,25 @@
 	name = "grey eyeballs"
 	desc = "They still look creepy and emotionless."
 	icon = 'icons/obj/species_organs/grey.dmi'
+	item_state = "grey_eyes"
 	see_in_dark = 3
 	examine_mod = EXAMINE_INSTANT // Insta carbon examine
 
 /obj/item/organ/internal/heart/grey
 	species_type = /datum/species/grey
 	name = "grey heart"
 	icon = 'icons/obj/species_organs/grey.dmi'
+	item_state = "grey_heart-on"
+	item_base = "grey_heart"
 
 /obj/item/organ/internal/lungs/grey
 	species_type = /datum/species/grey
 	name = "grey lungs"
 	icon = 'icons/obj/species_organs/grey.dmi'
+	item_state = "grey_lungs"
 
 /obj/item/organ/internal/kidneys/grey
 	species_type = /datum/species/grey
 	name = "grey kidneys"
 	icon = 'icons/obj/species_organs/grey.dmi'
+	item_state = "grey_kidneys"

code/modules/surgery/organs/subtypes/kidan.dm

@@ -2,6 +2,7 @@
 	species_type = /datum/species/kidan
 	name = "kidan liver"
 	icon = 'icons/obj/species_organs/kidan.dmi'
+	item_state = "kidan_liver"
 	alcohol_intensity = 0.5
 
 
@@ -15,6 +16,7 @@
 	desc = "A specialized tissue that reacts with oxygen, nutriment and blood to produce light in Kidan."
 	icon = 'icons/obj/species_organs/kidan.dmi'
 	icon_state = "kid_lantern"
+	item_state = "kidan_lantern"
 	origin_tech = "biotech=2"
 	w_class = WEIGHT_CLASS_TINY
 	parent_organ_zone = BODY_ZONE_PRECISE_GROIN
@@ -118,16 +120,20 @@
 	species_type = /datum/species/kidan
 	name = "kidan eyeballs"
 	icon = 'icons/obj/species_organs/kidan.dmi'
+	item_state = "kidan_eyes"
 
 /obj/item/organ/internal/heart/kidan
 	species_type = /datum/species/kidan
 	name = "kidan heart"
 	icon = 'icons/obj/species_organs/kidan.dmi'
+	item_state = "kidan_heart-on"
+	item_base = "kidan_heart"
 
 /obj/item/organ/internal/brain/kidan
 	species_type = /datum/species/kidan
 	icon = 'icons/obj/species_organs/kidan.dmi'
 	icon_state = "brain2"
+	item_state = "kidan_brain"
 	mmi_icon = 'icons/obj/species_organs/kidan.dmi'
 	mmi_icon_state = "mmi_full"
 	parent_organ_zone = BODY_ZONE_CHEST
@@ -147,11 +153,13 @@
 	species_type = /datum/species/kidan
 	name = "kidan lungs"
 	icon = 'icons/obj/species_organs/kidan.dmi'
+	item_state = "kidan_lungs"
 
 /obj/item/organ/internal/kidneys/kidan
 	species_type = /datum/species/kidan
 	name = "kidan kidneys"
 	icon = 'icons/obj/species_organs/kidan.dmi'
+	item_state = "kidan_kidneys"
 
 /obj/item/organ/external/head/kidan
 	species_type = /datum/species/kidan

code/modules/surgery/organs/subtypes/moth.dm

@@ -1,28 +1,35 @@
 /obj/item/organ/internal/eyes/nian
 	name = "moth eyeballs"
+	item_state = "nian_eyes"
 	see_in_dark = 5
 
 /obj/item/organ/internal/liver/nian
 	name = "nian liver"
 	icon = 'icons/obj/species_organs/nian.dmi'
+	item_state = "nian_liver"
 
 /obj/item/organ/internal/heart/nian
 	name = "nian heart"
 	icon = 'icons/obj/species_organs/nian.dmi'
+	item_state = "nian_heart-on"
+	item_base = "nian_heart"
 
 /obj/item/organ/internal/brain/nian
 	icon = 'icons/obj/species_organs/nian.dmi'
 	icon_state = "brain2"
+	item_state = "nian_brain"
 	mmi_icon = 'icons/obj/species_organs/nian.dmi'
 	mmi_icon_state = "mmi_full"
 
 /obj/item/organ/internal/lungs/nian
 	name = "nian lungs"
 	icon = 'icons/obj/species_organs/nian.dmi'
+	item_state = "nian_lungs"
 
 /obj/item/organ/internal/kidneys/nian
 	name = "nian kidneys"
 	icon = 'icons/obj/species_organs/nian.dmi'
+	item_state = "nian_kidneys"
 
 /obj/item/organ/external/wing/nian
 	max_damage = 25

code/modules/surgery/organs/subtypes/plasmaman.dm

@@ -2,25 +2,41 @@
 	species_type = /datum/species/plasmaman
 	name = "plasmaman liver"
 	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	item_state = "plasmaman_liver"
 
 /obj/item/organ/internal/eyes/plasmaman
 	species_type = /datum/species/plasmaman
 	name = "plasmaman eyeballs"
 	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	item_state = "plasmaman_eyes"
 
 /obj/item/organ/internal/heart/plasmaman
 	species_type = /datum/species/plasmaman
 	name = "plasmaman heart"
 	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	item_state = "plasmaman_heart-on"
+	item_base = "plasmaman_heart"
 
 /obj/item/organ/internal/brain/plasmaman
 	species_type = /datum/species/plasmaman
 	icon = 'icons/obj/species_organs/plasmaman.dmi'
 	icon_state = "brain2"
+	item_state = "plasmaman_brain"
 	mmi_icon = 'icons/obj/species_organs/plasmaman.dmi'
 	mmi_icon_state = "mmi_full"
 
 /obj/item/organ/internal/kidneys/plasmaman
 	species_type = /datum/species/plasmaman
 	name = "plasmaman kidneys"
 	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	item_state = "plasmaman_kidneys"
+
+/obj/item/organ/internal/lungs/plasmaman
+	name = "plasma filter"
+	desc = "A spongy rib-shaped mass for filtering plasma from the air."
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	icon_state = "lungs"
+	item_state = "plasmaman_lungs"
+	safe_oxygen_min = 0 //We don't breath this
+	safe_toxins_min = 16 //We breathe THIS!
+	safe_toxins_max = 0