Merge pull request #9373 from variableundefined/walletdecal

Wallet icon defaults to green if it is filled with an id of any type
This commit is contained in:
Fox McCloud
2018-09-09 18:09:56 -04:00
committed by GitHub
@@ -49,9 +49,6 @@
if(front_id)
switch(front_id.icon_state)
if("id")
icon_state = "walletid"
return
if("silver")
icon_state = "walletid_silver"
return
@@ -61,6 +58,9 @@
if("centcom")
icon_state = "walletid_centcom"
return
else
icon_state = "walletid"
return
icon_state = "wallet"
@@ -124,9 +124,6 @@
/obj/item/storage/wallet/color/update_icon()
if(front_id)
switch(front_id.icon_state)
if("id")
icon_state = "[item_color]_walletid"
return
if("silver")
icon_state = "[item_color]_walletid_silver"
return
@@ -136,6 +133,9 @@
if("centcom")
icon_state = "[item_color]_walletid_centcom"
return
else
icon_state = "[item_color]_walletid"
return
icon_state = "[item_color]_wallet"
/obj/item/storage/wallet/color/blue