Nightmare Insert: Fiorina - Armory - Riot in Progress

code/game/objects/effects/landmarks/survivor_spawner.dm

@@ -113,3 +113,29 @@
 /obj/effect/landmark/survivor_spawner/lv522_forecon_squad_leader
 	equipment = /datum/equipment_preset/survivor/forecon/squad_leader
 	spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/fiorina_ua_peacekeeper
+	equipment = /datum/equipment_preset/survivor/ua_peacekeeper
+	intro_text = list("<h2>You are a United Americas peacekeeper!</h2>",\
+	"<span class='notice'>You ARE aware of the xenomorph threat.</span>",\
+	"<span class='danger'>Your primary objective is to hold your position and survive, the CMB were sent to assist but you answer to yourselves - adminhelp.</span>")
+	story_text = "You are a peacekeeper for the United Americas. You and your allies were stationed on this station to act as riot control personnel for its large prison population. During a mass riot and biological quarantine breach, you and your comrades held the line against the overwhelming hoard of rioting prisoners. After the death of your Captain, you resorted to lethal force to clear the area. You stopped the riot, but perhaps at the cost of a small part of your soul. Your team's distress signal was answered by a nearby CMB ship, which crash landed, their survivors rallied to your location and now you huddle together. You can only pray a more well equipped rescue force is en route, because the real nightmare is about to begin."
+	spawn_priority = SPAWN_PRIORITY_MEDIUM
+
+/obj/effect/landmark/survivor_spawner/fiorina_cmb_deputy
+	equipment = /datum/equipment_preset/survivor/cmb_deputy
+	synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth/fiorina
+	intro_text = list("<h2>You are a CMB deputy!</h2>",\
+	"<span class='notice'>You ARE aware of the xenomorph threat.</span>",\
+	"<span class='danger'>Your primary objective is to hold your position and survive, the CMB Marshal is your superior officer! - adminhelp.</span>")
+	story_text = "You are a CMB Deputy. Several days ago you and your team received a distress signal from this space station. Under the belief that a mass riot was in progress, you were dispatched as part of a rapid response team to relieve the station's security forces. Upon your arrival, a ring of unexpected orbital debris knocked your shuttle's engines offline, forcing an emergency landing. Only some of you survived. You locate a small group of United American peacekeepers, and after being informed of the dire situation, are resolved to hold your ground until rescue arrives. You can only pray they come soon."
+	spawn_priority = SPAWN_PRIORITY_HIGH
+
+/obj/effect/landmark/survivor_spawner/fiorina_cmb_marshal
+	equipment = /datum/equipment_preset/survivor/cmb_marshal
+	synth_equipment = /datum/equipment_preset/synth/survivor/cmb_synth/fiorina
+	intro_text = list("<h2>You are the CMB marshal!</h2>",\
+	"<span class='notice'>You ARE aware of the xenomorph threat.</span>",\
+	"<span class='danger'>Your primary objective is to hold your position and survive, you are the ranking officer commanding the deputies! - adminhelp.</span>")
+	story_text = "You are a CMB Deputy. Several days ago you and your team received a distress signal from this space station. Under the belief that a mass riot was in progress, you were dispatched as part of a rapid response team to relieve the station's security forces. Upon your arrival, a ring of unexpected orbital debris knocked your shuttle's engines offline, forcing an emergency landing. Only some of you survived. You locate a small group of United American peacekeepers, and after being informed of the dire situation, are resolved to hold your ground until rescue arrives. You can only pray they come soon."
+	spawn_priority = SPAWN_PRIORITY_VERY_HIGH

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

@@ -979,6 +979,16 @@
 	icon_state = "wy_headset"
 	initial_keys = list(/obj/item/device/encryptionkey/WY, /obj/item/device/encryptionkey/cmb)
 
