cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Departmental Softcaps (#10072)" (#10119)

Browse Source 
This reverts commit 0a778af625.
This commit is contained in:
Erki
2020-09-29 00:07:26 +03:00
committed by GitHub
parent 3488c9edf8
commit 67260c6016
24 changed files with 135 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_factions.dm
+2 -2
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/soft/sec/idris
slot = slot_head
sort_category = "Factions"
cost = 1
@@ -59,7 +59,7 @@
/datum/gear/faction/eridani_cap
display_name = "eridani cap"
path = /obj/item/clothing/head/softcap/eri
path = /obj/item/clothing/head/soft/eri
slot = slot_head
faction = "Eridani Private Military Contractors"
code/modules/client/preference_setup/loadout/loadout_head.dm
+24 -31
View File
@@ -34,33 +34,26 @@
path = /obj/item/clothing/head/bandana/colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
/datum/gear/head/softcap
display_name = "softcap selection"
description = "A selection of softcaps. Comes in departmental colors."
path = /obj/item/clothing/head/softcap
/datum/gear/head/cap
display_name = "cap selection"
description = "A selection of colored caps."
path = /obj/item/clothing/head/soft/blue
/datum/gear/head/softcap/New()
/datum/gear/head/cap/New()
..()
var/softcaps = list()
softcaps["softcap"] = /obj/item/clothing/head/softcap
softcaps["softcap, rainbow"] = /obj/item/clothing/head/softcap/rainbow
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/securityurity
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
softcaps["softcap, atmospherics"] = /obj/item/clothing/head/softcap/atmos
softcaps["softcap, hydroponics"] = /obj/item/clothing/head/softcap/hydro
softcaps["softcap, cargo"] = /obj/item/clothing/head/softcap/cargo
softcaps["softcap, mining"] = /obj/item/clothing/head/softcap/miner
gear_tweaks += new/datum/gear_tweak/path(softcaps)
/datum/gear/head/softcap/colorable
display_name = "softcap (colorable)"
path = /obj/item/clothing/head/softcap/colorable
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
var/caps = list()
caps["red cap"] = /obj/item/clothing/head/soft
caps["orange cap"] = /obj/item/clothing/head/soft/orange
caps["yellow cap"] = /obj/item/clothing/head/soft/yellow
caps["green cap"] = /obj/item/clothing/head/soft/green
caps["blue cap"] = /obj/item/clothing/head/soft/blue
caps["purple cap"] = /obj/item/clothing/head/soft/purple
caps["rainbow cap"] = /obj/item/clothing/head/soft/rainbow
caps["black cap"] = /obj/item/clothing/head/soft/black
caps["grey cap"] = /obj/item/clothing/head/soft/grey
caps["white cap"] = /obj/item/clothing/head/soft/white
caps["flat cap"] = /obj/item/clothing/head/flatcap
gear_tweaks += new/datum/gear_tweak/path(caps)
/datum/gear/head/beret/eng
display_name = "beret, engie-orange"
@@ -77,6 +70,7 @@
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."
@@ -114,12 +108,12 @@
/datum/gear/head/corp
display_name = "cap, corporate (security)"
path = /obj/item/clothing/head/softcap/security/corp
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",)
/datum/gear/head/sec
display_name = "cap, security"
path = /obj/item/clothing/head/softcap/security
path = /obj/item/clothing/head/soft/sec
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",)
/datum/gear/head/hardhat
@@ -188,7 +182,6 @@
hats["hat, cowboy"] = /obj/item/clothing/head/cowboy
hats["hat, wide-brimmed cowboy"] = /obj/item/clothing/head/cowboy/wide
hats["hat, sombrero"] = /obj/item/clothing/head/sombrero
hats["hat, flatcap"] = /obj/item/clothing/head/flatcap
gear_tweaks += new/datum/gear_tweak/path(hats)
/datum/gear/head/hijab
@@ -257,7 +250,7 @@
/datum/gear/head/iacberet
display_name = "IAC Beret"
path = /obj/item/clothing/head/softcap/iacberet
path = /obj/item/clothing/head/soft/iacberet
allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Emergency Medical Technician", "Medical Resident")
flags = GEAR_HAS_DESC_SELECTION
@@ -284,12 +277,12 @@
/datum/gear/head/himeo
display_name = "himean cap"
path = /obj/item/clothing/head/softcap/himeo
path = /obj/item/clothing/head/soft/himeo
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/vysoka
display_name = "vysokan fur cap"
path = /obj/item/clothing/head/softcap/vysoka
path = /obj/item/clothing/head/soft/vysoka
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/head/buckethat
code/modules/client/preference_setup/loadout/loadout_religion.dm
+3 -3
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/soft/dominia
beret["tribunalist's beret"] = /obj/item/clothing/head/soft/dominia/priest
gear_tweaks += new/datum/gear_tweak/path(beret)
/datum/gear/religion/dominia/cape
@@ -63,4 +63,4 @@
/datum/gear/religion/dominia/accessory
display_name = "tribunal necklace"
path = "/obj/item/clothing/accessory/dominia"
path = "/obj/item/clothing/accessory/dominia"