cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Security Uniform Tweaks (#14229)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-06-21 00:02:16 +08:00
committed by GitHub
parent 84babc29f6
commit 176d2cfef0
8 changed files with 211 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/outfits/ert/ap_eridani.dm
View File

@@ -59,7 +59,7 @@
/datum/outfit/admin/ert/ap_eridani/lead
name = "Eridani Section Leader"
uniform = /obj/item/clothing/under/rank/security/pmc/epmc_alt
uniform = /obj/item/clothing/under/rank/security/pmc/epmc/alt
suit = null
head = /obj/item/clothing/head/beret/corporate/pmc/epmc
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba

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

@@ -1,43 +1,61 @@
/datum/gear/faction
display_name = "idris cap"
path = /obj/item/clothing/head/softcap/idris
slot = slot_head
display_name = "idris advanced service cloth"
path = /obj/item/reagent_containers/glass/rag/advanced/idris
slot = slot_in_backpack
sort_category = "Factions"
cost = 1
faction = "Idris Incorporated"
/datum/gear/faction/idris_beret
display_name = "idris beret"
path = /obj/item/clothing/head/beret/corporate/idris
/datum/gear/faction/idris_headwear
display_name = "idris headwear selection"
description = "A selection of idris headwear."
path = /obj/item/clothing/head/softcap/idris
slot = slot_head
faction = "Idris Incorporated"
/datum/gear/faction/idris_beret_alt
display_name = "idris beret (alt)"
path = /obj/item/clothing/head/beret/corporate/idris/alt
/datum/gear/faction/idris_headwear/New()
..()
var/list/idris_headwear = list()
idris_headwear["idris cap"] = /obj/item/clothing/head/softcap/idris
idris_headwear["idris cap, alt"] = /obj/item/clothing/head/softcap/idris/alt
idris_headwear["idris beret"] = /obj/item/clothing/head/beret/corporate/idris
idris_headwear["idris beret, alt"] = /obj/item/clothing/head/beret/corporate/idris/alt
gear_tweaks += new /datum/gear_tweak/path(idris_headwear)
/datum/gear/faction/idris_sec_uniforms
display_name = "idris security uniform selection"
description = "A selection of idris security uniforms."
path = /obj/item/clothing/under/rank/security/idris/idrissec
slot = slot_w_uniform
faction = "Idris Incorporated"
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden")
/datum/gear/faction/idris_sec_uniforms/New()
..()
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
gear_tweaks += new /datum/gear_tweak/path(idris_sec_uniforms)
/datum/gear/faction/idris_armband
display_name = "idris armband"
path = /obj/item/clothing/accessory/armband/idris
slot = slot_tie
faction = "Idris Incorporated"
/datum/gear/faction/idris_windbreaker
display_name = "idris jacket"
path = /obj/item/clothing/suit/storage/toggle/idris
slot = slot_wear_suit
faction = "Idris Incorporated"
/datum/gear/faction/idris_passcard
display_name = "idris silversun passcard"
path = /obj/item/clothing/accessory/badge/passcard/sol/silversun
slot = slot_tie
faction = "Idris Incorporated"
/datum/gear/faction/idris_rag
display_name = "idris advanced service cloth"
path = /obj/item/reagent_containers/glass/rag/advanced/idris
slot = slot_in_backpack
/datum/gear/faction/idris_custodialjumpsuit
display_name = "idris custodial jumpsuit, alternative"
path = /obj/item/clothing/under/rank/janitor/idris/alt
slot = slot_w_uniform
cost = 0
faction = "Idris Incorporated"
allowed_roles = list("Janitor")
/datum/gear/faction/idris_sunglasses
display_name = "idris security HUD selection"
@@ -56,8 +74,8 @@
gear_tweaks += new /datum/gear_tweak/path(idris_sunglasses)
/datum/gear/faction/idris_labcoat
display_name = "idris labcoat selection"
description = "A selection of Idris labcoats."
display_name = "idris coat selection"
description = "A selection of Idris coats."
path = /obj/item/clothing/suit/storage/toggle/labcoat/idris
slot = slot_wear_suit
faction = "Idris Incorporated"
@@ -69,28 +87,48 @@
idris_labcoats["idris labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/alt
idris_labcoats["idris letterman labcoat"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman
idris_labcoats["idris letterman labcoat, alt"] = /obj/item/clothing/suit/storage/toggle/labcoat/idris/letterman/alt
idris_labcoats["idris windbreaker"] = /obj/item/clothing/suit/storage/toggle/idris
gear_tweaks += new /datum/gear_tweak/path(idris_labcoats)
/datum/gear/faction/zavodskoi_beret
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/corporate/zavod/alt
faction = "Zavodskoi Interstellar"
/datum/gear/faction/idrissec_patch
display_name = "idris security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/idrissec
faction = "Idris Incorporated"
slot = slot_tie
allowed_roles = list("Security Officer","Investigator")
/datum/gear/faction/zavodskoi_beret/alt
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/corporate/zavod
faction = "Zavodskoi Interstellar"
//Zavodskoi
/datum/gear/faction/zavodskoi_softcap
display_name = "brown zavodskoi cap"
/datum/gear/faction/zavodskoi_headwear
display_name = "zavodskoi headwear selection"
description = "A selection of zavodskoi headwear."
path = /obj/item/clothing/head/softcap/zavod
slot = slot_head
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_softcap/alt
display_name = "black zavodskoi cap"
path = /obj/item/clothing/head/softcap/zavod/alt
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_headwear/New()
..()
var/list/zavodskoi_headwear = list()
zavodskoi_headwear["zavodskoi beret"] = /obj/item/clothing/head/beret/corporate/zavod
zavodskoi_headwear["zavodskoi beret, alt"] = /obj/item/clothing/head/beret/corporate/zavod/alt
zavodskoi_headwear["zavodskoi cap"] = /obj/item/clothing/head/softcap/zavod
zavodskoi_headwear["zavodskoi cap, alt"] = /obj/item/clothing/head/softcap/zavod/alt
gear_tweaks += new /datum/gear_tweak/path(zavodskoi_headwear)
/datum/gear/faction/zavod_sec_uniforms
display_name = "zavodskoi security uniform selection"
description = "A selection of zavodskoi security uniforms."
path = /obj/item/clothing/under/rank/security/zavod/zavodsec
slot = slot_w_uniform
faction = "Zavodskoi Interstellar"
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden")
/datum/gear/faction/zavod_sec_uniforms/New()
..()
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
gear_tweaks += new /datum/gear_tweak/path(zavod_sec_uniforms)
/datum/gear/faction/zavodskoi_labcoat
display_name = "zavodskoi labcoat"
@@ -123,19 +161,21 @@
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/zavodskoi_patch
display_name = "zavodskoi sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoi
slot = slot_tie
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoisec_patch
display_name = "zavodskoi security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoisec
slot = slot_tie
faction = "Zavodskoi Interstellar"
allowed_roles = list("Security Officer","Investigator","Warden")
// PMCG
/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/pmc_cap
display_name = "PMCG cap"
path = /obj/item/clothing/head/softcap/pmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/pmc_sunglasses
display_name = "PMCG security HUD selection"
description = "A selection of PMCG security HUDs."
@@ -167,12 +207,23 @@
pmc_labcoats["labcoat, PMCG"] = /obj/item/clothing/suit/storage/toggle/labcoat/epmc
gear_tweaks += new /datum/gear_tweak/path(pmc_labcoats)
/datum/gear/faction/pmc_patch
display_name = "PMCG armband"
path = /obj/item/clothing/accessory/armband/pmc
slot = slot_tie
/datum/gear/faction/pmcg_headwear
display_name = "PMCG and EPMC headwear selection"
description = "A selection of PMCG and EPMC headwear."
path = /obj/item/clothing/head/softcap/pmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/pmcg_headwear/New()
..()
var/list/pmcg_headwear = list()
pmcg_headwear["PMCG beret"] = /obj/item/clothing/head/beret/corporate/pmc
pmcg_headwear["PMCG softcap"] = /obj/item/clothing/head/softcap/pmc
pmcg_headwear["PMCG softcap, alt"] = /obj/item/clothing/head/softcap/pmc/alt
pmcg_headwear["EPMC beret"] = /obj/item/clothing/head/beret/corporate/pmc/epmc
pmcg_headwear["EPMC softcap"] = /obj/item/clothing/head/softcap/pmc/epmc
gear_tweaks += new /datum/gear_tweak/path(pmcg_headwear)
/datum/gear/faction/pmc_modsuit
display_name = "PMCG modsuit"
description = "A modular PMCG fatigue jumpsuit."
@@ -180,35 +231,20 @@
slot = slot_w_uniform
faction = "Private Military Contracting Group"
// Eridani Private Military Contractors
/datum/gear/faction/epmc_headwear
display_name = "EPMC headwear selection"
description = "A selection of EPMC headwear."
path = /obj/item/clothing/head/softcap/pmc/epmc
slot = slot_head
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_headwear/New()
..()
var/list/epmc_headwear = list()
epmc_headwear["beret, EPMC"] = /obj/item/clothing/head/beret/corporate/pmc/epmc
epmc_headwear["softcap, EPMC"] = /obj/item/clothing/head/softcap/pmc/epmc
gear_tweaks += new /datum/gear_tweak/path(epmc_headwear)
/datum/gear/faction/epmc_sec_uniforms
/datum/gear/faction/pmcg_sec_uniforms
display_name = "EPMC security uniform selection"
description = "A selection of EPMC security uniforms."
description = "A selection of PMCG and EPMC security uniforms."
path = /obj/item/clothing/under/rank/security/pmc/epmc
slot = slot_w_uniform
faction = "Private Military Contracting Group"
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden")
/datum/gear/faction/epmc_sec_uniforms/New()
/datum/gear/faction/pmcg_sec_uniforms/New()
..()
var/list/epmc_sec_uniforms = list()
epmc_sec_uniforms["white, EPMC"] = /obj/item/clothing/under/rank/security/pmc/epmc
epmc_sec_uniforms["black, EPMC"] = /obj/item/clothing/under/rank/security/pmc/epmc_alt
gear_tweaks += new /datum/gear_tweak/path(epmc_sec_uniforms)
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
gear_tweaks += new /datum/gear_tweak/path(pmcg_sec_uniforms)
/datum/gear/faction/erisec_patch
display_name = "EPMC sleeve patch"
@@ -217,14 +253,21 @@
faction = "Private Military Contracting Group"
allowed_roles = list("Security Cadet", "Security Officer", "Investigator", "Warden")
/datum/gear/faction/pmc_patch
display_name = "PMCG armband"
path = /obj/item/clothing/accessory/armband/pmc
slot = slot_tie
faction = "Private Military Contracting Group"
/datum/gear/faction/epmc_uniform_fr_med
display_name = "EPMC first responder uniform"
description = "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")
//Zeng-Hu
/datum/gear/faction/zenghu_beret
display_name = "Zeng-Hu beret selection"
description = "A selection of Zeng-Hu berets."
@@ -275,25 +318,7 @@
slot = slot_wear_suit
faction = "Zeng-Hu Pharmaceuticals"
/datum/gear/faction/zavodskoi_patch
display_name = "zavodskoi sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoi
slot = slot_tie
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoisec_patch
display_name = "zavodskoi security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/zavodskoisec
slot = slot_tie
faction = "Zavodskoi Interstellar"
allowed_roles = list("Security Officer","Investigator","Warden")
/datum/gear/faction/idrissec_patch
display_name = "idris security sleeve patch"
path = /obj/item/clothing/accessory/sleevepatch/idrissec
faction = "Idris Incorporated"
slot = slot_tie
allowed_roles = list("Security Officer","Investigator")
//Hephaestus
/datum/gear/faction/heph_labcoat
display_name = "hephaestus labcoat"
@@ -320,6 +345,7 @@
slot = slot_tie
faction = "Hephaestus Industries"
//Nanotrasen
/datum/gear/faction/nt_custodialjumpsuit
display_name = "nanotrasen custodial jumpsuit, alternative"
path = /obj/item/clothing/under/rank/janitor/alt
@@ -327,11 +353,3 @@
cost = 0
faction = "NanoTrasen"
allowed_roles = list("Janitor")
/datum/gear/faction/idris_custodialjumpsuit
display_name = "idris custodial jumpsuit, alternative"
path = /obj/item/clothing/under/rank/janitor/idris/alt
slot = slot_w_uniform
cost = 0
faction = "Idris Incorporated"
allowed_roles = list("Janitor")

8
code/modules/clothing/head/soft_caps.dm
View File

@@ -129,6 +129,10 @@
icon_state = "idris"
item_state = "idris"
/obj/item/clothing/head/softcap/idris/alt
icon_state = "idrisalt"
item_state = "idrisalt"
/obj/item/clothing/head/softcap/pmc
name = "PMCG cap"
desc = "A company-issue PMCG cap. For amoral mercenaries that prefer style over protection."
@@ -160,6 +164,10 @@
icon_state = "zeng"
item_state = "zeng"
/obj/item/clothing/head/softcap/zeng/alt
icon_state = "zengalt"
item_state = "zengalt"
/obj/item/clothing/head/softcap/nt
desc = "A company-issue NanoTrasen cap. Smells of phoron."
icon_state = "nt"

48
code/modules/clothing/under/jobs/security.dm
View File

@@ -14,7 +14,7 @@
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_officer"
worn_state = "nt_officer"
item_state = "nt_officer"
armor = list(
melee = ARMOR_MELEE_SMALL
)
@@ -22,31 +22,54 @@
contained_sprite = TRUE
/obj/item/clothing/under/rank/security/zavod
name = "zavodskoi interstellar security officer's uniform"
icon_state = "zav_officer"
item_state = "zav_officer"
/obj/item/clothing/under/rank/security/zavod/zavodsec
name = "zavodskoi interstellar security uniform"
icon_state = "zavod"
item_state = "zavod"
/obj/item/clothing/under/rank/security/zavod/zavodsec/alt
icon_state = "zavod_alt"
item_state = "zavod_alt"
/obj/item/clothing/under/rank/security/idris
name = "idris incorporated security officer's uniform"
icon_state = "idris_officer"
item_state = "idris_officer"
/obj/item/clothing/under/rank/security/idris/idrissec
name = "idris incorporated security uniform"
icon_state = "idris"
item_state = "idris"
/obj/item/clothing/under/rank/security/idris/idrissec/alt
icon_state = "idris_alt"
item_state = "idris_alt"
/obj/item/clothing/under/rank/security/pmc
name = "PMCG security officer's uniform"
icon_state = "pmc_officer"
item_state = "pmc_officer"
/obj/item/clothing/under/rank/security/pmc/epmc // Note: Item Icon placeholder
icon_state = "epmc_officer"
item_state = "epmc_officer"
name = "EPMC security uniform"
desc_fluff = "The EPMC is a subsidiary of the PMCG."
icon_state = "epmc"
item_state = "epmc"
/obj/item/clothing/under/rank/security/pmc/epmc_alt // Note: Item Icon placeholder
icon_state = "epmc_officer_alt"
item_state = "epmc_officer_alt"
/obj/item/clothing/under/rank/security/pmc/epmc/alt // Note: Item Icon placeholder
icon_state = "epmc_alt"
item_state = "epmc_alt"
/obj/item/clothing/under/rank/cadet
name = "security cadet's uniform"
desc = "It's made of a slightly sturdier material, to allow for robust protection."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_cadet"
worn_state = "nt_cadet"
item_state = "nt_cadet"
armor = list(
melee = ARMOR_MELEE_SMALL
)
@@ -54,14 +77,17 @@
contained_sprite = TRUE
/obj/item/clothing/under/rank/cadet/zavod
name = "zavodskoi interstellar security cadet's uniform"
icon_state = "zav_cadet"
item_state = "zav_cadet"
/obj/item/clothing/under/rank/cadet/idris
name = "idris incorporated security cadet's uniform"
icon_state = "idris_cadet"
item_state = "idris_cadet"
/obj/item/clothing/under/rank/cadet/pmc
name = "PMCG security cadet's uniform"
icon_state = "pmc_cadet"
item_state = "pmc_cadet"
@@ -70,7 +96,7 @@
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for more robust protection."
icon = 'icons/obj/contained_items/department_uniforms/security.dmi'
icon_state = "nt_warden"
worn_state = "nt_warden"
item_state = "nt_warden"
armor = list(
melee = ARMOR_MELEE_SMALL
)
@@ -87,14 +113,17 @@
sensor_mode = 0
/obj/item/clothing/under/rank/warden/zavod
name = "zavodskoi interstellar warden's uniform"
icon_state = "zav_warden"
item_state = "zav_warden"
/obj/item/clothing/under/rank/warden/idris
name = "idris incorporated warden's uniform"
icon_state = "idris_warden"
item_state = "idris_warden"
/obj/item/clothing/under/rank/warden/pmc
name = "PMCG warden's uniform"
icon_state = "pmc_warden"
item_state = "pmc_warden"
@@ -115,14 +144,17 @@
contained_sprite = TRUE
/obj/item/clothing/under/det/zavod
name = "zavodskoi interstellar investigator's uniform"
icon_state = "zav_invest"
item_state = "zav_invest"
/obj/item/clothing/under/det/idris
name = "idris incorporated investigator's uniform"
icon_state = "idris_invest"
item_state = "idris_invest"
/obj/item/clothing/under/det/pmc
name = "PMCG investigator's uniform"
icon_state = "pmc_invest"
item_state = "pmc_invest"