diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 58b1707a8c..76049d9c05 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -43,7 +43,7 @@ var/datum/category_collection/underwear/global_underwear = new() //Backpacks var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Alt", "Messenger Bag") -var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic") +var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic", "Wrist-Bound") var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg) // Visual nets diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index dc3a151686..3651690dd6 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -609,7 +609,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) // Already got one if(blood_overlay) return - + // Already cached if(GLOB.blood_overlays_by_type[type]) blood_overlay = GLOB.blood_overlays_by_type[type] @@ -619,7 +619,7 @@ GLOBAL_LIST_EMPTY(blood_overlays_by_type) var/image/blood = image(icon = 'icons/effects/blood.dmi', icon_state = "itemblood") // Needs to be a new one each time since we're slicing it up with filters. blood.filters += filter(type = "alpha", icon = icon(icon, icon_state)) // Same, this filter is unique for each blood overlay per type GLOB.blood_overlays_by_type[type] = blood - + // And finally blood_overlay = blood diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index cf32e30c90..6c9700e319 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -452,6 +452,20 @@ var/global/list/obj/item/device/pda/PDAs = list() if(3) icon = 'icons/obj/pda_old.dmi' if(4) icon = 'icons/obj/pda_rugged.dmi' if(5) icon = 'icons/obj/pda_holo.dmi' + if(6) + icon = 'icons/obj/pda_wrist.dmi' + item_state = icon_state + item_icons = list( + slot_belt_str = 'icons/mob/pda_wrist.dmi', + slot_wear_id_str = 'icons/mob/pda_wrist.dmi', + slot_gloves_str = 'icons/mob/pda_wrist.dmi' + ) + desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." + slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + ) else icon = 'icons/obj/pda_old.dmi' log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index 0f633ae7a6..c5a940e868 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -40,7 +40,7 @@ pref.backbag = 1 //Same as above character.backbag = pref.backbag - if(pref.pdachoice > 5 || pref.pdachoice < 1) + if(pref.pdachoice > 6 || pref.pdachoice < 1) pref.pdachoice = 1 character.pdachoice = pref.pdachoice diff --git a/icons/mob/pda_wrist.dmi b/icons/mob/pda_wrist.dmi new file mode 100644 index 0000000000..fda5d9ad19 Binary files /dev/null and b/icons/mob/pda_wrist.dmi differ diff --git a/icons/mob/species/seromi/pda_wrist.dmi b/icons/mob/species/seromi/pda_wrist.dmi new file mode 100644 index 0000000000..e064cf3be8 Binary files /dev/null and b/icons/mob/species/seromi/pda_wrist.dmi differ diff --git a/icons/obj/pda_wrist.dmi b/icons/obj/pda_wrist.dmi new file mode 100644 index 0000000000..1cc3dda1a6 Binary files /dev/null and b/icons/obj/pda_wrist.dmi differ diff --git a/polaris.dme b/polaris.dme index aea3e1f5df..7e999f1ffa 100644 --- a/polaris.dme +++ b/polaris.dme @@ -1425,8 +1425,8 @@ #include "code\modules\ai\ai_holder_targeting.dm" #include "code\modules\ai\interfaces.dm" #include "code\modules\ai\say_list.dm" -#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm" -#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm" +#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm" #include "code\modules\alarm\alarm.dm" #include "code\modules\alarm\alarm_handler.dm" #include "code\modules\alarm\atmosphere_alarm.dm"