Skip to content

Commit

Permalink
Solarian DLC 2: A new job and new goodies! (#2376)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
This PR adds a few new things for SolGov players to enjoy! First and
foremost, a new job is now available:

- The Logistics Deck Officer (Quartermaster Analogue!)

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/da008a57-3427-4f23-b403-9cd8a68e2f6d)

This also means a few new outfits are added, including:
- The Solarian Overcoat (pictured above)
- The Solarian Flat Cap (pictured above)
- The Solarian Winter Coat (pictured below)


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/30c0569b-18f0-4965-b60b-8840f7487c13)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
SolGov players gotta keep eatin' good...
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
add: New SolGov outfits now exist, including a winter coat!
add: The Logistics Deck Officer is now a possible job for SolGov ships!
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Imaginos16 authored Sep 28, 2023
1 parent 37d25b0 commit c1bfcad
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 0 deletions.
6 changes: 6 additions & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
15 changes: 15 additions & 0 deletions code/modules/clothing/outfits/solgov.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 8 additions & 0 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
14 changes: 14 additions & 0 deletions code/modules/clothing/suits/wintercoats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/hooded.dmi
Binary file not shown.
Binary file modified icons/mob/species/misc/digitigrade_suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/hooded.dmi
Binary file not shown.

0 comments on commit c1bfcad

Please sign in to comment.