Outstanding additions

Cass and Aly gearsets, time of day display, tweaks.

code/__DEFINES/job.dm

@@ -358,6 +358,8 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_UACM_CMISRS_LT "CMISRS Intelligence Liaison"
 #define JOB_UACM_PSTENG "UACM Station Engineer"
 
+#define JOB_UACM_CASSANDRA "OV-PST Chief of Special Operations"
+#define JOB_UACM_ALYSIA "OV-PST Chief Engineer"
 
 #define JOB_PREDATOR "Predator"
 #define JOB_XENOMORPH    "Xenomorph"

code/controllers/subsystem/statpanel.dm

@@ -22,17 +22,18 @@ SUBSYSTEM_DEF(statpanels)
 
 /datum/controller/subsystem/statpanels/fire(resumed = FALSE)
 	if (!resumed)
+		var/wtime = world.time
 		num_fires++
 		global_data = list(
 			"Sector Patrol ALPHA",
 			"UACM Outer Veil Primary Supply Terminal, Neroid Sector",
-			"August 21st, 2185",
+			"August 24th, 2185",
+			"Station Time: [time2text(642000 + wtime,"hh:mm",0)]",
 			"---------",
 //   "Round Time: [ROUND_TIME]",
 //			"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
 //			"Round Time: [duration2text()]",
-			"Chapter Zero",
-			"Interval 001 - 'Arrivals'"
+			"Open Session"
 		)
 
 		src.currentrun = GLOB.clients.Copy()

code/game/jobs/job/uacm/admin.dm

@@ -9,3 +9,11 @@
 /datum/job/uacm/psteng
 	title = JOB_UACM_PSTENG
 	gear_preset = /datum/equipment_preset/uacm/psteng
+
+/datum/job/uacm/Cassandra
+	title = JOB_UACM_CASSANDRA
+	gear_preset = /datum/equipment_preset/uacm/Cassandra
+
+/datum/job/uacm/Alysia
+	title = JOB_UACM_ALYSIA
+	gear_preset = /datum/equipment_preset/uacm/Alysia

code/game/machinery/vending/vendor_types/sectorpatrol.dm

@@ -125,7 +125,7 @@
 	vend_delay = 10
 	deny_delay = 10
 
