Skip to content

Commit

Permalink
SUNS Part One: Clothing (#2685)
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
Picks up where the brave Draggeru left off, giving her sprites a second
chance at life!

More information can be found in the original PR
#2439

<!-- 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
I want my pompous bastards and I want them NOW


![278865636-bde939c3-534a-4d05-b0a0-a782d611d4dd](https://github.com/shiptest-ss13/Shiptest/assets/86762641/c1dc3f65-5896-41ca-a475-aa0028aea1c4)

Note: The majority of these items are still unimplemented, although some
can now be found on the Aegis. The primary goal of this PR is to give
future SUNS ships something to work with (and maybe allow for some
cheeky events in the meantime)

<!-- 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: Draggeru, Cre
add: adds all of the clothing intended for SUNS, including uniforms for
the captain, xo, cmo, scientists, miners, engineers, and doctors
add: several job outfits to support future SUNS content
/: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: Skies-Of-Blue <[email protected]>
Co-authored-by: meem <[email protected]>
  • Loading branch information
Skies-Of-Blue and meemofcourse authored Feb 5, 2024
1 parent bc4579b commit f86fe86
Show file tree
Hide file tree
Showing 38 changed files with 809 additions and 12 deletions.
4 changes: 2 additions & 2 deletions _maps/configs/syndicate_aegis.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"job_slots": {
"Captain": {
"outfit": "/datum/outfit/job/syndicate/captain",
"outfit": "/datum/outfit/job/syndicate/captain/suns",
"officer": true,
"slots": 1
},
Expand All @@ -34,7 +34,7 @@
},

"Mechanic": {
"outfit": "/datum/outfit/job/syndicate/engineer",
"outfit": "/datum/outfit/job/syndicate/engineer/suns",
"slots": 1
},

Expand Down
615 changes: 615 additions & 0 deletions code/modules/clothing/factions/suns.dm

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -520,3 +520,4 @@
name = "SolGov surgery cap"
desc = "It's a surgery cap utilized by solarian doctors."
icon_state = "solgov_surgery"

1 change: 1 addition & 0 deletions code/modules/clothing/head/misc_special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -375,3 +375,4 @@
. = ..()
if(!warped)
warp_up()

1 change: 1 addition & 0 deletions code/modules/clothing/masks/breath.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@
item_state = "m_mask"
permeability_coefficient = 0.01
equip_delay_other = 10

1 change: 1 addition & 0 deletions code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,4 @@
item_state = "hunter"
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR

194 changes: 185 additions & 9 deletions code/modules/clothing/outfits/factions/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,35 @@

assign_codename(H)

/datum/outfit/job/syndicate/assistant/suns
name = "Syndicate - Freshman (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns
alt_uniform = /obj/item/clothing/under/syndicate/suns/alt
suit = /obj/item/clothing/suit/toggle/suns/alt
alt_suit = /obj/item/clothing/suit/toggle/suns
shoes = /obj/item/clothing/shoes/laceup/suns
gloves = null
ears = null
box = /obj/item/storage/box/survival

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

/datum/outfit/job/syndicate/assistant/suns/halfway
name = "Syndicate - Junior (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/uniform2
alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform2/alt

/datum/outfit/job/syndicate/assistant/suns/complete
name = "Syndicate - Graduate (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/uniform3
alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3

//atmos techs

/datum/outfit/job/syndicate/atmos
Expand Down Expand Up @@ -199,11 +228,18 @@
/datum/outfit/job/syndicate/botanist/suns
name = "Syndicate - Botanist-Chemist (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit
id = /obj/item/card/id/syndicate_command/crew_id
shoes = /obj/item/clothing/shoes/jackboots
glasses = /obj/item/clothing/glasses/science
suit = /obj/item/clothing/suit/toggle/labcoat/chemist
shoes = /obj/item/clothing/shoes/sneakers/suns
glasses = /obj/item/clothing/glasses/science/suns
suit = /obj/item/clothing/suit/hooded/suns
suit_store = null
neck = /obj/item/clothing/neck/cloak/suns

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//Capitan

Expand Down Expand Up @@ -268,6 +304,21 @@
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat

/datum/outfit/job/syndicate/captain/suns
name = "Syndicate - Captain (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/captain
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/suns/captain
gloves = /obj/item/clothing/gloves/suns/captain
suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
mask = /obj/item/clothing/mask/breath/suns
neck = /obj/item/clothing/neck/cloak/suns/cap

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//cargo tech

Expand Down Expand Up @@ -381,18 +432,25 @@
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)

/datum/outfit/job/syndicate/cmo/suns
name = "Syndicate - Medical Director (SUNS)"
name = "Syndicate - Medical Instructor (SUNS)"

uniform = /obj/item/clothing/under/syndicate
uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs
ears = /obj/item/radio/headset/syndicate/alt/captain
id = /obj/item/card/id/syndicate_command/captain_id
shoes = /obj/item/clothing/shoes/jackboots
shoes = /obj/item/clothing/shoes/combat/suns
l_pocket = /obj/item/pinpointer/crew
shoes = /obj/item/clothing/shoes/sneakers/brown
suit = /obj/item/clothing/suit/toggle/labcoat/cmo
suit = /obj/item/clothing/suit/toggle/labcoat/suns/cmo
l_hand = /obj/item/storage/firstaid/medical
suit_store = /obj/item/flashlight/pen
backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1)
gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns
glasses = /obj/item/clothing/glasses/hud/health/suns
head = /obj/item/clothing/head/suns/cmo

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//"Head Of Personnel"

