From 788b02086f2b940a0b9646d4e881f12bfe126828 Mon Sep 17 00:00:00 2001 From: Geeves Date: Fri, 23 Oct 2020 16:45:51 +0200 Subject: [PATCH] Modular Wristbound Sprite Revert (#10206) --- .../computers/subtypes/dev_wristbound.dm | 24 ------------------ .../computers/subtypes/preset_wristbound.dm | 8 +----- .../geeves-wristbound_sprite_revert.yml | 6 +++++ icons/obj/modular_wristbound.dmi | Bin 4153 -> 3060 bytes 4 files changed, 7 insertions(+), 31 deletions(-) create mode 100644 html/changelogs/geeves-wristbound_sprite_revert.yml diff --git a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm index cff9cc0aaa0..a7e9e2638b6 100644 --- a/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm +++ b/code/modules/modular_computers/computers/subtypes/dev_wristbound.dm @@ -4,7 +4,6 @@ desc_info = "A NanoTrasen design, this wristbound computer allows the user to quickly and safely access critical info, without taking their hands out of the equation." icon = 'icons/obj/modular_wristbound.dmi' icon_state = "wristbound" - item_state = "wristbound" icon_state_menu = "menu" icon_state_screensaver = "standby" hardware_flag = PROGRAM_WRISTBOUND @@ -14,29 +13,6 @@ w_class = ITEMSIZE_NORMAL light_strength = 1 menu_light_color = COLOR_GREEN - var/flipped = FALSE - contained_sprite = TRUE - -/obj/item/modular_computer/wristbound/verb/swapwrists() - set category = "Object" - set name = "Flip Wristbound Computer Wrist" - set src in usr - - if(usr.stat || usr.restrained()) - return - - flipped = !flipped - if(flipped) - overlay_state = "[item_state]_alt" - item_state = "[item_state]_alt" - else - item_state = initial(item_state) - overlay_state = initial(overlay_state) - to_chat(usr, SPAN_NOTICE("You change \the [src] to be on your [src.flipped ? "left" : "right"] hand.")) - if(ismob(loc)) - var/mob/M = src.loc - M.update_inv_gloves() - M.update_inv_wear_id() /obj/item/modular_computer/CouldUseTopic(var/mob/user) ..() diff --git a/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm b/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm index d87d64d520e..1e4cdf4462c 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm @@ -21,25 +21,21 @@ /obj/item/modular_computer/wristbound/preset/advanced/cargo icon_state = "wristbound_cargo" - item_state = "wristbound_cargo" _app_preset_type = /datum/modular_computer_app_presets/cargo_delivery enrolled = 1 /obj/item/modular_computer/wristbound/preset/advanced/engineering icon_state = "wristbound_engineering" - item_state = "wristbound_engineering" _app_preset_type = /datum/modular_computer_app_presets/engineering enrolled = 1 /obj/item/modular_computer/wristbound/preset/advanced/medical icon_state = "wristbound_medical" - item_state = "wristbound_medical" _app_preset_type = /datum/modular_computer_app_presets/medical enrolled = 1 /obj/item/modular_computer/wristbound/preset/advanced/security icon_state = "wristbound_security" - item_state = "wristbound_security" _app_preset_type = /datum/modular_computer_app_presets/security enrolled = 1 @@ -49,13 +45,11 @@ /obj/item/modular_computer/wristbound/preset/advanced/research icon_state = "wristbound_science" - item_state = "wristbound_science" _app_preset_type = /datum/modular_computer_app_presets/research enrolled = 1 /obj/item/modular_computer/wristbound/preset/advanced/command icon_state = "wristbound_command" - item_state = "wristbound_command" _app_preset_type = /datum/modular_computer_app_presets/command enrolled = 1 @@ -82,4 +76,4 @@ /obj/item/modular_computer/wristbound/preset/advanced/representative _app_preset_type = /datum/modular_computer_app_presets/representative - enrolled = 1 + enrolled = 1 \ No newline at end of file diff --git a/html/changelogs/geeves-wristbound_sprite_revert.yml b/html/changelogs/geeves-wristbound_sprite_revert.yml new file mode 100644 index 00000000000..173a7e33c1f --- /dev/null +++ b/html/changelogs/geeves-wristbound_sprite_revert.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - tweak: "Wristbound sprites have been reverted, and their on-mob sprites have been removed." \ No newline at end of file diff --git a/icons/obj/modular_wristbound.dmi b/icons/obj/modular_wristbound.dmi index bbb6876fe56049c87047d2f080e84b7b4a35abdf..53af92b8672dae77996a6cdd887919e36971eccb 100644 GIT binary patch literal 3060 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 i5EgZ7uDE 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 YE|oS=-<;*cp&!9ZX4a+^=RN=Tf5>y*xc~qF