From fc1d4da50b54e41c457a2b29d07deb8f3ad3f611 Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 24 Mar 2021 19:16:23 +1000 Subject: [PATCH] More fixes for god of fixes --- .../objects/items/weapons/id cards/id_stacks.dm | 2 +- .../items/weapons/id cards/id_stacks_vr.dm | 2 ++ .../items/weapons/id cards/station_ids_vr.dm | 4 ++-- code/modules/vore/eating/digest_act_vr.dm | 10 +++++++--- icons/obj/card_new_vr.dmi | Bin 0 -> 8934 bytes 5 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 icons/obj/card_new_vr.dmi diff --git a/code/game/objects/items/weapons/id cards/id_stacks.dm b/code/game/objects/items/weapons/id cards/id_stacks.dm index 4567cfe0381..48337d8f70d 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks.dm @@ -4,7 +4,7 @@ /obj/item/weapon/card icon = 'icons/obj/card_new.dmi' // These are redefined here so that changing sprites is as easy as clicking the checkbox. - base_icon = "icons/obj/card_new.dmi" + base_icon = 'icons/obj/card_new.dmi' //VOREStation Edit: Polaris messed up, fix sent upstream // New sprite stacks can be defined here. You could theoretically change icon-states as well but right now this file compiles before station_ids.dm so those wouldn't be affected. /* diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm index 7140ad95269..c9c7f4209a6 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -1,4 +1,6 @@ /obj/item/weapon/card + icon = 'icons/obj/card_new_vr.dmi' + base_icon = 'icons/obj/card_new_vr.dmi' id initial_sprite_stack = list("base-stamp", "top-generic", "stamp-n") diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index 122a9bd4104..3a8f2cae574 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -1,7 +1,7 @@ /obj/item/weapon/card/id/event var/configured = 0 var/accessset = 0 - sprite_stack = list("") + initial_sprite_stack = list() var/list/title_strings = list() var/preset_rank = FALSE @@ -9,7 +9,7 @@ if(configured == 1) return ..() - if(preset_rank) + if(!preset_rank) var/title if(user.client.prefs.player_alt_titles[user.job]) title = user.client.prefs.player_alt_titles[user.job] diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index ab589d96715..b2958d0ddfd 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -82,9 +82,13 @@ var/lost_access = list() /obj/item/weapon/card/id/digest_act(atom/movable/item_storage = null) - desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic, but the access codes need to be reprogrammed at the HoP office." - icon = 'icons/obj/card_vr.dmi' - icon_state = "[initial(icon_state)]_digested" + desc = "A partially digested card that has seen better days. The damage appears to be only cosmetic, but the access codes need to be reprogrammed at the HoP office or ID restoration terminal." + if(!sprite_stack || !istype(sprite_stack) || !(sprite_stack.len)) + icon = 'icons/obj/card_vr.dmi' + icon_state = "[initial(icon_state)]_digested" + else + sprite_stack += "digested" + update_icon() if(!(LAZYLEN(lost_access)) && LAZYLEN(access)) lost_access = access //Do not forget what access we lose access = list() // Then lose it diff --git a/icons/obj/card_new_vr.dmi b/icons/obj/card_new_vr.dmi new file mode 100644 index 0000000000000000000000000000000000000000..20e3c85583261d2da28b854afdb0f4c491c81694 GIT binary patch literal 8934 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

VU<%sCcslRiPzC!?W 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 E7Yp+k00000 literal 0 HcmV?d00001