Expand Down Expand Up @@ -425,6 +483,23 @@
r_pocket = /obj/item/kitchen/knife/combat/survival
glasses = /obj/item/clothing/glasses/sunglasses

/datum/outfit/job/syndicate/head_of_personnel/suns
name = "Syndicate - Academic Staff (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/xo
suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/suns
gloves = /obj/item/clothing/gloves/suns/xo
neck = /obj/item/clothing/neck/cloak/suns/xo
r_pocket = null
glasses = /obj/item/clothing/glasses/science/suns

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//head of security

/datum/outfit/job/syndicate/hos
Expand Down Expand Up @@ -476,6 +551,26 @@
. = ..()
assign_codename(H)

/datum/outfit/job/syndicate/hos/suns/
name = "Syndicate - Senior Peacekeeper (SUNS)"
uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/hos
gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
shoes = /obj/item/clothing/shoes/combat/suns
head = /obj/item/clothing/head/welding/suns/hos
glasses = /obj/item/clothing/glasses/hud/security/suns
suit_store = /obj/item/gun/ballistic/automatic/powered/gauss/modelh

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

/datum/outfit/job/syndicate/hos/suns/alt
name = "Syndicate - Senior Peacekeeper Alt (SUNS)"
suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns/ehos
head = /obj/item/clothing/head/HoS/syndicate/suns

//medical doctors (assorted)

/datum/outfit/job/syndicate/doctor
Expand All @@ -493,6 +588,19 @@
/datum/outfit/job/syndicate/doctor/suns
name = "Syndicate - Medical Doctor (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/doctorscrubs
shoes = /obj/item/clothing/shoes/sneakers/suns
suit = /obj/item/clothing/suit/toggle/labcoat/suns/doctorlabcoat
gloves = /obj/item/clothing/gloves/color/latex/nitrile/suns
head = /obj/item/clothing/head/suns/surgery
glasses = /obj/item/clothing/glasses/hud/health/suns
mask = /obj/item/clothing/mask/surgical/suns

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

/datum/outfit/job/syndicate/doctor/cybersun
name = "Syndicate - Medical Doctor (Cybersun)"

Expand Down Expand Up @@ -588,7 +696,19 @@
pda_slot = ITEM_SLOT_BELT

/datum/outfit/job/syndicate/psychologist/suns
name = "Ship Psychologist (SUNS)"
name = "Syndicate - Psychologist (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/uniform3
alt_uniform = /obj/item/clothing/under/syndicate/suns/uniform3/alt
suit = /obj/item/clothing/suit/toggle/suns
alt_suit = /obj/item/clothing/suit/toggle/suns/alt
shoes = /obj/item/clothing/shoes/laceup/suns
accessory = /obj/item/clothing/accessory/waistcoat/suns/poof

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//patient (prisoner)

Expand Down Expand Up @@ -630,6 +750,30 @@
ears = /obj/item/radio/headset/syndicate/alt
shoes = /obj/item/clothing/shoes/laceup

//scientists

