Skip to content

Commit

Permalink
Saint Roumain Militia Content Expansion Part 2: New Jobs! (#3119)
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
THE LONG AWAITED SEQUEL!

This PR adds a ton of things, but let's start with the most important
changes:


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/ed12f132-469b-4f3d-b725-3fb734872267)

Not only has every job has been tweaked and resprited visually, but you
might've noticed at least three unfamiliar faces to the roster of the
Saint Roumain's Militia! This is because now, there are new jobs for
people to enjoy!

These include:

- The Flamebearer, a member of the ecclesiastical sect of the Church of
Saint Roumain, focused on preaching the word of Saint Roumain, the Ashen
Huntsman, through the holy text of the Liber Incendium!

- The Machinist, a dedicated hunter focused on engineering prowess. Most
workers of Hunter's Pride incidentally are Machinists by trade back in
Illestren!

- The Hunter Colligne, effectively a secondary rank to the Montagne.
They are trainee Hunter Montagnes effectively, learning the art of
hunting and commandeering to eventually lead their own cadre of Hunters
as a Montagne.

All jobs within the SRM also have unique job icons exclusive to them.
Hope you enjoy it!

The SRM now boast an exclusive hardsuit for themselves, based on
knight's armor!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/2e92e043-985f-4cad-b786-2bf3d42047ff)

This PR tweaks some minor stuff aboard the Elder-class, specifically to
accomodate the new jobs. A Shadow slot has been killed in exchange for
one Colligne, one Machinist and one Flamebearer slot.

And finally, this PR does the absolutely random thing of updating the
ID-less icon and its background for no other reason other than I could.

![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/586919c7-3472-4b0e-9abd-d35fdfe72215)

<!-- 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
Pleade join my shipse I begge...
<!-- 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: The Hunters of Illestren have now allowed for Hunter Collignes,
Machinists and Flamebearers to now roam the Frontier aboard their humble
fleet!
imageadd: The Saint Roumain's Militia has been fully resprited!
imageadd: All SRM jobs now have unique HUD icons!
imageadd: The Unknown Job HUD icon has been resprited!
/: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. -->

---------

Signed-off-by: thgvr <[email protected]>
Co-authored-by: FalloutFalcon <[email protected]>
Co-authored-by: thgvr <[email protected]>
  • Loading branch information
