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

Departmental Berets (#10391)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-11-04 18:22:39 +08:00
committed by GitHub
parent 3cad17e8db
commit a0c07fa6d5
40 changed files with 412 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
/datum/gear/faction/idris_beret
display_name = "idris beret"
path = /obj/item/clothing/head/beret/sec/idris
path = /obj/item/clothing/head/beret/security/idris
faction = "Idris Incorporated"
/datum/gear/faction/idris_uniform_alt
@@ -24,13 +24,13 @@
faction = "Idris Incorporated"
/datum/gear/faction/zavodskoi_beret
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi
faction = "Zavodskoi Interstellar"
/datum/gear/faction/zavodskoi_beret/alt
display_name = "black zavodskoi beret"
path = /obj/item/clothing/head/beret/sec/zavodskoi/alt
display_name = "brown zavodskoi beret"
path = /obj/item/clothing/head/beret/security/zavodskoi/alt
sort_category = "Factions"
/datum/gear/faction/zavodskoi_uniform_alt
@@ -53,7 +53,7 @@
/datum/gear/faction/eridani_beret
display_name = "eridani beret"
path = /obj/item/clothing/head/beret/sec/eri
path = /obj/item/clothing/head/beret/security/eri
slot = slot_head
faction = "Eridani Private Military Contractors"

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

@@ -12,6 +12,7 @@
display_name = "bandana selection"
description = "A selection of bandanas. Comes in departmental colors."
path = /obj/item/clothing/head/bandana
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/bandana/New()
..()
@@ -40,6 +41,7 @@
display_name = "softcap selection"
description = "A selection of softcaps. Comes in departmental colors."
path = /obj/item/clothing/head/softcap
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/softcap/New()
..()
@@ -65,21 +67,35 @@
path = /obj/item/clothing/head/softcap/colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/beret/eng
display_name = "beret, engie-orange"
path = /obj/item/clothing/head/beret/engineering
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
/datum/gear/head/beret
display_name = "beret selection"
description = "A selection of berets. Comes in departmental colors."
path = /obj/item/clothing/head/beret
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/beret/New()
..()
var/berets = list()
berets["beret"] = /obj/item/clothing/head/beret
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, 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
berets["beret, atmospherics"] = /obj/item/clothing/head/beret/atmos
berets["beret, hydroponics"] = /obj/item/clothing/head/beret/hydro
berets["beret, cargo"] = /obj/item/clothing/head/beret/cargo
berets["beret, mining"] = /obj/item/clothing/head/beret/miner
berets["beret, janitor"] = /obj/item/clothing/head/beret/janitor
gear_tweaks += new/datum/gear_tweak/path(berets)
/datum/gear/head/beret/color
display_name = "beret (colorable)"
path = /obj/item/clothing/head/beret/misc
path = /obj/item/clothing/head/beret/colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/beret/sec
display_name = "beret, security"
path = /obj/item/clothing/head/beret/sec
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/head/warden
display_name = "headwear, security (warden)"
description = "A selection of warden headwear."
@@ -92,7 +108,7 @@
wardenhead["blue warden hat"] = /obj/item/clothing/head/warden
wardenhead["black warden hat"] = /obj/item/clothing/head/warden/alt
wardenhead["commissar's cap"] = /obj/item/clothing/head/warden/commissar
wardenhead["warden beret"] = /obj/item/clothing/head/beret/sec/warden
wardenhead["warden beret"] = /obj/item/clothing/head/beret/security/warden
gear_tweaks += new/datum/gear_tweak/path(wardenhead)
/datum/gear/head/hos
@@ -104,17 +120,12 @@
/datum/gear/head/hos/New()
..()
var/hoshead = list()
hoshead["blue commander beret"] = /obj/item/clothing/head/beret/sec/hos
hoshead["black commander beret"] = /obj/item/clothing/head/beret/sec/hos/alt
hoshead["blue commander beret"] = /obj/item/clothing/head/beret/security/hos
hoshead["black commander beret"] = /obj/item/clothing/head/beret/security/hos/alt
hoshead["blue commander hat"] = /obj/item/clothing/head/hos/cap
hoshead["black commander hat"] = /obj/item/clothing/head/hos/cap/alt
gear_tweaks += new/datum/gear_tweak/path(hoshead)
/datum/gear/head/beret/medical
display_name = "beret, medical"
path = /obj/item/clothing/head/beret/medical
allowed_roles = list("Physician", "Surgeon", "Medical Intern", "Pharmacist", "Emergency Medical Technician", "Chief Medial Officer", "Psychiatrist")
/datum/gear/head/corp
display_name = "cap, corporate (security)"
path = /obj/item/clothing/head/softcap/security/corp
@@ -260,7 +271,7 @@
/datum/gear/head/iacberet
display_name = "IAC Beret"
path = /obj/item/clothing/head/softcap/iacberet
path = /obj/item/clothing/head/softcap/iac
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Intern")
flags = GEAR_HAS_DESC_SELECTION
@@ -270,14 +281,14 @@
/datum/gear/head/tcfl
display_name = "tcfl hat selection"
path = /obj/item/clothing/head/legion_beret
path = /obj/item/clothing/head/beret/legion
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/tcfl/New()
..()
var/tcfl = list()
tcfl["tcfl beret, dress"] = /obj/item/clothing/head/legion_beret
tcfl["tcfl beret, field"] = /obj/item/clothing/head/legion
tcfl["tcfl beret, dress"] = /obj/item/clothing/head/beret/legion
tcfl["tcfl beret, field"] = /obj/item/clothing/head/beret/legion/field
gear_tweaks += new/datum/gear_tweak/path(tcfl)
/datum/gear/head/padded_cap
@@ -303,12 +314,12 @@
/datum/gear/head/gadpathur
display_name = "gadpathurian headgear selection"
description = "A selection of headgear from Gadpathur."
path = /obj/item/clothing/head/soft/gadpathur
path = /obj/item/clothing/head/gadpathur
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/gadpathur/New()
..()
var/gadpathur = list()
gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/soft/gadpathur
gadpathur["gadpathurian beret"] = /obj/item/clothing/head/soft/gadpathur/beret
gadpathur["gadpathurian sidecap"] = /obj/item/clothing/head/gadpathur
gadpathur["gadpathurian beret"] = /obj/item/clothing/head/beret/gadpathur
gear_tweaks += new/datum/gear_tweak/path(gadpathur)

4
code/modules/client/preference_setup/loadout/loadout_religion.dm
View File

@@ -44,8 +44,8 @@
/datum/gear/religion/dominia/beret/New()
..()
var/beret = list()
beret["tribunal initiate's beret"] = /obj/item/clothing/head/softcap/dominia
beret["tribunalist's beret"] = /obj/item/clothing/head/softcap/dominia/priest
beret["tribunal initiate's beret"] = /obj/item/clothing/head/beret/dominia
beret["tribunalist's beret"] = /obj/item/clothing/head/beret/dominia/priest
gear_tweaks += new/datum/gear_tweak/path(beret)
/datum/gear/religion/dominia/cape