-/obj/structure/machinery/cm_vending/sorted/sectorpatrol/cigrette/populate_product_list(scale)
+/obj/structure/machinery/cm_vending/sorted/sectorpatrol/soda/populate_product_list(scale)
 	listed_products = list(
 		list("REGULAR SOUTO SOFT DRINKS", -1, null, null),
 		list("Souto Classic", 20, /obj/item/reagent_container/food/drinks/cans/souto/classic, VENDOR_ITEM_REGULAR),

code/game/objects/items/devices/radio/sp_radios.dm

@@ -0,0 +1,23 @@
+/obj/item/device/encryptionkey/pst_standard
+	name = "\improper UACM OV-PST encryption keys"
+	icon_state = "binary_key"
+	channels = list(RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COMMAND = TRUE)
+
+/obj/item/device/encryptionkey/pst_extended
+	name = "\improper UACM OV-PST command encryption keys"
+	icon_state = "binary_key"
+	channels = list(RADIO_CHANNEL_ALMAYER = TRUE, RADIO_CHANNEL_COMMAND = TRUE, RADIO_CHANNEL_HIGHCOM = TRUE)
+
+/obj/item/device/radio/headset/uacm/pst_standard
+	name = "radio headset"
+	desc = "A simple speker and microphone, tuned into local radio channels."
+	icon_state = "mcom_headset"
+	initial_keys = list(/obj/item/device/encryptionkey/pst_standard)
+	volume = RADIO_VOLUME_RAISED
+
+/obj/item/device/radio/headset/uacm/pst_extended
+	name = "radio headset"
+	desc = "A simple speker and microphone, tuned into local radio channels."
+	icon_state = "mcom_headset"
+	initial_keys = list(/obj/item/device/encryptionkey/pst_extended)
+	volume = RADIO_VOLUME_IMPORTANT

code/game/objects/items/storage/storage_sp.dm

@@ -15,3 +15,15 @@
 	new /obj/item/tool/crowbar/uacm(src)
 	new /obj/item/tool/wirecutters/uacm(src)
 	new /obj/item/device/multitool/uacm(src)
+
+/obj/item/storage/backpack/satchel/discrete
+	name = "discrete satchel"
+	desc = "A small satchel worn under clothing, obscured from view unless one knows to look for it or is performing a direct search."
+	icon = 'icons/obj/sp_clothes/back/icon/back.dmi'
+	icon_state = "satchel_black"
+	worn_accessible = TRUE
+	storage_slots = null
+	max_storage_space = 30
+	item_icons = list(
+	WEAR_BACK = 'icons/obj/sp_clothes/back/onmob/back.dmi'
+	)

code/modules/clothing/under/under_sp.dm

@@ -326,7 +326,7 @@
 	icon = 'icons/obj/sp_clothes/admin/icon/sp_clothes.dmi'
 	icon_state = "cass_dress"
 	item_icons = list(
-		WEAR_FEET = 'icons/obj/sp_clothes/admin/onmob/sp_clothes.dmi'
+		WEAR_BODY = 'icons/obj/sp_clothes/admin/onmob/sp_clothes.dmi'
 	)
 
 /obj/item/clothing/under/sp_admin/aly

code/modules/gear_presets/uacm.dm

@@ -20,7 +20,7 @@
 
 /datum/equipment_preset/uacm/basepc/load_gear(mob/living/carbon/human/new_human)
 
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_standard(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/uacm/uniform_standard(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
@@ -45,6 +45,7 @@
 
 /datum/equipment_preset/uacm/newpc/load_gear(mob/living/carbon/human/new_human)
 
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_standard(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/uacm/uniform_standard(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
@@ -63,7 +64,7 @@
 	languages = ALL_HUMAN_LANGUAGES
 
 /datum/equipment_preset/uacm/rdml/load_gear(mob/living/carbon/human/new_human)
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_extended(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/dress/blues/general(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/dress(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/dress(new_human), WEAR_HANDS)
@@ -87,7 +88,7 @@
 	if (new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1))
 		back_item = /obj/item/storage/backpack/security
 
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/provost(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_extended(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/uacm/cmisrs_inspector(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(new_human), WEAR_HANDS)
@@ -120,9 +121,63 @@
 
 /datum/equipment_preset/uacm/psteng/load_gear(mob/living/carbon/human/new_human)
 
-	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_extended(new_human), WEAR_L_EAR)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/uacm/jumpsuit_engie(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/uacm/engie(new_human), WEAR_HEAD)
 	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/on(new_human), WEAR_L_STORE)
+
+/datum/equipment_preset/uacm/Cassandra
+	name = "OV-PST Cassandra - Dress"
+	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
+
+	idtype = /obj/item/card/id/dogtag
+	assignment = JOB_UACM_CASSANDRA
+	rank = JOB_UACM_CASSANDRA
+	paygrade = "NO5"
+	role_comm_title = "PST-CSP"
+	skills = /datum/skills/general
+	languages = ALL_HUMAN_LANGUAGES
+	flags = EQUIPMENT_PRESET_EXTRA
+
+	access = list(ACCESS_SP_OVPST_GENERAL_DEFAULT, ACCESS_SP_OVPST_SECURITY_DEFAULT, ACCESS_SP_OVPST_ENGINEERING_DEFAULT, ACCESS_SP_ADMIN)
+
+	minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE)
+	minimap_background = MINIMAP_ICON_BACKGROUND_CIC
+
+/datum/equipment_preset/uacm/Cassandra/load_gear(mob/living/carbon/human/new_human)
+
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_extended(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/sp_admin/(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sp_admin/(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/discrete(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/sp_admin/(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/on(new_human), WEAR_L_STORE)
+
+/datum/equipment_preset/uacm/Alysia
+	name = "OV-PST Alysia - Dress"
+	flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE
+
+	idtype = /obj/item/card/id/dogtag
+	assignment = JOB_UACM_ALYSIA
+	rank = JOB_UACM_ALYSIA
+	paygrade = "NO5"
+	role_comm_title = "PST-CE"
+	skills = /datum/skills/general
+	languages = ALL_HUMAN_LANGUAGES
+	flags = EQUIPMENT_PRESET_EXTRA
+
+	access = list(ACCESS_SP_OVPST_GENERAL_DEFAULT, ACCESS_SP_OVPST_SECURITY_DEFAULT, ACCESS_SP_OVPST_ENGINEERING_DEFAULT, ACCESS_SP_ADMIN)
+
+	minimap_icon = list("cic" = MINIMAP_ICON_COLOR_BRONZE)
+	minimap_background = MINIMAP_ICON_BACKGROUND_CIC
+
+/datum/equipment_preset/uacm/Alysia/load_gear(mob/living/carbon/human/new_human)
+
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/uacm/pst_extended(new_human), WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/sp_admin/aly(new_human), WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/sp_admin/aly(new_human), WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/discrete(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/sp_admin/Aly(new_human), WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/on(new_human), WEAR_L_STORE)

colonialmarines.dme

@@ -1162,6 +1162,7 @@
 #include "code\game\objects\items\devices\radio\intercom.dm"
 #include "code\game\objects\items\devices\radio\listening_bugs.dm"
 #include "code\game\objects\items\devices\radio\radio.dm"
+#include "code\game\objects\items\devices\radio\sp_radios.dm"
 #include "code\game\objects\items\explosives\explosive.dm"
 #include "code\game\objects\items\explosives\mine.dm"
 #include "code\game\objects\items\explosives\plastic.dm"