Skip to content

Commit

Permalink
The Cybersun-ening (#2484)
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 changes the outfits of several jobs related to cybersun, as well
as vastly overhauling their aesthetics.


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/cf3c8167-77ae-44d4-b7d0-f652efabdd1a)

This PR also adds completely new items, such as:

- The Cybersun Officer's Cap
- The Cybersun Officer's Suit
- The Cybersun Captain's Haori
- The Cybersun Agent's Jumpsuit
- The Cybersun Agent's Cap
- The Cybersun Trauma Team Vest
- The Cybersun Trauma Team Helmet
<!-- 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
Helps balkanize the syndicate further aesthetically, which is the
current direction we're going for the faction as a whole.
<!-- 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
fix: Cybersun outfits have been adjusted to be less syndicate-generalist
and more Cybersun.
imageadd: Cybersun has received a full visual overhaul, as well as new
goodies!

/: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 Nov 15, 2023
1 parent 8339759 commit 1ff7dac
Show file tree
Hide file tree
Showing 21 changed files with 66 additions and 16 deletions.
8 changes: 7 additions & 1 deletion code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,17 @@
item_state = "solgov_envirohelm"

/obj/item/clothing/head/helmet/operator
name = "\improper Operator helmet"
name = "\improper operator helmet"
desc = "A robust combat helmet commonly employed by Syndicate forces, regardless of alignment."
icon_state = "operator"
item_state = "operator"

/obj/item/clothing/head/helmet/medical
name = "\improper trauma team helmet"
desc = "A robust combat helmet commonly employed by cybersun medical trauma teams, with its distinctive turquoise."
icon_state = "traumahelm"
item_state = "traumahelm"

/obj/item/clothing/head/helmet/bulletproof/m10
name = "\improper M10 pattern Helmet"
desc = "A classic looking helmet, derived from numerous convergently-similar designs from all across inhabited space. A faded tag reads: 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'"
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/head/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@
name = "syndicate cap"
desc = "A black cap fit for a high ranking syndicate officer."

/obj/item/clothing/head/HoS/cybersun
name = "cybersun hat"
desc = "A crimson-red hat fit for a high ranking cybersun officer."
icon_state = "cybersunhat"
item_state = "cybersunhat"

/obj/item/clothing/head/HoS/beret/syndicate
name = "syndicate beret"
desc = "A black beret with thick armor padding inside. Stylish and robust."
Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/head/soft_caps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,13 @@
dog_fashion = null

/obj/item/clothing/head/soft/cybersun
name = "cybersun agent cap"
desc = "A black baseball hat emblazoned with a reflective Cybersun patch."
icon_state = "agentsoft"
soft_type = "black"
dog_fashion = null

/obj/item/clothing/head/soft/cybersun/medical
name = "cybersun medic cap"
desc = "A turquoise baseball hat emblazoned with a reflective cross. Typical of Cybersun Industries field medics."
icon_state = "cybersunsoft"
Expand Down
31 changes: 16 additions & 15 deletions code/modules/clothing/outfits/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@
/datum/outfit/job/syndicate/assistant/cybersun
name = "Junior Agent (Cybersun)"

uniform = /obj/item/clothing/under/syndicate
uniform = /obj/item/clothing/under/syndicate/cybersun
shoes = /obj/item/clothing/shoes/jackboots
r_pocket = /obj/item/radio
head = /obj/item/clothing/head/soft/black
head = /obj/item/clothing/head/soft/cybersun

/datum/outfit/job/syndicate/assistant/twink
name = "Deck Assistant (Twinkleshine)"
Expand Down Expand Up @@ -261,10 +261,10 @@
/datum/outfit/job/syndicate/captain/cybersun
name = "Captain (Cybersun)"

uniform = /obj/item/clothing/under/suit/black_really
head = /obj/item/clothing/head/HoS/syndicate
uniform = /obj/item/clothing/under/syndicate/cybersun/officer
suit = /obj/item/clothing/suit/armor/vest/capcarapace/cybersun
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate


//cargo tech
Expand Down Expand Up @@ -405,9 +405,10 @@
name = "Intelligence Officer (Cybersun)"

ears = /obj/item/radio/headset/syndicate/alt
uniform = /obj/item/clothing/under/suit/charcoal
uniform = /obj/item/clothing/under/syndicate/cybersun/officer
suit = /obj/item/clothing/suit/cybersun_suit
shoes = /obj/item/clothing/shoes/jackboots
head = /obj/item/clothing/head/HoS/syndicate
head = /obj/item/clothing/head/HoS/cybersun
gloves = /obj/item/clothing/gloves/combat
id = /obj/item/card/id/syndicate_command/crew_id
r_pocket = /obj/item/kitchen/knife/combat/survival
Expand Down Expand Up @@ -488,7 +489,7 @@
/datum/outfit/job/syndicate/doctor/cybersun
name = "Medical Doctor (Cybersun)"

uniform = /obj/item/clothing/under/syndicate/cybersun
uniform = /obj/item/clothing/under/syndicate/medic
accessory = /obj/item/clothing/accessory/armband/medblue
shoes = /obj/item/clothing/shoes/jackboots

