cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Uniformity : The Confluence of Conformity (#13773)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-05-13 18:08:50 +08:00
committed by GitHub
parent 72f22493a3
commit 3e8f9e0901
89 changed files with 1063 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_factions.dm
+43 -68
View File
@@ -1,6 +1,6 @@
/datum/gear/faction
display_name = "idris cap"
path = /obj/item/clothing/head/softcap/security/idris
path = /obj/item/clothing/head/softcap/idris
slot = slot_head
sort_category = "Factions"
cost = 1
@@ -8,21 +8,13 @@
/datum/gear/faction/idris_beret
display_name = "idris beret"
path = /obj/item/clothing/head/beret/security/idris
path = /obj/item/clothing/head/beret/corporate/idris
faction = "Idris Incorporated"
/datum/gear/faction/idris_beret_alt
display_name = "idris beret (alt)"
path = /obj/item/clothing/head/beret/security/idris/alt
path = /obj/item/clothing/head/beret/corporate/idris/alt
faction = "Idris Incorporated"
/datum/gear/faction/idris_uniform_alt
display_name = "idris service skirt"
description = "Not for security usage."
path = /obj/item/clothing/under/rank/idris/service/alt
slot = slot_w_uniform
faction = "Idris Incorporated"
/datum/gear/faction/idris_armband
display_name = "idris armband"
path = /obj/item/clothing/accessory/armband/idris
@@ -79,34 +71,22 @@
/datum/gear/faction/zavodskoi_beret
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi
path = /obj/item/clothing/head/beret/corporate/zavod/alt
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_beret/alt
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi/alt
path = /obj/item/clothing/head/beret/corporate/zavod
sort_category = "Factions"
/datum/gear/faction/zavodskoi_softcap
display_name = "black zavodskoi cap"
path = /obj/item/clothing/head/softcap/zavod
path = /obj/item/clothing/head/softcap/zavod/alt
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_softcap/alt
display_name = "brown zavodskoi cap"
path = /obj/item/clothing/head/softcap/zavod/alt
/datum/gear/faction/zavodskoi_uniform_alt
display_name = "brown zavodskoi uniform"
path = /obj/item/clothing/under/rank/security/zavodskoi/alt
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_research_alt
display_name = "brown zavodskoi research uniform"
path = /obj/item/clothing/under/rank/zavodskoi/research/alt
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
path = /obj/item/clothing/head/softcap/zavod
/datum/gear/faction/zavodskoi_labcoat
display_name = "zavodskoi labcoat"
@@ -130,66 +110,61 @@
zavod_sunglasses["aviator sunglasses, Zavodskoi"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/zavod
gear_tweaks += new /datum/gear_tweak/path(zavod_sunglasses)
/datum/gear/faction/eridani_beret
display_name = "eridani beret"
path = /obj/item/clothing/head/beret/security/eri
/datum/gear/faction/pmc_beret
display_name = "PMCG beret"
path = /obj/item/clothing/head/beret/corporate/pmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/eridani_cap
display_name = "eridani cap"
path = /obj/item/clothing/head/softcap/eri
/datum/gear/faction/pmc_cap
display_name = "PMCG cap"
path = /obj/item/clothing/head/softcap/pmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_sunglasses
display_name = "EPMC security HUD selection"
description = "A selection of EPMC security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/epmc
/datum/gear/faction/pmc_sunglasses
display_name = "PMCG security HUD selection"
description = "A selection of PMCG security HUDs."
path = /obj/item/clothing/glasses/sunglasses/sechud/pmc
slot = slot_glasses
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Investigator")
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_sunglasses/New()
/datum/gear/faction/pmc_sunglasses/New()
..()
var/list/epmc_sunglasses = list()
epmc_sunglasses["HUDsunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/epmc
epmc_sunglasses["fat HUDsunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/big/epmc
epmc_sunglasses["aviator sunglasses, EPMC"] = /obj/item/clothing/glasses/sunglasses/sechud/aviator/epmc
gear_tweaks += new /datum/gear_tweak/path(epmc_sunglasses)
var/list/pmc_sunglasses = list()
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
gear_tweaks += new /datum/gear_tweak/path(pmc_sunglasses)
/datum/gear/faction/epmc_labcoat
display_name = "EPMC labcoat selection"
description = "A selection of EPMC labcoats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
/datum/gear/faction/pmc_labcoat
display_name = "PMCG labcoat selection"
description = "A selection of PMCG labcoats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/pmc
slot = slot_wear_suit
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_labcoat/New()
/datum/gear/faction/pmc_labcoat/New()
..()
var/list/epmc_labcoats = list()
epmc_labcoats["security labcoat, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
epmc_labcoats["security labcoat alt, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc/alt
epmc_labcoats["medical labcoat, EPMC"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc/med
gear_tweaks += new /datum/gear_tweak/path(epmc_labcoats)
/datum/gear/faction/zenghu_uniform_alt
display_name = "zeng-hu white uniform"
path = /obj/item/clothing/under/rank/zeng/alt
slot = slot_w_uniform
faction = "Zeng-Hu Pharmaceuticals"
var/list/pmc_labcoats = list()
pmc_labcoats["labcoat, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc
pmc_labcoats["labcoat alt, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/pmc/alt
gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats)
/datum/gear/faction/zenghu_beret
display_name = "purple zeng-hu beret"
path = /obj/item/clothing/head/beret/zeng
display_name = "Zeng-Hu beret selection"
description = "A selection of Zeng-Hu berets."
path = /obj/item/clothing/head/beret/corporate/zeng
slot = slot_head
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_beret_alt
display_name = "white zeng-hu beret"
path = /obj/item/clothing/head/beret/zeng/alt
slot = slot_head
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zenghu_beret/New()
..()
var/list/zenghu_berets = list()
zenghu_berets["beret, zeng-hu"] = /obj/item/clothing/head/beret/corporate/zeng
zenghu_berets["beret alt, zeng-hu"] = /obj/item/clothing/head/beret/corporate/zeng/alt
gear_tweaks += new /datum/gear_tweak/path(zenghu_berets)
/datum/gear/faction/zenghu_labcoat
display_name = "zeng-hu coat selection"
@@ -237,7 +212,7 @@
allowed_roles = list("Security Officer","Investigator","Warden")
/datum/gear/faction/erisec_patch
display_name = "EPMC sleeve patch"
display_name = "PMCG sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/erisec
slot = slot_tie
faction = "Private Military Contracting Group"
@@ -257,7 +232,7 @@
/datum/gear/faction/heph_beret
display_name = "hephaestus beret"
path = /obj/item/clothing/head/beret/heph
path = /obj/item/clothing/head/beret/corporate/heph
slot = slot_head
faction = "Hephaestus Industries"
code/modules/client/preference_setup/loadout/loadout_head.dm
+12 -16
View File
@@ -25,7 +25,6 @@
bandanas["bandana, red"] = /obj/item/clothing/head/bandana/red
bandanas["bandana, captain"] = /obj/item/clothing/head/bandana/captain
bandanas["bandana, security"] = /obj/item/clothing/head/bandana/security
bandanas["bandana, security (corporate)"] = /obj/item/clothing/head/bandana/security/corp
bandanas["bandana, science"] = /obj/item/clothing/head/bandana/science
bandanas["bandana, medical"] = /obj/item/clothing/head/bandana/medical
bandanas["bandana, engineering"] = /obj/item/clothing/head/bandana/engineering
@@ -56,7 +55,6 @@
softcaps["softcap, red"] = /obj/item/clothing/head/softcap/red
softcaps["softcap, captain"] = /obj/item/clothing/head/softcap/captain
softcaps["softcap, security"] = /obj/item/clothing/head/softcap/security
softcaps["softcap, security (corporate)"] = /obj/item/clothing/head/softcap/security/corp
softcaps["softcap, science"] = /obj/item/clothing/head/softcap/science
softcaps["softcap, medical"] = /obj/item/clothing/head/softcap/medical
softcaps["softcap, engineering"] = /obj/item/clothing/head/softcap/engineering
@@ -87,7 +85,6 @@
berets["beret, red"] = /obj/item/clothing/head/beret/red
berets["beret, captain"] = /obj/item/clothing/head/beret/captain
berets["beret, security"] = /obj/item/clothing/head/beret/security
berets["beret, security (corporate)"] = /obj/item/clothing/head/beret/security/corp
berets["beret, science"] = /obj/item/clothing/head/beret/science
berets["beret, medical"] = /obj/item/clothing/head/beret/medical
berets["beret, engineering"] = /obj/item/clothing/head/beret/engineering
@@ -113,10 +110,10 @@
/datum/gear/head/warden/New()
..()
var/list/wardenhead = list()
wardenhead["warden hat, standard"] = /obj/item/clothing/head/warden
wardenhead["warden hat, corporate"] = /obj/item/clothing/head/warden/corp
wardenhead["warden beret, standard"] = /obj/item/clothing/head/beret/security/warden
wardenhead["warden beret, corporate"] = /obj/item/clothing/head/beret/security/warden/corp
wardenhead["warden hat, zavod"] = /obj/item/clothing/head/warden
wardenhead["warden hat, idris"] = /obj/item/clothing/head/warden/idris
wardenhead["warden hat, pmc"] = /obj/item/clothing/head/warden/pmc
wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden
gear_tweaks += new /datum/gear_tweak/path(wardenhead)
/datum/gear/head/hos
@@ -128,10 +125,8 @@
/datum/gear/head/hos/New()
..()
var/list/hoshead = list()
hoshead["head of security hat, standard"] = /obj/item/clothing/head/hos
hoshead["head of security hat, corporate"] = /obj/item/clothing/head/hos/corp
hoshead["head of security beret, standard"] = /obj/item/clothing/head/beret/security/hos
hoshead["head of security beret, corporate"] = /obj/item/clothing/head/beret/security/hos/corp
hoshead["head of security hat"] = /obj/item/clothing/head/hos
hoshead["head of security beret"] = /obj/item/clothing/head/beret/security/hos
gear_tweaks += new /datum/gear_tweak/path(hoshead)
/datum/gear/head/hardhat
@@ -247,16 +242,17 @@
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/blue
path = /obj/item/clothing/head/surgery/pmc
allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
/datum/gear/head/surgical/New()
..()
var/list/surgical = list()
surgical["surgical cap, purple"] = /obj/item/clothing/head/surgery/purple
surgical["surgical cap, blue"] = /obj/item/clothing/head/surgery/blue
surgical["surgical cap, green"] = /obj/item/clothing/head/surgery/green
surgical["surgical cap, black"] = /obj/item/clothing/head/surgery/black
surgical["surgical cap, nanotrasen navy blue"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
surgical["surgical cap, zeng-hu purple"] = /obj/item/clothing/under/rank/medical/surgeon/zeng
surgical["surgical cap, PMCG blue"] = /obj/item/clothing/head/surgery/pmc
surgical["surgical cap, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod
surgical["surgical cap, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris
gear_tweaks += new /datum/gear_tweak/path(surgical)
/datum/gear/head/headbando
code/modules/client/preference_setup/loadout/loadout_suit.dm
+1 -3
View File
@@ -117,9 +117,7 @@ datum/gear/suit/colorvest
..()
var/list/medical_outerwear = list()
medical_outerwear["medical chest-rig"] = /obj/item/clothing/suit/storage/medical_chest_rig
medical_outerwear["first responder vest"] = /obj/item/clothing/suit/storage/medical_chest_rig/first_responder
medical_outerwear["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket/alt
medical_outerwear["first responder jacket, alt"] = /obj/item/clothing/suit/storage/toggle/fr_jacket // this variant is the old bright green one and doesn't go with the NT medic uniform
medical_outerwear["first responder jacket"] = /obj/item/clothing/suit/storage/toggle/fr_jacket
gear_tweaks += new /datum/gear_tweak/path(medical_outerwear)
/datum/gear/suit/iac_outerwear
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+7 -20
View File
@@ -95,16 +95,18 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/black
path = /obj/item/clothing/under/rank/medical/surgeon/zavod
allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "First Responder", "Medical Intern", "Xenobiologist", "Research Director", "Investigator")
/datum/gear/uniform/scrubs/New()
..()
var/list/scrubs = list()
scrubs["scrubs, black"] = /obj/item/clothing/under/rank/medical/black
scrubs["scrubs, blue"] = /obj/item/clothing/under/rank/medical/blue
scrubs["scrubs, green"] = /obj/item/clothing/under/rank/medical/green
scrubs["scrubs, purple"] = /obj/item/clothing/under/rank/medical/purple
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, zavodskoi black"] = /obj/item/clothing/under/rank/medical/surgeon/zavod
scrubs["scrubs, idris green"] = /obj/item/clothing/under/rank/medical/surgeon/idris
gear_tweaks += new /datum/gear_tweak/path(scrubs)
/datum/gear/uniform/dress
@@ -279,21 +281,6 @@
path = /obj/item/clothing/under/kimono
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/uniform/detective
display_name = "uniforms, (Investigations)"
description = "A selection of Investigations staff uniforms."
path = /obj/item/clothing/under/det
allowed_roles = list("Investigator")
/datum/gear/uniform/detective/New()
..()
var/list/uniform = list()
uniform["investigator uniform, tan"] = /obj/item/clothing/under/det
uniform["investigator uniform, grey"] = /obj/item/clothing/under/det/forensics
uniform["investigator uniform, black"] = /obj/item/clothing/under/det/black
uniform["investigator uniform, brown"] = /obj/item/clothing/under/det/classic
gear_tweaks += new /datum/gear_tweak/path(uniform)
/datum/gear/uniform/circuitry
display_name = "jumpsuit, circuitry (empty)"
path = /obj/item/clothing/under/circuitry