From c7d0496b209f5dd42e4d23c7fb37403f80bcb9ea Mon Sep 17 00:00:00 2001 From: Kearel Date: Mon, 24 Aug 2015 18:05:09 -0500 Subject: [PATCH 1/4] Fixes #10834 --- code/modules/organs/organ.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 4c4ed581b25..fd17fc2f9fe 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -326,6 +326,7 @@ var/list/organ_cache = list() user.drop_from_inventory(src) var/obj/item/weapon/reagent_containers/food/snacks/organ/O = new(get_turf(src)) O.name = name + O.icon = icon O.icon_state = icon_state // Pass over the blood. From 566c16076571b5285632e258c18cd79b2af24ac1 Mon Sep 17 00:00:00 2001 From: Kearel Date: Mon, 24 Aug 2015 18:06:49 -0500 Subject: [PATCH 2/4] Fixes #10836 --- maps/exodus-2.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/exodus-2.dmm b/maps/exodus-2.dmm index c925ca28fbb..144b1b3d3a2 100644 --- a/maps/exodus-2.dmm +++ b/maps/exodus-2.dmm @@ -1397,7 +1397,7 @@ "AS" = (/obj/machinery/door/airlock/centcom{name = "General Access"; opacity = 1; req_access = list(101)},/obj/machinery/door/blast/regular{id = "crescent_checkpoint_access"; name = "Crescent Checkpoint"},/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/control) "AT" = (/turf/simulated/shuttle/wall{icon_state = "swall14"; dir = 2},/area/shuttle/escape/centcom) "AU" = (/turf/simulated/shuttle/wall{icon_state = "swall12"; dir = 2},/area/shuttle/escape/centcom) -"AV" = (/obj/structure/table/rack,/obj/item/weapon/grenade/empgrenade,/obj/item/weapon/grenade/flashbang,/obj/item/weapon/grenade/spawnergrenade,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/skipjack_station/start) +"AV" = (/obj/structure/table/rack,/obj/item/weapon/grenade/empgrenade,/obj/item/weapon/grenade/flashbang,/obj/item/weapon/grenade/spawnergrenade/manhacks,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/skipjack_station/start) "AW" = (/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) "AX" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{name = "plating"},/area/centcom/ferry) "AY" = (/turf/unsimulated/floor{icon_state = "warnplate"; dir = 8},/area/centcom/ferry) From d1504b49b9f018809d014104f217bd0455223aac Mon Sep 17 00:00:00 2001 From: Kearel Date: Mon, 24 Aug 2015 18:12:38 -0500 Subject: [PATCH 3/4] Fixes #10833 --- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 281a9a97e44..a12069a3290 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -710,7 +710,7 @@ var/global/list/damage_icon_parts = list() if(wear_suit.icon_override) standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]") else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[species.get_bodytype()]) - standing = image("icon" = wear_suit.sprite_sheets[species.name], "icon_state" = "[wear_suit.icon_state]") + standing = image("icon" = wear_suit.sprite_sheets[species.get_bodytype()], "icon_state" = "[wear_suit.icon_state]") else standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]") From ea402d67143d1a0d6b0503c683bde346650723f2 Mon Sep 17 00:00:00 2001 From: Kearel Date: Mon, 24 Aug 2015 19:20:56 -0500 Subject: [PATCH 4/4] #10833 + --- code/modules/mob/living/carbon/human/update_icons.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index a12069a3290..d8f51488944 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -208,7 +208,7 @@ var/global/list/damage_icon_parts = list() O.update_icon() if(O.damage_state == "00") continue var/icon/DI - var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.name]" + var/cache_index = "[O.damage_state]/[O.icon_name]/[species.blood_color]/[species.get_bodytype()]" if(damage_icon_parts[cache_index] == null) DI = new /icon(species.damage_overlays, O.damage_state) // the damage icon for whole human DI.Blend(new /icon(species.damage_mask, O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels