Skip to content

Commit

Permalink
Unbreaks camo (#4312)
Browse files Browse the repository at this point in the history
# About the pull request

This unbreaks camo from #4295

# Explain why it's good for the game

Honk sprites.... honk sprites everywhere... I see them in my sleep!

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

:cl: Morrow
fix: Fixed most of the camo items being clown gear
/:cl:
  • Loading branch information
morrowwolf committed Sep 2, 2023
1 parent f0de1d4 commit e1148b4
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 22 deletions.
6 changes: 0 additions & 6 deletions code/game/objects/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/new_player/sprite_accessories/undershirt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions code/modules/mob/new_player/sprite_accessories/underwear.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 0 additions & 12 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down

0 comments on commit e1148b4

Please sign in to comment.