cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 05:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds the contractors uniforms (#6399)

Browse Source
This commit is contained in:
Alberyk
2019-05-11 16:27:15 -03:00
committed by Werner
parent 7ba2599ed4
commit 001565ca2f
16 changed files with 135 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
/datum/gear/gloves/ring
display_name = "ring"
description = "A selection of rings."
path = /obj/item/clothing/ring/engagement
/datum/gear/gloves/ring/New()

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

@@ -18,6 +18,7 @@
/datum/gear/head/cap
display_name = "cap selection"
description = "A selection of colored caps."
path = /obj/item/clothing/head/soft/blue
/datum/gear/head/cap/New()
@@ -110,6 +111,7 @@
/datum/gear/head/hats
display_name = "hat selection"
description = "A selection of hats."
path = /obj/item/clothing/head/boaterhat
/datum/gear/head/hats/New()

2
code/modules/client/preference_setup/loadout/loadout_suit.dm
View File

@@ -8,6 +8,7 @@
/datum/gear/suit/leather
display_name = "jacket selection"
description = "A selection of jackets."
path = /obj/item/clothing/suit/storage/toggle/leather_jacket
/datum/gear/suit/leather/New()
@@ -204,6 +205,7 @@
/datum/gear/suit/dominia
display_name = "dominia great coat selection"
description = "A selection of Dominian coats."
path = /obj/item/clothing/suit/storage/toggle/dominia
/datum/gear/suit/dominia/New()

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

@@ -16,6 +16,7 @@
/datum/gear/uniform/jumpsuit
display_name = "generic jumpsuits"
description = "A selection of generic colored jumpsuits."
path = /obj/item/clothing/under/color/grey
/datum/gear/uniform/jumpsuit/New()
@@ -45,7 +46,8 @@
/datum/gear/uniform/skirt
display_name = "skirt selection"
path = /obj/item/clothing/under/skirt/
description = "A selection of skirts."
path = /obj/item/clothing/under/skirt
/datum/gear/uniform/skirt/New()
..()
@@ -59,6 +61,7 @@
/datum/gear/uniform/suit
display_name = "suit selection"
description = "A selection of formal suits."
path = /obj/item/clothing/under/lawyer/bluesuit
/datum/gear/uniform/suit/New()
@@ -100,6 +103,7 @@
/datum/gear/uniform/dress
display_name = "dress selection"
description = "A selection of dresses."
path = /obj/item/clothing/under/sundress
/datum/gear/uniform/dress/New()
@@ -132,7 +136,7 @@
allowed_roles = list("Captain")
/datum/gear/uniform/customdress
display_name = "Evening gown"
display_name = "evening gown"
path = /obj/item/clothing/under/dress/dress_evening
/datum/gear/uniform/customdress/New()
@@ -169,8 +173,24 @@
path = /obj/item/clothing/under/rank/head_of_security/navyblue
allowed_roles = list("Head of Security")
/datum/gear/uniform/security_contractors
display_name = "security contractor uniform selection"
description = "A selection of security contractor uniforms."
path = /obj/item/clothing/under/rank/security/necropolis
allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
/datum/gear/uniform/security_contractors/New()
..()
var/uniform = list()
uniform["Necropolis Industries security uniform"] = /obj/item/clothing/under/rank/security/necropolis
uniform["Idris Incorporated security uniform"] = /obj/item/clothing/under/rank/security/idris
uniform["Idris Incorporated security uniform, alternative"] = /obj/item/clothing/under/rank/security/idris/alt
uniform["Eridani PMC uniform"] = /obj/item/clothing/under/rank/security/eridani
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/pants
display_name = "pants selection"
description = "A selection of pants."
path = /obj/item/clothing/under/pants
/datum/gear/uniform/pants/New()
@@ -219,6 +239,7 @@
/datum/gear/uniform/dominia
display_name = "dominia suit selection"
description = "A selection of dominian suits."
path = /obj/item/clothing/under/dominia
/datum/gear/uniform/dominia/New()
@@ -239,4 +260,19 @@
/datum/gear/uniform/miscellaneous/greensuit
display_name = "green formal uniform"
path = /obj/item/clothing/under/gov
path = /obj/item/clothing/under/gov
/datum/gear/uniform/contractors
display_name = "contractor uniform selection"
description = "A selection of contractor uniforms."
path = /obj/item/clothing/under/rank/hephaestus
/datum/gear/uniform/contractors/New()
..()
var/uniform = list()
uniform["Hephaestus Industries uniform"] = /obj/item/clothing/under/rank/hephaestus
uniform["Necropolis Industries uniform"] = /obj/item/clothing/under/rank/necropolis
uniform["Idris Incorporated uniform"] = /obj/item/clothing/under/rank/idris
uniform["Einstein Engines uniform"] = /obj/item/clothing/under/rank/einstein_engines
uniform["Zeng-Hu Pharmaceuticals uniform"] = /obj/item/clothing/under/rank/zheng
gear_tweaks += new/datum/gear_tweak/path(uniform)

21
code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm
View File

@@ -1,5 +1,5 @@
/datum/gear/head/goldenchains
display_name = "golden deep headchains (Machine)"
display_name = "golden deep headchains"
path = /obj/item/clothing/head/headchain
cost = 1
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
@@ -14,7 +14,7 @@
gear_tweaks += new/datum/gear_tweak/path(headchains)
/datum/gear/head/goldencrests
display_name = "golden deep crests (Machine)"
display_name = "golden deep crests"
path = /obj/item/clothing/head/crest
cost = 1
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
@@ -29,7 +29,7 @@
gear_tweaks += new/datum/gear_tweak/path(crest)
/datum/gear/gloves/armchains
display_name = "golden deep armchains (Machine)"
display_name = "golden deep armchains"
path = /obj/item/clothing/gloves/armchain
cost = 1
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
@@ -44,7 +44,7 @@
gear_tweaks += new/datum/gear_tweak/path(armchains)
/datum/gear/gloves/bracers
display_name = "golden deep bracers (Machine)"
display_name = "golden deep bracers"
path = /obj/item/clothing/gloves/goldbracer
cost = 1
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
@@ -59,7 +59,7 @@
gear_tweaks += new/datum/gear_tweak/path(bracers)
/datum/gear/ears/antennae
display_name = "antennae (Machine)"
display_name = "antennae"
path = /obj/item/clothing/head/antenna
cost = 1
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
@@ -77,8 +77,15 @@
gear_tweaks += list(gear_tweak_free_color_choice)
/datum/gear/ears/headlights
display_name = "headlights (Machine)"
display_name = "headlights"
path = /obj/item/device/flashlight/headlights
cost = 2
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
sort_category = "Xenowear - IPC"
sort_category = "Xenowear - IPC"
/datum/gear/suit/idris
display_name = "Idris reclamation unit coat"
path = /obj/item/clothing/suit/armor/vest/idris
whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame")
sort_category = "Xenowear - IPC"
allowed_roles = list("Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")

8
code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
View File

@@ -1,5 +1,6 @@
/datum/gear/gloves/tajara
display_name = "tajara gloves selection"
description = "A selection of tajaran colored gloves."
path = /obj/item/clothing/gloves/black/tajara
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -19,6 +20,7 @@
/datum/gear/suit/tajara_coat
display_name = "tajara coat selection"
description = "A selection of tajaran native coats."
path = /obj/item/clothing/suit/storage/tajaran
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -35,6 +37,7 @@
/datum/gear/suit/tajara_priest
display_name = "tajaran priest robe selection"
description = "A selection of tajaran religious robes."
path = /obj/item/clothing/suit/storage/hooded/tajaran/priest
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -55,6 +58,7 @@
/datum/gear/uniform/tajara
display_name = "tajaran uniform selection"
description = "A selection of tajaran native uniforms."
path = /obj/item/clothing/under/tajaran
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -69,6 +73,7 @@
/datum/gear/uniform/tajara_dress
display_name = "tajaran dress selection"
description = "A selection of tajaran native dresses."
path = /obj/item/clothing/under/dress/tajaran
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -86,6 +91,7 @@
/datum/gear/accessory/tajara
display_name = "fur scarf"
description = "A selection of tajaran colored fur scarfs."
path = /obj/item/clothing/accessory/tajaran
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -106,6 +112,7 @@
/datum/gear/head/tajara
display_name = "adhomian headgear selection"
description = "A selection of tajaran native headgear."
path = /obj/item/clothing/head/tajaran/circlet
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"
@@ -120,6 +127,7 @@
/datum/gear/accessory/tajara_wrap
display_name = "marriage wrap"
description = "A holy cloth wrap that signifies marriage amongst tajara."
path = /obj/item/clothing/accessory/tajaran_wrap
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear - Tajara"

1
code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
View File

@@ -21,6 +21,7 @@
/datum/gear/gloves/unathi
display_name = "unathi gloves selection"
description = "A selection of unathi colored gloves."
path = /obj/item/clothing/gloves/black/unathi
whitelisted = list("Unathi", "Aut'akh Unathi")
sort_category = "Xenowear - Unathi"

1
code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm
View File

@@ -46,6 +46,7 @@
/datum/gear/vaurca_robe
display_name = "hive cloak"
description = "A selection of vaurca colored hive cloaks."
path = /obj/item/clothing/suit/vaurca
cost = 1
whitelisted = list("Vaurca Worker", "Vaurca Warrior")