+/obj/item/device/radio/headset/distress/CMB/hvh
+	desc = "A sleek headset used by The Colonial Marshal Bureau, crafted in Sol. Low profile and comfortable. No one is above the law. Channels are as follows: :o - colony."
+	initial_keys = list(/obj/item/device/encryptionkey/colony,  /obj/item/device/encryptionkey/cmb)
+	misc_tracking = FALSE
+
+/obj/item/device/radio/headset/distress/CMB/hvh/ua
+	desc = "A special issue headset used by UA Peacekeepers, has been modified to tap into CMB channels. Channels are as follows: :o - colony."
+	initial_keys = list(/obj/item/device/encryptionkey/colony,  /obj/item/device/encryptionkey/cmb)
+	misc_tracking = FALSE
+
 /obj/item/device/radio/headset/almayer/highcom
 	name = "USCM High Command headset"
 	desc = "Issued to members of USCM High Command and their immediate subordinates. Channels are as follows: :v - marine command, :p - military police, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC,  :t - intel,  :z - HighCom"

code/modules/gear_presets/survivors.dm

@@ -1370,6 +1370,116 @@
 	var/shoespath = /obj/item/clothing/shoes/combat
 	human.equip_to_slot_or_del(new shoespath, WEAR_FEET)
 
+/datum/equipment_preset/survivor/ua_peacekeeper
+	name = "United Americas Peacekeeper"
+	assignment = "United Americas Peacekeeper"
+	flags = EQUIPMENT_PRESET_EXTRA
+	skills = /datum/skills/civilian/survivor/marshal
+	languages = list(LANGUAGE_ENGLISH)
+	faction = FACTION_USCM
+	faction_group = list(FACTION_USCM, FACTION_SURVIVOR)
+	idtype = /obj/item/card/id/syndicate
+	role_comm_title = "UA PCK"
+/datum/equipment_preset/survivor/ua_peacekeeper/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/hvh/ua, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot, WEAR_BODY)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot, WEAR_JACKET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot, WEAR_HEAD)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat, WEAR_FEET)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/balaclava(new_human), WEAR_FACE)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human), WEAR_IN_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3, WEAR_WAIST)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol(new_human), WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol(new_human), WEAR_IN_BELT)
+	new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m4a3(new_human), WEAR_IN_BELT)
+
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE)
+
+	..()
+
+/datum/equipment_preset/survivor/cmb_deputy
+	name = "CMB Deputy"
+	assignment = "CMB Deputy"
+	flags = EQUIPMENT_PRESET_EXTRA
+	skills = /datum/skills/civilian/survivor/marshal
+	languages = list(LANGUAGE_ENGLISH)
+	faction = FACTION_USCM
+	faction_group = list(FACTION_USCM, FACTION_SURVIVOR)
+	access = list(
+		ACCESS_CIVILIAN_PUBLIC,
+		ACCESS_CIVILIAN_RESEARCH,
+		ACCESS_CIVILIAN_ENGINEERING,
+		ACCESS_CIVILIAN_LOGISTICS,
+		ACCESS_CIVILIAN_BRIG,
+		ACCESS_CIVILIAN_MEDBAY,
+		ACCESS_CIVILIAN_COMMAND,
+	)
+	role_comm_title = "CMB Deputy"
+
+/datum/equipment_preset/survivor/cmb_deputy/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/hvh, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY)
+
+	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
+		add_ice_colony_survivor_equipment(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD)
+	if(new_human.disabilities & NEARSIGHTED)
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
+	else
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET)
+	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/pouch/magazine/large(new_human), WEAR_R_STORE)
+	add_survivor_weapon_security(new_human)
+
+	..()
+
+/datum/equipment_preset/survivor/cmb_marshal
+	name = "CMB Marshal"
+	assignment = "CMB Marshal"
+	flags = EQUIPMENT_PRESET_EXTRA
+	skills = /datum/skills/civilian/survivor/marshal
+	languages = list(LANGUAGE_ENGLISH)
+	faction = FACTION_USCM
+	faction_group = list(FACTION_USCM, FACTION_SURVIVOR)
+	access = list(
+		ACCESS_CIVILIAN_PUBLIC,
+		ACCESS_CIVILIAN_RESEARCH,
+		ACCESS_CIVILIAN_ENGINEERING,
+		ACCESS_CIVILIAN_LOGISTICS,
+		ACCESS_CIVILIAN_BRIG,
+		ACCESS_CIVILIAN_MEDBAY,
+		ACCESS_CIVILIAN_COMMAND,
+	)
+	role_comm_title = "CMB Marshal"
+
+/datum/equipment_preset/survivor/cmb_marshal/load_gear(mob/living/carbon/human/new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/hvh, WEAR_L_EAR)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY)
+
+	if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
+		add_ice_colony_survivor_equipment(new_human)
+	new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD)
+	if(new_human.disabilities & NEARSIGHTED)
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES)
+	else
+		new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES)
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB(new_human), WEAR_JACKET)
+	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/pouch/magazine/large(new_human), WEAR_R_STORE)
+	add_survivor_weapon_security(new_human)
+
+	..()
+
 /datum/equipment_preset/survivor/new_varadero/commander
 	name = "Survivor - USASF Commander"
 	assignment = "USASF Commander"
