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

Tweaking Security Outfits (#10508)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2021-01-16 19:51:38 +08:00
committed by GitHub
parent e2abfd7e23
commit aa4206f066
25 changed files with 270 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_head.dm
+11 -18
View File
@@ -21,6 +21,7 @@
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
@@ -51,6 +52,7 @@
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
@@ -80,6 +82,7 @@
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
@@ -105,10 +108,10 @@
/datum/gear/head/warden/New()
..()
var/wardenhead = list()
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/security/warden
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
gear_tweaks += new/datum/gear_tweak/path(wardenhead)
/datum/gear/head/hos
@@ -120,22 +123,12 @@
/datum/gear/head/hos/New()
..()
var/hoshead = list()
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
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
gear_tweaks += new/datum/gear_tweak/path(hoshead)
/datum/gear/head/corp
display_name = "cap, corporate (security)"
path = /obj/item/clothing/head/softcap/security/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
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",)
/datum/gear/head/hardhat
display_name = "hardhat selection"
path = /obj/item/clothing/head/hardhat
code/modules/client/preference_setup/loadout/loadout_suit.dm
+45 -8
View File
@@ -201,21 +201,58 @@
wintercoat["winter coat, mining"] = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
gear_tweaks += new/datum/gear_tweak/path(wintercoat)
/datum/gear/suit/secjacket
display_name = "navy security jacket (Security Officer)"
path = /obj/item/clothing/suit/security/navyofficer
/datum/gear/suit/secjacketofficer
display_name = "security jacket selection (Security Officer)"
path = /obj/item/clothing/suit/security/officer
allowed_roles = list("Security Officer", "Head of Security", "Warden")
/datum/gear/suit/secjacketofficer/New()
..()
var/secjacket = list()
secjacket["security jacket"] = /obj/item/clothing/suit/security/officer
secjacket["security jacket, blue"] = /obj/item/clothing/suit/security/officer/blue
secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/security/officer/dnavy
gear_tweaks += new/datum/gear_tweak/path(secjacket)
/datum/gear/suit/secjacketwarden
display_name = "navy security jacket (Warden)"
path = /obj/item/clothing/suit/security/navywarden
display_name = "security jacket selection (Warden)"
path = /obj/item/clothing/suit/security/warden
allowed_roles = list("Head of Security", "Warden")
/datum/gear/suit/secjacketwarden/New()
..()
var/secjacket = list()
secjacket["security jacket"] = /obj/item/clothing/suit/security/warden
secjacket["security jacket, blue"] = /obj/item/clothing/suit/security/warden/blue
secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/security/warden/dnavy
gear_tweaks += new/datum/gear_tweak/path(secjacket)
/datum/gear/suit/secjackethos
display_name = "navy security jacket (Head of Security)"
path = /obj/item/clothing/suit/security/navyhos
display_name = "security jacket selection (Head of Security)"
path = /obj/item/clothing/suit/security/hos
allowed_roles = list("Head of Security")
/datum/gear/suit/secjackethos/New()
..()
var/secjacket = list()
secjacket["security jacket"] = /obj/item/clothing/suit/security/hos
secjacket["security jacket, blue"] = /obj/item/clothing/suit/security/hos/blue
secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/security/hos/dnavy
gear_tweaks += new/datum/gear_tweak/path(secjacket)
/datum/gear/suit/secjacketforensictech
display_name = "security jacket selection (Forensic Technician)"
path = /obj/item/clothing/suit/storage/toggle/forensics
allowed_roles = list("Forensic Technician")
/datum/gear/suit/secjacketforensictech/New()
..()
var/secjacket = list()
secjacket["security jacket"] = /obj/item/clothing/suit/storage/toggle/forensics
secjacket["security jacket, blue"] = /obj/item/clothing/suit/storage/toggle/forensics/blue
secjacket["security jacket, dark navy"] = /obj/item/clothing/suit/storage/toggle/forensics/dnavy
gear_tweaks += new/datum/gear_tweak/path(secjacket)
/datum/gear/suit/dominia_cape
display_name = "dominian cape"
path = /obj/item/clothing/accessory/poncho/dominia_cape
@@ -353,4 +390,4 @@
/datum/gear/suit/gadpathur
display_name = "gadpathurian overcoat"
path = /obj/item/clothing/suit/storage/gadpathur
flags = GEAR_HAS_DESC_SELECTION
flags = GEAR_HAS_DESC_SELECTION
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+2 -2
View File
@@ -284,7 +284,7 @@
var/uniform = list()
uniform["warden uniform, standard"] = /obj/item/clothing/under/rank/warden
uniform["warden uniform, corporate"] = /obj/item/clothing/under/rank/warden/corp
uniform["warden uniform, dark blue"] = /obj/item/clothing/under/rank/warden/dark_blue
uniform["warden uniform, blue"] = /obj/item/clothing/under/rank/warden/blue
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/hos
@@ -333,4 +333,4 @@
/datum/gear/uniform/gadpathur
display_name = "gadpathurian fatigues"
path = /obj/item/clothing/under/uniform/gadpathur
flags = GEAR_HAS_DESC_SELECTION
flags = GEAR_HAS_DESC_SELECTION