Merge branch 'master' into upstream-merge-32183

code/modules/clothing/outfits/standard.dm

@@ -78,20 +78,38 @@
 	suit_store = /obj/item/gun/energy/laser/bluetag
 
 /datum/outfit/pirate
-	name = "Pirate"
+	name = "Space Pirate"
 
 	uniform = /obj/item/clothing/under/pirate
 	shoes = /obj/item/clothing/shoes/sneakers/brown
+	suit = /obj/item/clothing/suit/pirate
 	head = /obj/item/clothing/head/bandana
 	glasses = /obj/item/clothing/glasses/eyepatch
-	r_hand = /obj/item/melee/transforming/energy/sword/pirate
 
 /datum/outfit/pirate/space
-	name = "Space Pirate"
-
 	suit = /obj/item/clothing/suit/space/pirate
+	head = /obj/item/clothing/head/helmet/space/pirate/bandana
+	mask = /obj/item/clothing/mask/breath
+	suit_store = /obj/item/tank/internals/oxygen
+	ears = /obj/item/device/radio/headset/syndicate
+	id = /obj/item/card/id
+
+/datum/outfit/pirate/space/captain
 	head = /obj/item/clothing/head/helmet/space/pirate
 
+/datum/outfit/pirate/post_equip(mob/living/carbon/human/H)
+	H.faction |= "pirate"
+
+	var/obj/item/device/radio/R = H.ears
+	if(R)
+		R.set_frequency(GLOB.SYND_FREQ)
+		R.freqlock = 1
+
+	var/obj/item/card/id/W = H.wear_id
+	if(W)
+		W.registered_name = H.real_name
+		W.update_label(H.real_name)
+
 /datum/outfit/tunnel_clown
 	name = "Tunnel Clown"
 

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -137,10 +137,16 @@ Contains:
 	item_state = "pirate"
 	armor = list(melee = 30, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 60, acid = 75)
 	flags_1 = STOPSPRESSUREDMAGE_1
+	flags_inv = HIDEHAIR
 	strip_delay = 40
 	equip_delay_other = 20
 	flags_cover = HEADCOVERSEYES
 
+/obj/item/clothing/head/helmet/space/pirate/bandana
+	name = "pirate bandana"
+	icon_state = "bandana"
+	item_state = "bandana"
+
 /obj/item/clothing/suit/space/pirate
 	name = "pirate coat"
 	desc = "Yarr."