diff --git a/html/changelogs/AutoChangeLog-pr-1836.yml b/html/changelogs/AutoChangeLog-pr-1836.yml new file mode 100644 index 0000000000000..9d2ad8afca46c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1836.yml @@ -0,0 +1,5 @@ +author: "theselfish" +delete-after: True +changes: + - bugfix: "Coroner Bunny stuff got fixed." + - bugfix: "Digi tailcoats should work. They make look a bit weird." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-1858.yml b/html/changelogs/AutoChangeLog-pr-1858.yml new file mode 100644 index 0000000000000..18090f8bbf57e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-1858.yml @@ -0,0 +1,4 @@ +author: "theselfish" +delete-after: True +changes: + - rscdel: "Clown Dogborg is gone thank fuck." \ No newline at end of file diff --git a/modular_zubbers/code/modules/borgs/code/robot_model.dm b/modular_zubbers/code/modules/borgs/code/robot_model.dm index cddfe7e604246..cb8c87bd5f97e 100644 --- a/modular_zubbers/code/modules/borgs/code/robot_model.dm +++ b/modular_zubbers/code/modules/borgs/code/robot_model.dm @@ -275,18 +275,6 @@ ) - -/* BUBBER SPRITE ADDITIONS BELOW */ -/obj/item/robot_model/clown/Initialize(mapload) - . = ..() - borg_skins |= list( - "Vale" = list( - SKIN_ICON_STATE = "vale", - SKIN_ICON = CYBORG_ICON_CLOWN_WIDE_BUBBER, - SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), - ), - ) - /obj/item/robot_model/standard/Initialize(mapload) . = ..() borg_skins |= list( diff --git a/modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi b/modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi deleted file mode 100644 index b0861f792a566..0000000000000 Binary files a/modular_zubbers/code/modules/borgs/sprites/widerobot_clown.dmi and /dev/null differ diff --git a/modular_zubbers/code/modules/clothing/head/helmet.dm b/modular_zubbers/code/modules/clothing/head/helmet.dm index 4cb873e6a0b4e..1c523d4a21dc5 100644 --- a/modular_zubbers/code/modules/clothing/head/helmet.dm +++ b/modular_zubbers/code/modules/clothing/head/helmet.dm @@ -85,6 +85,7 @@ icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi' icon_state = "playbunny_ears" + supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON greyscale_colors = "#39393f" greyscale_config = /datum/greyscale_config/playbunnyears greyscale_config_worn = /datum/greyscale_config/playbunnyears_worn @@ -144,6 +145,7 @@ inhand_icon_state = "that" icon = 'modular_zubbers/icons/obj/clothing/head/hats.dmi' worn_icon = 'modular_zubbers/icons/mob/clothing/head/bunnyears.dmi' + supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON dog_fashion = null //CARGO diff --git a/modular_zubbers/code/modules/clothing/neck/neck.dm b/modular_zubbers/code/modules/clothing/neck/neck.dm index e0bbb6c74dcc0..c2b2b4c2c7dfa 100644 --- a/modular_zubbers/code/modules/clothing/neck/neck.dm +++ b/modular_zubbers/code/modules/clothing/neck/neck.dm @@ -266,8 +266,8 @@ /obj/item/clothing/neck/tie/bunnytie/coroner name = "coroner's bowtie" desc = "A black tie that includes a collar. Looking dead...Dead good!" - icon_state = "bowtie_collar_virologist_tied" - tie_type = "bowtie_collar_virologist" + icon_state = "bowtie_collar_coroner_tied" + tie_type = "bowtie_collar_coroner" greyscale_colors = null greyscale_config = null greyscale_config_worn = null diff --git a/modular_zubbers/code/modules/clothing/suits/jacket.dm b/modular_zubbers/code/modules/clothing/suits/jacket.dm index c66cbf389972b..487c6cd62daa8 100644 --- a/modular_zubbers/code/modules/clothing/suits/jacket.dm +++ b/modular_zubbers/code/modules/clothing/suits/jacket.dm @@ -365,7 +365,7 @@ icon_state = "virologist" /obj/item/clothing/suit/toggle/labcoat/doctor_tailcoat/coroner - name = "pathologist's tailcoat" + name = "coroner's tailcoat" desc = "A sterile black and white coat worn by bunny themed coroners. Adorned with a skull on the back." icon_state = "coroner" diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi index 0685e29bafccc..8e836b21268c4 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/jacket.dmi and b/modular_zubbers/icons/mob/clothing/suits/jacket.dmi differ diff --git a/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi b/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi index 7c885bf204148..b9e0de26d1f4f 100644 Binary files a/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi and b/modular_zubbers/icons/mob/clothing/suits/jacket_digi.dmi differ diff --git a/modular_zubbers/icons/obj/clothing/suits/jacket.dmi b/modular_zubbers/icons/obj/clothing/suits/jacket.dmi index e922df7a3ab1e..e4c8ff772e592 100644 Binary files a/modular_zubbers/icons/obj/clothing/suits/jacket.dmi and b/modular_zubbers/icons/obj/clothing/suits/jacket.dmi differ