Merge pull request #6744 from listerla/pda-holo

Adds holoPDA from Aurora

code/_helpers/global_lists.dm

@@ -48,7 +48,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")
+var/global/list/pdachoicelist = list("Default", "Slim", "Old", "Rugged", "Holographic")
 var/global/list/exclude_jobs = list(/datum/job/ai,/datum/job/cyborg)
 
 // Visual nets

code/game/objects/items/devices/PDA/PDA.dm

@@ -439,6 +439,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		if(2) icon = 'icons/obj/pda_slim.dmi'
 		if(3) icon = 'icons/obj/pda_old.dmi'
 		if(4) icon = 'icons/obj/pda_rugged.dmi'
+		if(5) icon = 'icons/obj/pda_holo.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 > 4 || pref.pdachoice < 1)
+	if(pref.pdachoice > 5 || pref.pdachoice < 1)
 		pref.pdachoice = 1
 	character.pdachoice = pref.pdachoice
 

code/modules/mob/living/carbon/human/human_defines.dm

@@ -45,8 +45,8 @@
 	var/list/all_underwear = list()
 	var/list/all_underwear_metadata = list()
 	var/list/hide_underwear = list()
-	var/backbag = 2		//Which backpack type the player has chosen. Nothing, Satchel or Backpack.
-	var/pdachoice = 1	//Which PDA type the player has chosen. Default, Slim, Old, or Rugged.
+	var/backbag = 2		//Which backpack type the player has chosen.
+	var/pdachoice = 1	//Which PDA type the player has chosen.
 
 	// General information
 	var/home_system = ""

code/modules/mob/new_player/preferences_setup.dm

@@ -30,7 +30,7 @@
 
 
 	backbag = rand(1,5)
-	pdachoice = rand(1,4)
+	pdachoice = rand(1,5)
 	age = rand(current_species.min_age, current_species.max_age)
 	b_type = RANDOM_BLOOD_TYPE
 	if(H)

html/changelogs/lorilili - Holographic-PDA.yml

@@ -0,0 +1,4 @@
+author: lorilili
+delete-after: True
+changes: 
+  - imageadd: "Added Holographic PDA type."