cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 01:52:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Another PR in the Uniform Saga (#14391)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-10-14 01:19:03 +08:00
committed by GitHub
parent f65bc2e38b
commit de628586ba
16 changed files with 164 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
code/modules/client/preference_setup/loadout/loadout_factions.dm
View File

@@ -35,6 +35,7 @@
var/list/idris_sec_uniforms = list()
idris_sec_uniforms["idris uniform"] = /obj/item/clothing/under/rank/security/idris/idrissec
idris_sec_uniforms["idris uniform, alt"] = /obj/item/clothing/under/rank/security/idris/idrissec/alt
idris_sec_uniforms["idris detective uniform"] = /obj/item/clothing/under/det/idris/alt
gear_tweaks += new /datum/gear_tweak/path(idris_sec_uniforms)
/datum/gear/faction/idris_armband
@@ -128,6 +129,7 @@
var/list/zavod_sec_uniforms = list()
zavod_sec_uniforms["zavodskoi uniform"] = /obj/item/clothing/under/rank/security/zavod/zavodsec
zavod_sec_uniforms["zavodskoi uniform, alt"] = /obj/item/clothing/under/rank/security/zavod/zavodsec/alt
zavod_sec_uniforms["zavodskoi detective uniform"] = /obj/item/clothing/under/det/zavod/alt
gear_tweaks += new /datum/gear_tweak/path(zavod_sec_uniforms)
/datum/gear/faction/zavodskoi_labcoat
@@ -191,6 +193,9 @@
pmc_sunglasses["HUDsunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/pmc
pmc_sunglasses["fat HUDsunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/big/pmc
pmc_sunglasses["aviator sunglasses, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc
pmc_sunglasses["HUDsunglasses alt, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/pmc/alt
pmc_sunglasses["fat HUDsunglasses alt, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/big/pmc/alt
pmc_sunglasses["aviator sunglasses alt, PMCG"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/pmc/alt
gear_tweaks += new /datum/gear_tweak/path(pmc_sunglasses)
/datum/gear/faction/pmc_labcoat
@@ -246,6 +251,7 @@
var/list/pmcg_sec_uniforms = list()
pmcg_sec_uniforms["EPMC uniform"] = /obj/item/clothing/under/rank/security/pmc/epmc
pmcg_sec_uniforms["EPMC uniform, alt"] = /obj/item/clothing/under/rank/security/pmc/epmc/alt
pmcg_sec_uniforms["EPMC detective uniform"] = /obj/item/clothing/under/det/pmc/alt
gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms)
/datum/gear/faction/erisec_patch
@@ -261,13 +267,56 @@
slot = slot_tie
faction = "Private Military Contracting Group"
/datum/gear/faction/pmc_patch/New()
..()
var/list/pmc_patch = list()
pmc_patch["PMCG armband"] = /obj/item/clothing/accessory/armband/pmc
pmc_patch["PMCG armband, alt"] = /obj/item/clothing/accessory/armband/pmc/alt
gear_tweaks += new /datum/gear_tweak/path(pmc_patch)
/datum/gear/faction/epmc_uniform_phys_med
display_name = "PMCG physician uniform"
path = /obj/item/clothing/under/rank/medical/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Physician")
/datum/gear/faction/epmc_uniform_pharm_med
display_name = "PMCG pharmacist uniform"
path = /obj/item/clothing/under/rank/medical/pharmacist/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Pharmacist")
/datum/gear/faction/epmc_uniform_psych_med
display_name = "PMCG psychiatrist uniform"
path = /obj/item/clothing/under/rank/medical/psych/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Psychiatrist")
/datum/gear/faction/epmc_uniform_intern_med
display_name = "PMCG medical intern uniform"
path = /obj/item/clothing/under/rank/medical/intern/pmc/alt
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Medical Intern")
/datum/gear/faction/epmc_uniform_fr_med
display_name = "EPMC first responder uniform"
display_name = "PMCG/EPMC first responder uniform"
path = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("First Responder")
/datum/gear/faction/epmc_uniform_fr_med/New()
..()
var/list/epmc_uniform_fr_med = list()
epmc_uniform_fr_med["EPMC first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc
epmc_uniform_fr_med["PMCG first responder uniform, alt"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/alt
epmc_uniform_fr_med["Sekhmet Intergalactic first responder uniform"] = /obj/item/clothing/under/rank/medical/first_responder/pmc/sekh
gear_tweaks += new /datum/gear_tweak/path(epmc_uniform_fr_med)
//Zeng-Hu
/datum/gear/faction/zenghu_beret
display_name = "Zeng-Hu beret selection"

1
code/modules/client/preference_setup/loadout/loadout_head.dm
View File

@@ -266,6 +266,7 @@
surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/head/surgery
surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/head/surgery/zeng
surgical["surgical cap, PMCG blue"] = /obj/item/clothing/head/surgery/pmc
surgical["surgical cap, PMCG grey"] = /obj/item/clothing/head/surgery/pmc/alt
surgical["surgical cap, zavodskoi black"] = /obj/item/clothing/head/surgery/zavod
surgical["surgical cap, idris green"] = /obj/item/clothing/head/surgery/idris
gear_tweaks += new /datum/gear_tweak/path(surgical)

1
code/modules/client/preference_setup/loadout/loadout_uniform.dm
View File

@@ -103,6 +103,7 @@
scrubs["scrubs, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon
scrubs["scrubs, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
scrubs["scrubs, PMCG blue"] = /obj/item/clothing/under/rank/medical/surgeon/pmc
scrubs["scrubs, PMCG grey"] = /obj/item/clothing/under/rank/medical/surgeon/pmc/alt
scrubs["scrubs, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod
scrubs["scrubs, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris