Merge pull request #1424 from Citadel-Station-13/upstream-merge-28046

[MIRROR] Adds some more syndicate equipment.

code/game/objects/structures/ghost_role_spawners.dm

@@ -395,28 +395,45 @@
 	H.faction |= "syndicate"
 
 /obj/effect/mob_spawn/human/syndicate/battlecruiser
-	name = "Syndicate Battlecruiser Ensign"
-	flavour_text = "<font size=3>You are a syndicate ensign aboard a state of the art weapons platform -- the SBC Starfury. <b>Follow your captain's orders, maintain the ship, and protect both with your life.</b>"
+	name = "Syndicate Battlecruiser Ship Operative"
+	flavour_text = "<font size=3>You are a crewmember aboard the syndicate flagship: the SBC Starfury. <span class='danger'><b>Your job is to follow your captain's orders, maintain the ship, and keep the engine running.</b></span> If you are not familiar with how the supermatter engine functions: <b>do not attempt to start it.</b><br><br><span class='danger'><b>The armory is not a candy store, and your role is not to assault the station directly, leave that work to the assault operatives.</b></span></font>"
 	outfit = /datum/outfit/syndicate_empty/SBC
 
 /datum/outfit/syndicate_empty/SBC
-	name = "Syndicate Battlecruiser Ensign"
-	belt = /obj/item/weapon/gun/ballistic/automatic/pistol
+	name = "Syndicate Battlecruiser Ship Operative"
+	l_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol
 	r_pocket = /obj/item/weapon/kitchen/knife/combat/survival
+	belt = /obj/item/weapon/storage/belt/military/assault
+
+/obj/effect/mob_spawn/human/syndicate/battlecruiser/assault
+	name = "Syndicate Battlecruiser Assault Operative"
+	flavour_text = "<font size=3>You are an assault operative aboard the syndicate flagship: the SBC Starfury. <span class='danger'><b>Your job is to follow your captain's orders, keep intruders out of the ship, and assault Space Station 13.</b></span> There is an armory, multiple assault ships, and beam cannons to attack the station with.<br><br><span class='danger'><b>Work as a team with your fellow operatives and work out a plan of attack. If you are overwhelmed, escape back to your ship!</b></span></font>"
+	outfit = /datum/outfit/syndicate_empty/SBC/assault
+
+/datum/outfit/syndicate_empty/SBC/assault
+	name = "Syndicate Battlecruiser Assault Operative"
+	uniform = /obj/item/clothing/under/syndicate/combat
+	l_pocket = /obj/item/ammo_box/magazine/m10mm
+	r_pocket = /obj/item/weapon/kitchen/knife/combat/survival
+	belt = /obj/item/weapon/storage/belt/military
 	suit = /obj/item/clothing/suit/armor/vest
+	suit_store = /obj/item/weapon/gun/ballistic/automatic/pistol
+	back = /obj/item/weapon/storage/backpack/security
+	mask = /obj/item/clothing/mask/gas/syndicate
 
 /obj/effect/mob_spawn/human/syndicate/battlecruiser/captain
 	name = "Syndicate Battlecruiser Captain"
-	flavour_text = "<font size=3>You are a syndicate admiral in command of a state of the art weapons platform -- the SBC Starfury. <b>You are to destroy Nanotrasens' Space Station 13.</b> Do not let the enemy take control of your ship under any circumstances."
-	outfit = /datum/outfit/syndicate_empty/SBC/captain
+	flavour_text = "<font size=3>You are the captain aboard the syndicate flagship: the SBC Starfury. <span class='danger'><b>Your job is to oversee your crew, defend the ship, and destroy Space Station 13.</b></span> The ship has an armory, multiple ships, beam cannons, and multiple crewmembers to accomplish this goal.<br><br><span class='danger'><b>As the captain, this whole operation falls on your shoulders.</b></span> You do not need to nuke the station, causing sufficient damage and preventing your ship from being destroyed will be enough.</font>"
+	outfit = /datum/outfit/syndicate_empty/SBC/assault/captain
 	id_access_list = list(150,151)
 
-/datum/outfit/syndicate_empty/SBC/captain
+/datum/outfit/syndicate_empty/SBC/assault/captain
 	name = "Syndicate Battlecruiser Captain"
-	belt = /obj/item/weapon/gun/ballistic/automatic/pistol
+	l_pocket = /obj/item/weapon/melee/energy/sword/saber/red
 	r_pocket = /obj/item/weapon/melee/classic_baton/telescopic
 	suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
+	suit_store = /obj/item/weapon/gun/ballistic/revolver/mateba
 	back = /obj/item/weapon/storage/backpack/satchel/leather
-	head = /obj/item/clothing/head/HoS/beret/syndicate
+	head = /obj/item/clothing/head/HoS/syndicate
 	mask = /obj/item/clothing/mask/cigarette/cigar/havana
 	glasses = /obj/item/clothing/glasses/thermal/eyepatch

code/modules/clothing/head/jobs.dm

@@ -122,6 +122,10 @@
 	armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0, fire = 50, acid = 60)
 	strip_delay = 80
 
+/obj/item/clothing/head/HoS/syndicate
+	name = "syndicate cap"
+	desc = "A black cap fit for a high ranking syndicate officer."
+
 /obj/item/clothing/head/HoS/beret
 	name = "head of security beret"
 	desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."

code/modules/clothing/under/syndicate.dm

@@ -37,4 +37,11 @@
 	item_color = "trackpants"
 	can_adjust = 0
 	armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
-	resistance_flags = 0
+	resistance_flags = 0
+
+/obj/item/clothing/under/syndicate/combat
+	name = "combat uniform"
+	desc = "With a suit lined with this many pockets, you are ready to operate."
+	icon_state = "syndicate_combat"
+	item_color = "syndicate_combat"
+	can_adjust = 0

code/modules/ruins/lavaland_ruin_code.dm

@@ -148,6 +148,7 @@
 	back = /obj/item/weapon/storage/backpack
 	r_pocket = /obj/item/weapon/gun/ballistic/automatic/pistol
 	id = /obj/item/weapon/card/id
+	implants = list(/obj/item/weapon/implant/weapons_auth)
 
 /datum/outfit/lavaland_syndicate/post_equip(mob/living/carbon/human/H)
 	H.faction |= "syndicate"