cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-06 07:22:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7297 from Greenjoe12345/wrist-PDA

Browse Source 
Wrist-bound PDAs!
This commit is contained in:
Atermonera
2020-06-21 13:40:17 -07:00
committed by GitHub
parent 419ca99ece 4c8bc9c4fe
commit a481a0fbea
9 changed files with 56 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_helpers/global_lists.dm
View File

@@ -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

4
code/game/objects/items.dm
View File

@@ -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

14
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -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.")

2
code/modules/client/preference_setup/general/04_equipment.dm
View File

@@ -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