/datum/outfit/job/syndicate/science
name = "Syndicate - Scientist"
jobtype = /datum/job/scientist
job_icon = "scientist"

suit = /obj/item/clothing/suit/toggle/labcoat/science
dcoat = /obj/item/clothing/suit/hooded/wintercoat/science

/datum/outfit/job/syndicate/science/suns
name = "Syndicate - Scientist (SUNS)"
//more futureproofing than anything, the Aegis currently uses /datum/outfit/job/syndicate/botanist/suns for a similar role
uniform = /obj/item/clothing/under/syndicate/suns/sciencejumpsuit
suit = /obj/item/clothing/suit/hooded/suns
shoes = /obj/item/clothing/shoes/sneakers/suns
glasses = /obj/item/clothing/glasses/science/suns
neck = /obj/item/clothing/neck/cloak/suns

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//security officers

/datum/outfit/job/syndicate/security
Expand Down Expand Up @@ -685,6 +829,22 @@
. = ..()
assign_codename(H)

/datum/outfit/job/syndicate/security/suns
name = "Syndicate - Peacekeeper (SUNS)"
uniform = /obj/item/clothing/under/syndicate/suns/pkuniform
suit = /obj/item/clothing/suit/armor/vest/bulletproof/suns
alt_suit = /obj/item/clothing/suit/toggle/suns/pkcoat
belt = null
gloves = /obj/item/clothing/gloves/tackler/dolphin/suns
shoes = /obj/item/clothing/shoes/jackboots/suns/long
head = /obj/item/clothing/head/welding/suns
glasses = /obj/item/clothing/glasses/hud/security/suns

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger

//Miners

/datum/outfit/job/syndicate/miner
Expand Down Expand Up @@ -830,3 +990,19 @@
r_pocket = /obj/item/radio
head = /obj/item/clothing/head/soft/cybersun
accessory = /obj/item/clothing/accessory/armband/engine

/datum/outfit/job/syndicate/engineer/suns
name = "Syndicate - Ship Engineer (SUNS)"

uniform = /obj/item/clothing/under/syndicate/suns/workerjumpsuit
suit = /obj/item/clothing/suit/toggle/suns/workervest
gloves = /obj/item/clothing/gloves/suns/yellow
shoes = /obj/item/clothing/shoes/jackboots/suns
head = /obj/item/clothing/head/safety_helmet/suns
accessory = null
glasses = null

backpack = /obj/item/storage/backpack
satchel = /obj/item/storage/backpack/satchel
duffelbag = /obj/item/storage/backpack/duffelbag
courierbag = /obj/item/storage/backpack/messenger
1 change: 0 additions & 1 deletion code/modules/clothing/spacesuits/syndi.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@
item_state = "syndicate-black"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical)


//Black-orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "black space helmet"
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/suits/hoodies.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,4 @@
desc = "A hood for your RILENA themed hoodie."
icon_state = "hoodie_rilena"
item_state = "hoodie_rilena"

1 change: 1 addition & 0 deletions code/modules/clothing/suits/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,4 @@
item_state = "enginseerhood"
body_parts_covered = HEAD
flags_inv = HIDEHAIR|HIDEEARS|HIDEFACE|HIDEFACIALHAIR

Binary file modified icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/accessory.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/eyes.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/feet.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/hands.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/head.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/mask.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/neck.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/suits.dmi
Binary file not shown.
Binary file added icons/mob/clothing/faction/suns/uniforms.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/feet.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/hooded.dmi
Binary file not shown.
Binary file added icons/mob/inhands/faction/suns/suns_lefthand.dmi
Binary file not shown.
Binary file added icons/mob/inhands/faction/suns/suns_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/accessories.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/accessory.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/eyes.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/feet.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/hands.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/head.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/mask.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/neck.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/suits.dmi
Binary file not shown.
Binary file added icons/obj/clothing/faction/suns/uniforms.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.
1 change: 1 addition & 0 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1923,6 +1923,7 @@
#include "code\modules\clothing\towels.dm"
#include "code\modules\clothing\ears\_ears.dm"
#include "code\modules\clothing\factions\gezena.dm"
#include "code\modules\clothing\factions\suns.dm"
#include "code\modules\clothing\glasses\_glasses.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\hud.dm"
Expand Down

0 comments on commit f86fe86

Please sign in to comment.