@@ -1409,3 +1519,4 @@
 	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK)
 	new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911(new_human), WEAR_WAIST)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD)
+

code/modules/gear_presets/synths.dm

@@ -369,6 +369,24 @@
 
 	survivor_variant = SECURITY_SURVIVOR
 
+/datum/equipment_preset/synth/survivor/cmb_synth/fiorina
+	equipment_to_spawn = list(
+		WEAR_HEAD = /obj/item/clothing/head/CMB,
+		WEAR_L_EAR = /obj/item/device/radio/headset/distress/CMB/hvh,
+		WEAR_EYES = /obj/item/clothing/glasses/sunglasses/sechud,
+		WEAR_BODY = /obj/item/clothing/under/CM_uniform,
+		WEAR_BACK = /obj/item/storage/backpack/satchel/sec,
+		WEAR_IN_BACK = /obj/item/device/camera,
+		WEAR_IN_BACK = /obj/item/device/taperecorder,
+		WEAR_JACKET = /obj/item/clothing/suit/storage/CMB,
+		WEAR_IN_JACKET = /obj/item/weapon/telebaton,
+		WEAR_WAIST = /obj/item/storage/belt/security/MP/CMB/synth,
+		WEAR_HANDS = /obj/item/clothing/gloves/marine/veteran,
+		WEAR_R_STORE = /obj/item/storage/pouch/tools/full,
+		WEAR_FEET = /obj/item/clothing/shoes/marine/knife,
+		WEAR_L_HAND = /obj/item/storage/large_holster/machete/full
+	)
+
 /datum/equipment_preset/synth/survivor/security_synth
 	name = "Survivor - Synthetic - Corporate Security Synth"
 	idtype = /obj/item/card/id/silver/cl

maps/Nightmare/maps/FOP_v3_Sciannex/nightmare.json

@@ -1,3 +1,10 @@
 [
-	{ "type": "map_sprinkle", "path": "sprinkles/" }
+	{ "type": "map_sprinkle", "path": "sprinkles/" },
+    {
+		"type": "map_insert",
+		"landmark": "uapeacekeepers",
+		"chance": 1.0,
+		"path": "standalone/riotcontrol.dmm",
+		"when": { "lvevent": "peacekeepers" }
+	}
 ]

maps/Nightmare/maps/FOP_v3_Sciannex/scenario.json

@@ -1 +1,9 @@
-[]
+[
+    {
+        "type": "pick", "name": "Peacekeepers",
+        "choices": [
+            { "weight": 4, "type": "def", "values": { "lvevent": "none"       } },
+            { "weight": 2, "type": "def", "values": { "lvevent": "peacekeepers" } }
+        ]
+    }
+]

maps/map_files/FOP_v3_Sciannex/Fiorina_SciAnnex.dmm

@@ -12166,6 +12166,14 @@
 /obj/effect/decal/cleanable/blood/drip,
 /turf/open/floor/prison,
 /area/fiorina/station/security)
+"hwb" = (
+/obj/effect/landmark/nightmare{
+	insert_tag = "uapeacekeepers"
+	},
+/turf/open/floor/prison{
+	icon_state = "floor_plate"
+	},
+/area/fiorina/station/security)
 "hwn" = (
 /obj/effect/landmark/structure_spawner/xvx_hive/xeno_door,
 /turf/open/floor/prison{
@@ -65550,7 +65558,7 @@ nqN
 nqN
 nqN
 ksk
-sRV
+hwb
 cvq
 nqN
 nqN