Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unbreaks camo #4312

Merged
merged 1 commit into from
Sep 2, 2023
Merged

Unbreaks camo #4312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions code/game/objects/items.dm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading