diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 4c9e916df26..7d7b7a93de7 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -14,12 +14,6 @@ flipped = FALSE ..() -/obj/item/clothing/head/softcap/on_slotmove() - icon_state = initial(icon_state) - item_state = icon_state - flipped = FALSE - ..() - /obj/item/clothing/head/softcap/verb/ToggleHat() set name = "Flip Hat" set category = "Object" diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index 32d2be1b3d0..0357fbdd343 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -52,6 +52,7 @@ to_chat(src, SPAN_NOTICE("You feel your being twine with that of \the [H] as you merge with its biomass.")) for(var/obj/O in src.contents) drop_from_inventory(O) + hat = null src.forceMove(H) else to_chat(src, SPAN_WARNING("Something went wrong while trying to merge into [H], cancelling.")) @@ -124,6 +125,7 @@ to_chat(src, SPAN_NOTICE("You feel your being entwine with that of \the [D] as it merges with your biomass.")) for(var/obj/O in D.contents) D.drop_from_inventory(O) + D.hat = null D.forceMove(src) D.stat = CONSCIOUS status_flags |= PASSEMOTES diff --git a/html/changelogs/example - Copy.yml b/html/changelogs/example - Copy.yml new file mode 100644 index 00000000000..c30e587df0e --- /dev/null +++ b/html/changelogs/example - Copy.yml @@ -0,0 +1,9 @@ +author: Doxxmedearly + +delete-after: True + +changes: + - bugfix: "Collectable HOS cap now has an on-mob sprite." + - bugfix: "Flipped versions of the Himean and Vysokan hats now have in-hand and worn sprites." + - bugfix: "Fixed an issue where flipped softcaps would reset to unflipped when being equipped." + - bugfix: "Absorbing nymphs should no longer duplicate hats worn by nymphs if they later are split from the gestalt." \ No newline at end of file diff --git a/icons/clothing/head/himeo_cap.dmi b/icons/clothing/head/himeo_cap.dmi index 163293ba6c9..541d401b83d 100644 Binary files a/icons/clothing/head/himeo_cap.dmi and b/icons/clothing/head/himeo_cap.dmi differ diff --git a/icons/clothing/head/vysoka_cap.dmi b/icons/clothing/head/vysoka_cap.dmi index 5648791d9c4..118738b705d 100644 Binary files a/icons/clothing/head/vysoka_cap.dmi and b/icons/clothing/head/vysoka_cap.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index e313d8eaa8d..b821e6538f6 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