Expand Down Expand Up @@ -518,7 +519,7 @@
head = /obj/item/clothing/head/soft/paramedic
suit = /obj/item/clothing/suit/toggle/labcoat/paramedic
alt_suit = /obj/item/clothing/suit/apron/surgical
gloves = /obj/item/clothing/gloves/color/latex/nitrile
gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
belt = /obj/item/storage/belt/medical/paramedic
id = /obj/item/card/id
l_pocket = /obj/item/pda/medical
Expand All @@ -533,15 +534,15 @@
name = "Field Medic (Cybersun Industries)"

uniform = /obj/item/clothing/under/syndicate/medic
head = /obj/item/clothing/head/soft/cybersun
head = /obj/item/clothing/head/soft/cybersun/medical
shoes = /obj/item/clothing/shoes/combat
suit = /obj/item/clothing/suit/toggle/labcoat/raincoat

/datum/outfit/job/syndicate/paramedic/twink
name = "Medic (Twinkleshine)"

gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
alt_uniform = /obj/item/clothing/under/syndicate/cybersun
uniform = /obj/item/clothing/under/syndicate/medic
glasses = /obj/item/clothing/glasses/hud/health
belt = /obj/item/storage/belt/medical
back = /obj/item/storage/backpack/duffelbag/syndie/med
Expand Down Expand Up @@ -734,9 +735,9 @@

id = /obj/item/card/id/syndicate_command/crew_id
ears = /obj/item/radio/headset
uniform = /obj/item/clothing/under/syndicate
uniform = /obj/item/clothing/under/syndicate/cybersun
accessory = /obj/item/clothing/accessory/armband/cargo
head = /obj/item/clothing/head/soft/black
head = /obj/item/clothing/head/soft/cybersun
r_pocket = /obj/item/radio

/datum/outfit/job/syndicate/miner/gec
Expand Down Expand Up @@ -818,8 +819,8 @@
/datum/outfit/job/syndicate/engineer/cybersun
name = "Engineer (Cybersun)"

uniform = /obj/item/clothing/under/syndicate/cybersun
uniform = /obj/item/clothing/under/syndicate/cybersun/research
shoes = /obj/item/clothing/shoes/workboots
r_pocket = /obj/item/radio
head = /obj/item/clothing/head/beanie/black
head = /obj/item/clothing/head/soft/cybersun
accessory = /obj/item/clothing/accessory/armband/engine
10 changes: 10 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
name = "large tactical armor vest"
icon_state = "marine_heavy"

/obj/item/clothing/suit/armor/vest/marine/trauma
name = "cybersun trauma team armor vest"
icon_state = "traumavest"
desc = "A set of stamped plasteel armor plates decorated with a medical cross and colors associated with the medical division of Cybersun."

/obj/item/clothing/suit/armor/vest/old
name = "degrading armor vest"
desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in."
Expand Down Expand Up @@ -143,6 +148,11 @@
desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer."
icon_state = "carapace_syndie"

/obj/item/clothing/suit/armor/vest/capcarapace/cybersun
name = "cybersun captain's haori"
desc = "An extraordinarily fashionable haori, utilized by cybersun captains. Weaved with armored fabric to protect the user from gunshots."
icon_state = "cybersunhaori"

/obj/item/clothing/suit/armor/vest/capcarapace/alt
name = "captain's parade jacket"
desc = "For when an armoured vest isn't fashionable enough."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,12 @@
* Misc
*/

/obj/item/clothing/suit/cybersun_suit
name = "cybersun suit"
desc = "A plain white suit commonly used by Cybersun's officers."
icon_state = "cybersun_suit"
item_state = "cybersun_suit"

/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun
Expand Down
14 changes: 14 additions & 0 deletions code/modules/clothing/under/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,33 @@
supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION

/obj/item/clothing/under/syndicate/cybersun
name = "cybersun jumpsuit"
desc = "The standard jumpsuit used by the agents employed by Cybersun, in its distinctive half-black-half-white aesthetic."
icon_state = "cybersun_agent"
alt_covers_chest = TRUE

/obj/item/clothing/under/syndicate/cybersun/research
name = "Cybersun coveralls"
desc = "Nomex coveralls worn by workers and research personnel employed by Cybersun industries."
icon_state = "cybersun"
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 100)
alt_covers_chest = TRUE
supports_variations = DIGITIGRADE_VARIATION | KEPORI_VARIATION

/obj/item/clothing/under/syndicate/cybersun/officer
name = "cybersun officer's suit"
desc = "A crimson-red suit used by the officers employed by Cybersun."
icon_state = "cybersun_officer"
alt_covers_chest = TRUE
supports_variations = DIGITIGRADE_VARIATION

/obj/item/clothing/under/syndicate/medic
name = "Cybersun medical jumpsuit"
desc = "Sterile coveralls worn by Cybersun Industries field medics for protection against biological hazards."
icon_state = "cybersun_med"
permeability_coefficient = 0.5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0)
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION | KEPORI_VARIATION

/obj/item/clothing/under/syndicate/medic/skirt
name = "Cybersun medical jumpskirt"
Expand Down
Binary file modified icons/mob/clothing/hands.dmi
Binary file not shown.
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/armor.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/spacesuits.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/syndicate.dmi
Binary file not shown.
Binary file modified icons/mob/species/kepori/onmob_uniform_kepori.dmi
Binary file not shown.
Binary file modified icons/mob/species/misc/digitigrade.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/gloves.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/armor.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/spacesuits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/syndicate.dmi
Binary file not shown.

0 comments on commit 1ff7dac

Please sign in to comment.