Merge pull request #8321 from VOREStation/upstream-merge-7297

[MIRROR] Wrist-bound PDAs!

code/_helpers/global_lists.dm

@@ -47,7 +47,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

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
 

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

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
 

html/changelogs/greenjoe - wrist PDAs.yml

@@ -0,0 +1,36 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: Greenjoe
+
+# 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: 
+  - rscadd: "Added a wrist-bound PDA, selectable from the PDA selection menu in char setup. it can go in the glove slot along with the ID and belt slots, and shows on your character's wrist no matter which of those 3 slots you put it in!"