From e1148b4368fef81d821576ef8fe5d35a07c03b72 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Sat, 2 Sep 2023 16:48:15 -0400 Subject: [PATCH] Unbreaks camo (#4312) # About the pull request This unbreaks camo from https://github.com/cmss13-devs/cmss13/pull/4295 # Explain why it's good for the game Honk sprites.... honk sprites everywhere... I see them in my sleep! # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: Morrow fix: Fixed most of the camo items being clown gear /:cl: --- code/game/objects/items.dm | 6 ------ .../mob/new_player/sprite_accessories/undershirt.dm | 2 -- .../mob/new_player/sprite_accessories/underwear.dm | 2 -- code/modules/projectiles/gun_attachables.dm | 12 ------------ 4 files changed, 22 deletions(-) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index cf1678aaeeff..80254be4a6d9 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -247,12 +247,6 @@ cases. Override_icon_state should be a list.*/ if("classic") icon_state = new_icon_state ? new_icon_state : "c_" + icon_state item_state = new_item_state ? new_item_state : "c_" + item_state - if("jungle") - icon_state = new_icon_state ? new_icon_state : "j_" + icon_state - item_state = new_item_state ? new_item_state : "j_" + item_state - if("urban") - icon_state = new_icon_state ? new_icon_state : "u_" + icon_state - item_state = new_item_state ? new_item_state : "u_" + item_state if(new_protection) min_cold_protection_temperature = new_protection else return diff --git a/code/modules/mob/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/new_player/sprite_accessories/undershirt.dm index 6f35cef2b645..39f0e3ddd173 100644 --- a/code/modules/mob/new_player/sprite_accessories/undershirt.dm +++ b/code/modules/mob/new_player/sprite_accessories/undershirt.dm @@ -41,8 +41,6 @@ GLOBAL_LIST_INIT_TYPED(undershirt_f, /datum/sprite_accessory/undershirt, setup_u selected_icon_state = "d_" + selected_icon_state if("snow") selected_icon_state = "s_" + selected_icon_state - if("urban") - selected_icon_state = "u_" + selected_icon_state if(gender == PLURAL) selected_icon_state += mob_gender == MALE ? "_m" : "_f" diff --git a/code/modules/mob/new_player/sprite_accessories/underwear.dm b/code/modules/mob/new_player/sprite_accessories/underwear.dm index 27916a2ff201..200f3f2f67f7 100644 --- a/code/modules/mob/new_player/sprite_accessories/underwear.dm +++ b/code/modules/mob/new_player/sprite_accessories/underwear.dm @@ -41,8 +41,6 @@ GLOBAL_LIST_INIT_TYPED(underwear_f, /datum/sprite_accessory/underwear, setup_und selected_icon_state = "d_" + selected_icon_state if("snow") selected_icon_state = "s_" + selected_icon_state - if("urban") - selected_icon_state = "u_" + selected_icon_state if(gender == PLURAL) selected_icon_state += mob_gender == MALE ? "_m" : "_f" return image(icon, selected_icon_state) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index f316aa0b824b..4ca52166997d 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -837,10 +837,6 @@ Defined in conflicts.dm of the #defines folder. attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon if("classic") attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon - if("jungle") - attach_icon = new_attach_icon ? new_attach_icon : "j_" + attach_icon - if("urban") - attach_icon = new_attach_icon ? new_attach_icon : "u_" + attach_icon /obj/item/attachable/scope name = "S8 4x telescopic scope" @@ -1674,10 +1670,6 @@ Defined in conflicts.dm of the #defines folder. attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon if("classic") attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon - if("jungle") - attach_icon = new_attach_icon ? new_attach_icon : "j_" + attach_icon - if("urban") - attach_icon = new_attach_icon ? new_attach_icon : "u_" + attach_icon /obj/item/attachable/m4ra_barrel_custom name = "custom M4RA barrel" @@ -1704,10 +1696,6 @@ Defined in conflicts.dm of the #defines folder. attach_icon = new_attach_icon ? new_attach_icon : "d_" + attach_icon if("classic") attach_icon = new_attach_icon ? new_attach_icon : "c_" + attach_icon - if("jungle") - attach_icon = new_attach_icon ? new_attach_icon : "j_" + attach_icon - if("urban") - attach_icon = new_attach_icon ? new_attach_icon : "u_" + attach_icon /obj/item/attachable/upp_rpg_breech name = "HJRA-12 Breech"