3 people authored Jun 18, 2024
1 parent d75661c commit 9357f0a
Show file tree
Hide file tree
Showing 26 changed files with 336 additions and 98 deletions.
15 changes: 14 additions & 1 deletion _maps/configs/srm_elder.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,30 @@
"officer": true,
"slots": 1
},
"Hunter Colligne": {
"outfit": "/datum/outfit/job/roumain/hop",
"officer": true,
"slots": 1
},
"Hunter Doctor": {
"outfit": "/datum/outfit/job/roumain/doctor",
"slots": 1
},
"Machinist": {
"outfit": "/datum/outfit/job/roumain/engineer",
"slots": 1
},
"Hunter": {
"outfit": "/datum/outfit/job/roumain/security",
"slots": 3
},
"Flamebearer": {
"outfit": "/datum/outfit/job/roumain/flamebearer",
"slots": 1
},
"Shadow": {
"outfit": "/datum/outfit/job/roumain/assistant",
"slots": 3
"slots": 2
}
},
"enabled": true
Expand Down
87 changes: 71 additions & 16 deletions _maps/shuttles/roumain/srm_elder.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1056,12 +1056,12 @@
/area/ship/roumain)
"lA" = (
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/mining/independent,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/double,
/obj/effect/turf_decal/spline/fancy/wood{
dir = 6
},
/obj/item/clothing/suit/space/hardsuit/solgov/roumain,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/emergency_oxygen/double,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"lM" = (
Expand Down Expand Up @@ -1523,6 +1523,24 @@
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"rN" = (
/obj/item/clothing/under/suit/roumain,
/obj/item/clothing/suit/armor/roumain/shadow,
/obj/item/clothing/head/cowboy/sec/roumain/shadow,
/obj/item/flashlight/lantern,
/obj/structure/closet/secure_closet/shadow,
/obj/item/lighter,
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/cowboy/black,
/obj/item/clothing/shoes/combat,
/obj/item/kitchen/knife/hunting,
/obj/item/gps{
pixel_x = -7
},
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/ebony,
/area/ship/storage)
"rW" = (
/obj/machinery/smartfridge/drying_rack,
/turf/open/floor/ship/dirt/dark,
Expand Down Expand Up @@ -1669,6 +1687,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
},
/obj/structure/chair/wood/wings,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"up" = (
Expand Down Expand Up @@ -1987,8 +2006,8 @@
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/cowboy/black,
/obj/item/clothing/under/suit/roumain,
/obj/item/clothing/suit/armor/hos/roumain/montagne,
/obj/item/clothing/head/HoS/cowboy/montagne,
/obj/item/clothing/suit/armor/roumain/montagne,
/obj/item/clothing/head/cowboy/sec/roumain/montagne,
/obj/item/flashlight/lantern,
/obj/item/storage/fancy/candle_box{
pixel_y = 3;
Expand All @@ -2010,6 +2029,7 @@
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45_speedloader,
/obj/item/ammo_box/c45,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"zH" = (
Expand Down Expand Up @@ -2435,6 +2455,7 @@
/obj/machinery/power/apc/auto_name/directional/east,
/obj/structure/cable,
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/destructible/tribal_torch,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"DV" = (
Expand Down Expand Up @@ -2629,6 +2650,7 @@
pixel_x = -7
},
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/ebony,
/area/ship/storage)
"HB" = (
Expand Down Expand Up @@ -2656,10 +2678,33 @@
/turf/open/floor/wood/maple,
/area/ship/hallway/starboard)
"HO" = (
/obj/structure/chair/wood/wings,
/obj/item/clothing/shoes/combat,
/obj/item/clothing/under/suit/roumain,
/obj/item/flashlight/lantern,
/obj/item/storage/fancy/candle_box{
pixel_y = 3;
pixel_x = 8
},
/obj/item/lighter{
pixel_x = -2;
pixel_y = 2
},
/obj/item/kitchen/knife/combat,
/obj/effect/turf_decal/spline/fancy/wood{
dir = 5
},
/obj/item/gps{
pixel_x = -7
},
/obj/item/storage/backpack/satchel/leather,
/obj/item/gun/ballistic/revolver/detective,
/obj/item/ammo_box/c38,
/obj/item/ammo_box/c38,
/obj/item/ammo_box/c38_box,
/obj/item/clothing/head/cowboy/sec/roumain/colligne,
/obj/item/clothing/suit/armor/roumain/colligne,
/obj/structure/closet/secure_closet/collignes,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"Ii" = (
Expand Down Expand Up @@ -3254,17 +3299,26 @@
/turf/open/floor/wood/mahogany,
/area/ship/bridge)
"Od" = (
/obj/structure/cable{
icon_state = "1-4"
},
/obj/structure/destructible/tribal_torch,
/obj/item/clothing/head/hardhat/solgov,
/obj/item/storage/toolbox/mechanical,
/obj/item/clothing/glasses/welding,
/obj/item/clothing/head/welding,
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 5
},
/obj/structure/cable{
icon_state = "1-4"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/item/clothing/suit/hazardvest/roumain,
/obj/item/clothing/head/cowboy/sec/roumain/machinist,
/obj/item/clothing/under/suit/roumain,
/obj/item/clothing/shoes/workboots/mining,
/obj/item/storage/belt,
/obj/structure/closet/secure_closet/machinist,
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Oo" = (
Expand Down Expand Up @@ -3595,11 +3649,11 @@
/turf/open/floor/plasteel/white,
/area/ship/medical)
"SR" = (
/obj/structure/closet/secure_closet/flamebearer,
/obj/item/clothing/under/suit/roumain,
/obj/item/clothing/suit/armor/roumain/shadow,
/obj/item/clothing/head/cowboy/sec/roumain/shadow,
/obj/item/clothing/suit/armor/roumain/flamebearer,
/obj/item/clothing/head/cowboy/sec/roumain/flamebearer,
/obj/item/flashlight/lantern,
/obj/structure/closet/secure_closet/shadow,
/obj/item/lighter,
/obj/item/clothing/shoes/cowboy,
/obj/item/clothing/shoes/cowboy/black,
Expand All @@ -3609,6 +3663,7 @@
pixel_x = -7
},
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/accessory/waistcoat/roumain,
/turf/open/floor/wood/ebony,
/area/ship/storage)
"Tc" = (
Expand Down Expand Up @@ -5069,7 +5124,7 @@ sH
sH
sH
LN
SR
rN
sT
ds
LX
Expand Down Expand Up @@ -5106,7 +5161,7 @@ sH
sH
sH
LN
SR
rN
AN
al
cY
Expand Down
19 changes: 18 additions & 1 deletion code/game/MapData/shuttles/srm_elder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,31 @@
desc = "The closet of equipment and attire for the aspiring shadow."
icon_state = "cabinet"

/obj/structure/closet/secure_closet/flamebearer
name = "flamebearer's locker"
desc = "The closet of equipment an ascetic Flamebearer would require."
icon_state = "cabinet"

/obj/structure/closet/secure_closet/hunter
name = "hunter's locker"
desc = "Everything a hunter will need, held in one secure closet."
icon_state = "cabinet"
req_access = list(ACCESS_SECURITY)

/obj/structure/closet/secure_closet/machinist
name = "machinist's Locker"
desc = "The personal closet with tools of a Machinist."
req_access = list(ACCESS_ENGINE)
icon_state = "eng_secure"

/obj/structure/closet/secure_closet/collignes
name = "\proper hunter colligne's locker"
desc = "The posessions of the Hunter Colligne aboard the vessel."
req_access = list(ACCESS_HOP)
icon_state = "hop"

/obj/structure/closet/secure_closet/montagnes
name = "\proper Hunter Montagnes Locker"
name = "\proper hunter montagne's locker"
desc = "The posessions of the owning Hunter Montagnes."
req_access = list(ACCESS_HOS)
icon_state = "hos"
Expand Down
Loading

0 comments on commit 9357f0a

Please sign in to comment.