diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 032fc504230..d3a18b7b737 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -13,7 +13,9 @@ desc = "It has some sort of a tube at the end of its tail." icon = 'icons/mob/alien.dmi' icon_state = "facehugger" + base_icon_state = "facehugger" inhand_icon_state = "facehugger" + worn_icon_state = "facehugger" w_class = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4 clothing_flags = MASKINTERNALS throw_range = 5 @@ -48,12 +50,13 @@ /obj/item/clothing/mask/facehugger/dead icon_state = "facehugger_dead" inhand_icon_state = "facehugger_inactive" + worn_icon_state = "facehugger_dead" stat = DEAD /obj/item/clothing/mask/facehugger/impregnated icon_state = "facehugger_impregnated" inhand_icon_state = "facehugger_impregnated" - worn_icon_state = "facehugger_dead" + worn_icon_state = "facehugger_impregnated" stat = DEAD /obj/item/clothing/mask/facehugger/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) @@ -115,17 +118,17 @@ if(!.) return if(stat == CONSCIOUS) - icon_state = "[initial(icon_state)]_thrown" + icon_state = "[base_icon_state]_thrown" addtimer(CALLBACK(src, .proc/clear_throw_icon_state), 15) /obj/item/clothing/mask/facehugger/proc/clear_throw_icon_state() - if(icon_state == "[initial(icon_state)]_thrown") - icon_state = "[initial(icon_state)]" + if(icon_state == "[base_icon_state]_thrown") + icon_state = "[base_icon_state]" /obj/item/clothing/mask/facehugger/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) ..() if(stat == CONSCIOUS) - icon_state = "[initial(icon_state)]" + icon_state = "[base_icon_state]" Leap(hit_atom) /obj/item/clothing/mask/facehugger/proc/valid_to_attach(mob/living/M) @@ -216,7 +219,8 @@ "[src] falls limp after violating your face!") Die() - icon_state = "[initial(icon_state)]_impregnated" + icon_state = "[base_icon_state]_impregnated" + worn_icon_state = "[base_icon_state]_impregnated" var/obj/item/bodypart/chest/LC = target.get_bodypart(BODY_ZONE_CHEST) if((!LC || LC.status != BODYPART_ROBOTIC) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo)) @@ -233,14 +237,16 @@ return stat = CONSCIOUS - icon_state = "[initial(icon_state)]" + icon_state = "[base_icon_state]" + worn_icon_state = "[base_icon_state]" /obj/item/clothing/mask/facehugger/proc/GoIdle() if(stat == DEAD || stat == UNCONSCIOUS) return stat = UNCONSCIOUS - icon_state = "[initial(icon_state)]_inactive" + icon_state = "[base_icon_state]_inactive" + worn_icon_state = "[base_icon_state]_inactive" addtimer(CALLBACK(src, .proc/GoActive), rand(MIN_ACTIVE_TIME, MAX_ACTIVE_TIME)) @@ -248,7 +254,8 @@ if(stat == DEAD) return - icon_state = "[initial(icon_state)]_dead" + icon_state = "[base_icon_state]_dead" + worn_icon_state = "[base_icon_state]_dead" inhand_icon_state = "facehugger_inactive" stat = DEAD diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 118e00b28af..0780ba5173a 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -5,6 +5,7 @@ desc = "A small bottle." icon_state = "bottle" inhand_icon_state = "atoxinbottle" + worn_icon_state = "bottle" possible_transfer_amounts = list(5,10,15,25,30) volume = 30 fill_icon_thresholds = list(0, 10, 30, 50, 70) diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi index 26213ef167e..a5f3a740162 100644 Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi index 19616c590fe..d9e0f0c3bca 100644 Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