diff --git a/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm b/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm index 1addb07606e..d07bd7b2c8a 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_wristbound.dm @@ -33,49 +33,54 @@ _app_preset_type = /datum/modular_computer_app_presets/civilian /obj/item/modular_computer/handheld/wristbound/preset/advanced/cargo - icon_state = "wristbound_cargo" _app_preset_type = /datum/modular_computer_app_presets/supply + icon_state = "wristbound-sup" /obj/item/modular_computer/handheld/wristbound/preset/advanced/engineering - icon_state = "wristbound_engineering" _app_preset_type = /datum/modular_computer_app_presets/engineering + icon_state = "wristbound-e" /obj/item/modular_computer/handheld/wristbound/preset/advanced/medical - icon_state = "wristbound_medical" _app_preset_type = /datum/modular_computer_app_presets/medical + icon_state = "wristbound-m" /obj/item/modular_computer/handheld/wristbound/preset/advanced/security - icon_state = "wristbound_security" _app_preset_type = /datum/modular_computer_app_presets/security + icon_state = "wristbound-s" /obj/item/modular_computer/handheld/wristbound/preset/advanced/security/investigations _app_preset_type = /datum/modular_computer_app_presets/security/investigations /obj/item/modular_computer/handheld/wristbound/preset/advanced/research - icon_state = "wristbound_science" _app_preset_type = /datum/modular_computer_app_presets/research + icon_state = "wristbound-tox" /obj/item/modular_computer/handheld/wristbound/preset/advanced/command - icon_state = "wristbound_command" _app_preset_type = /datum/modular_computer_app_presets/command + icon_state = "wristbound-h" /obj/item/modular_computer/handheld/wristbound/preset/advanced/command/ce _app_preset_type = /datum/modular_computer_app_presets/engineering/ce + icon_state = "wristbound-ce" /obj/item/modular_computer/handheld/wristbound/preset/advanced/command/rd _app_preset_type = /datum/modular_computer_app_presets/research/rd + icon_state = "wristbound-rd" /obj/item/modular_computer/handheld/wristbound/preset/advanced/command/cmo _app_preset_type = /datum/modular_computer_app_presets/medical/cmo + icon_state = "wristbound-cmo" /obj/item/modular_computer/handheld/wristbound/preset/advanced/command/xo _app_preset_type = /datum/modular_computer_app_presets/command/hop + icon_state = "wristbound-hop" /obj/item/modular_computer/handheld/wristbound/preset/advanced/command/hos _app_preset_type = /datum/modular_computer_app_presets/security/hos /obj/item/modular_computer/handheld/wristbound/preset/advanced/command/captain _app_preset_type = /datum/modular_computer_app_presets/command/captain + icon_state = "wristbound-c" /obj/item/modular_computer/handheld/wristbound/preset/advanced/representative _app_preset_type = /datum/modular_computer_app_presets/representative @@ -84,8 +89,14 @@ // Wristbound PDA presets /obj/item/modular_computer/handheld/wristbound/preset/pda + var/icon_add // this is the "bar" part in "pda-bar" enrolled = DEVICE_PRIVATE +/obj/item/modular_computer/handheld/wristbound/preset/pda/set_icon() + if(icon_add) + icon_state += "-[icon_add]" + ..() + /obj/item/modular_computer/handheld/wristbound/preset/pda/install_default_hardware() ..() processor_unit = new /obj/item/computer_hardware/processor_unit/small(src) @@ -117,6 +128,9 @@ . = ..() card_slot.stored_item = new /obj/item/pen/fountain +/obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/lawyer + icon_add = "h" + /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/lawyer/Initialize() . = ..() card_slot.stored_item = new /obj/item/pen/fountain @@ -125,9 +139,7 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering _app_preset_type = /datum/modular_computer_app_presets/engineering - icon_state = "wristbound_engineering" - item_state = "wristbound_engineering" - icon_state_unpowered = "wristbound_engineering" + icon_add = "e" /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering/Initialize() . = ..() @@ -138,13 +150,12 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering/ce _app_preset_type = /datum/modular_computer_app_presets/engineering/ce + icon_add = "ce" // Supply /obj/item/modular_computer/handheld/wristbound/preset/pda/supply _app_preset_type = /datum/modular_computer_app_presets/supply - icon_state = "wristbound_cargo" - item_state = "wristbound_cargo" - icon_state_unpowered = "wristbound_cargo" + icon_add = "sup" /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/Initialize() . = ..() @@ -157,6 +168,9 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/miner _app_preset_type = /datum/modular_computer_app_presets/civilian +/obj/item/modular_computer/handheld/wristbound/preset/pda/supply/om + icon_add = "qm" + /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/machinist _app_preset_type = /datum/modular_computer_app_presets/supply/machinist @@ -164,9 +178,7 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/medical _app_preset_type = /datum/modular_computer_app_presets/medical - icon_state = "wristbound_medical" - item_state = "wristbound_medical" - icon_state_unpowered = "wristbound_medical" + icon_add = "m" /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/Initialize() . = ..() @@ -178,14 +190,13 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/medical/cmo _app_preset_type = /datum/modular_computer_app_presets/medical/cmo + icon_add = "cmo" // Science /obj/item/modular_computer/handheld/wristbound/preset/pda/research _app_preset_type = /datum/modular_computer_app_presets/research - icon_state = "wristbound_science" - item_state = "wristbound_science" - icon_state_unpowered = "wristbound_science" + icon_add = "tox" /obj/item/modular_computer/handheld/wristbound/preset/pda/research/Initialize() . = ..() @@ -193,28 +204,25 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/research/rd _app_preset_type = /datum/modular_computer_app_presets/research/rd + icon_add = "rd" // Security /obj/item/modular_computer/handheld/wristbound/preset/pda/security _app_preset_type = /datum/modular_computer_app_presets/security - icon_state = "wristbound_security" - item_state = "wristbound_security" - icon_state_unpowered = "wristbound_security" - + icon_add = "s" /obj/item/modular_computer/handheld/wristbound/preset/pda/security/detective _app_preset_type = /datum/modular_computer_app_presets/security/investigations /obj/item/modular_computer/handheld/wristbound/preset/pda/security/hos _app_preset_type = /datum/modular_computer_app_presets/security/hos + icon_add = "hos" // Command / Misc /obj/item/modular_computer/handheld/wristbound/preset/pda/command _app_preset_type = /datum/modular_computer_app_presets/command - icon_state = "wristbound_command" - item_state = "wristbound_command" - icon_state_unpowered = "wristbound_command" + icon_add = "h" /obj/item/modular_computer/handheld/wristbound/preset/pda/command/Initialize() . = ..() @@ -225,9 +233,11 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/command/xo _app_preset_type = /datum/modular_computer_app_presets/command/hop + icon_add = "hop" /obj/item/modular_computer/handheld/wristbound/preset/pda/command/captain _app_preset_type = /datum/modular_computer_app_presets/command/captain + icon_add = "c" /obj/item/modular_computer/handheld/wristbound/preset/pda/command/captain/Initialize() . = ..() @@ -247,16 +257,12 @@ /obj/item/modular_computer/handheld/wristbound/preset/pda/ert _app_preset_type = /datum/modular_computer_app_presets/ert - icon_state = "wristbound_command" - item_state = "wristbound_command" - icon_state_unpowered = "wristbound_command" + icon_add = "h" hidden = TRUE /obj/item/modular_computer/handheld/wristbound/preset/pda/syndicate _app_preset_type = /datum/modular_computer_app_presets/merc - icon_state = "wristbound_security" - item_state = "wristbound_security" - icon_state_unpowered = "wristbound_security" + icon_add = "syn" computer_emagged = TRUE hidden = TRUE diff --git a/html/changelogs/wezzy_wristbounds.yml b/html/changelogs/wezzy_wristbounds.yml new file mode 100644 index 00000000000..7eea289bf28 --- /dev/null +++ b/html/changelogs/wezzy_wristbounds.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow (Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "New wristbound sprites." diff --git a/icons/obj/modular_wristbound.dmi b/icons/obj/modular_wristbound.dmi index 3a3b8d13f4d..9173ef0f555 100644 Binary files a/icons/obj/modular_wristbound.dmi and b/icons/obj/modular_wristbound.dmi differ