Merge remote-tracking branch 'upstream/master' into russians

code/modules/clothing/head/misc.dm

@@ -261,6 +261,12 @@
 	icon_state = "flat_cap"
 	item_state = "detective"
 
+/obj/item/clothing/head/flatcap/solgov
+	name = "solarian flat cap"
+	desc = "A working solarian's hat, commonly used by Logistics Deck Officers."
+	icon_state = "flatcap_solgov"
+	item_state = "detective"
+
 /obj/item/clothing/head/hunter
 	name = "bounty hunting hat"
 	desc = "Ain't nobody gonna cheat the hangman in my town."

code/modules/clothing/outfits/solgov.dm

@@ -207,3 +207,18 @@
 	box = /obj/item/storage/box/survival/engineer
 	pda_slot = ITEM_SLOT_LPOCKET
 	backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
+
+/datum/outfit/job/solgov/quartermaster
+	name = "Logistics Deck Officer (SolGov)"
+	job_icon = "quartermaster"
+	jobtype = /datum/job/qm
+
+	belt = /obj/item/pda/quartermaster
+	ears = /obj/item/radio/headset/solgov/captain
+	uniform = /obj/item/clothing/under/solgov/formal
+	suit = /obj/item/clothing/suit/solgov/overcoat
+	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/flatcap/solgov
+	glasses = /obj/item/clothing/glasses/sunglasses
+	l_hand = /obj/item/clipboard
+	backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1)

code/modules/clothing/suits/jobs.dm

@@ -295,6 +295,14 @@
 	icon_state = "solgov_bureaucrat_robe"
 	item_state = "solgov_bureaucrat_robe"
 
+/obj/item/clothing/suit/solgov/overcoat
+	name = "SolGov overcoat"
+	desc = "A traditional solarian overcoat, used by cilivians and ship crews alike."
+	body_parts_covered = CHEST|GROIN|ARMS
+	icon_state = "solgov_overcoat"
+	item_state = "solgov_overcoat"
+	supports_variations = DIGITIGRADE_VARIATION
+
 /obj/item/clothing/suit/solgov/jacket
 	name = "SolGov jacket"
 	desc = "A plain SolGov jacket, commonly used by civilians."

code/modules/clothing/suits/wintercoats.dm

@@ -185,3 +185,17 @@
 /obj/item/clothing/head/hooded/winterhood/centcom
 	icon_state = "winterhood_centcom"
 	armor = list("melee" = 35, "bullet" = 40, "laser" = 40, "energy" = 50, "bomb" = 35, "bio" = 10, "rad" = 10, "fire" = 10, "acid" = 60)
+
+// SolGov
+
+/obj/item/clothing/suit/hooded/wintercoat/solgov
+	name = "solgov winter coat"
+	desc = "An environment-resistant wintercoat in the colors of the Solarian Confederation."
+	icon_state = "coatsolgov"
+	item_state = "coatsolgov"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)
+	hoodtype = /obj/item/clothing/head/hooded/winterhood/solgov
+
+/obj/item/clothing/head/hooded/winterhood/solgov
+	icon_state = "winterhood_solgov"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 20, "fire" = 30, "acid" = 45)

html/changelogs/archive/2023-09.yml

@@ -153,3 +153,7 @@
   - rscadd: Remaps the Skipper Heavy Cruiser
   - rscadd: Adds an Atmos Tech, Cargo Tech and Cook job slot to the skipper
   - rscdel: Removes two engineer slots from the skipper.
+2023-09-28:
+  PositiveEntropy:
+  - rscadd: New SolGov outfits now exist, including a winter coat!
+  - rscadd: The Logistics Deck Officer is now a possible job for SolGov ships!