diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index b35942dbc138..73261bf69ebb 100644 --- a/code/modules/clothing/head/misc.dm +++ b/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." diff --git a/code/modules/clothing/outfits/solgov.dm b/code/modules/clothing/outfits/solgov.dm index da4c6cfff3b3..f6a4b03324de 100644 --- a/code/modules/clothing/outfits/solgov.dm +++ b/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) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 04e0fad553a1..241b231043fe 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/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." diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index 684e4d46add9..37b548a0ab72 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/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) diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 53b4c5939f68..910e638f94a8 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 077095b4a4ae..d94f3a98d4f0 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/suits/hooded.dmi b/icons/mob/clothing/suits/hooded.dmi index 73e95617cd94..a19af8b7aa64 100644 Binary files a/icons/mob/clothing/suits/hooded.dmi and b/icons/mob/clothing/suits/hooded.dmi differ diff --git a/icons/mob/species/misc/digitigrade_suits.dmi b/icons/mob/species/misc/digitigrade_suits.dmi index 3cf6722c6463..eaca5e34a629 100644 Binary files a/icons/mob/species/misc/digitigrade_suits.dmi and b/icons/mob/species/misc/digitigrade_suits.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index c705e16ccf63..1682209446ac 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 4623c94eb756..32714635d084 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/suits/hooded.dmi b/icons/obj/clothing/suits/hooded.dmi index ffdedb06bc8c..eaf68b6f9cbd 100644 Binary files a/icons/obj/clothing/suits/hooded.dmi and b/icons/obj/clothing/suits/hooded.dmi differ