cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-04 14:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Security and Central command uniforms sprite overhaul (#6560)

Browse Source
This commit is contained in:
fernerr
2019-06-18 00:28:53 +02:00
committed by Werner
parent 76f55d8aed
commit 77c262e9a2
49 changed files with 419 additions and 255 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

@@ -23,6 +23,7 @@
gloves["green gloves"] = /obj/item/clothing/gloves/green
gloves["grey gloves"] = /obj/item/clothing/gloves/grey
gloves["rainbow gloves"] = /obj/item/clothing/gloves/rainbow
gloves["black leather gloves"] = /obj/item/clothing/gloves/black_leather
gear_tweaks += new/datum/gear_tweak/path(gloves)
/datum/gear/gloves/evening

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

@@ -128,6 +128,7 @@
hats["hat, feather trilby"] = /obj/item/clothing/head/feathertrilby
hats["hat, black fedora"] = /obj/item/clothing/head/fedora
hats["hat, brown fedora"] = /obj/item/clothing/head/fedora/brown
hats["hat, dark brown fedora"] = /obj/item/clothing/head/fedora/brown/dark
hats["hat, grey fedora"] = /obj/item/clothing/head/fedora/grey
hats["hat, beaver"] = /obj/item/clothing/head/beaverhat
hats["hat, cowboy"] = /obj/item/clothing/head/cowboy

6
code/modules/client/preference_setup/loadout/loadout_shoes.dm
View File

@@ -103,4 +103,8 @@
shoes["high-tops, green"] = /obj/item/clothing/shoes/hitops/green
shoes["high-tops, purple"] = /obj/item/clothing/shoes/hitops/purple
shoes["high-tops, yellow"] = /obj/item/clothing/shoes/hitops/yellow
gear_tweaks += new/datum/gear_tweak/path(shoes)
gear_tweaks += new/datum/gear_tweak/path(shoes)
/datum/gear/shoes/black_boots
display_name = "black boots"
path = /obj/item/clothing/shoes/black_boots

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

@@ -77,6 +77,7 @@
/datum/gear/suit/iacvest
display_name = "IAC vest"
description = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps."
path = /obj/item/clothing/suit/iacvest
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
@@ -108,31 +109,37 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/suit/trenchcoat
display_name = "trenchcoat, brown"
/datum/gear/suit/trenchcoats
display_name = "trenchcoat selection"
description = "A selection of trenchcoats."
path = /obj/item/clothing/suit/storage/toggle/trench
/datum/gear/suit/trenchcoatgrey
display_name = "trenchcoat, grey"
path = /obj/item/clothing/suit/storage/toggle/trench/grey
/datum/gear/suit/trenchcoats/New()
..()
var/coat = list()
coat["trenchcoat, brown"] = /obj/item/clothing/suit/storage/toggle/trench
coat["trenchcoat, grey"] = /obj/item/clothing/suit/storage/toggle/trench/grey
coat["trenchcoat, dark brown"] = /obj/item/clothing/suit/storage/toggle/trench/alt
coat["trenchcoat, grey alternate"] = /obj/item/clothing/suit/storage/toggle/trench/grey_alt
gear_tweaks += new/datum/gear_tweak/path(coat)
/datum/gear/suit/det_trenchcoat_brown
display_name = "brown trenchcoat (Detective)"
description = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!"
/datum/gear/suit/det_trenchcoat
display_name = "detective trenchcoat selection"
description = "A selection of detective trenchcoats."
path = /obj/item/clothing/suit/storage/toggle/det_trench
allowed_roles = list("Detective", "Head of Security")
allowed_roles = list("Detective")
/datum/gear/suit/det_trenchcoat_black
display_name = "black trenchcoat (Detective)"
description = "A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. The coat is externally impact resistant - perfect for your next act of autodefenestration!"
path = /obj/item/clothing/suit/storage/toggle/det_trench/black
allowed_roles = list("Detective", "Head of Security")
/datum/gear/suit/det_trenchcoat/New()
..()
var/coat = list()
coat["brown trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench
coat["black trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench/black
coat["technicolor trenchcoat (Detective)"] = /obj/item/clothing/suit/storage/toggle/det_trench/technicolor
gear_tweaks += new/datum/gear_tweak/path(coat)
/datum/gear/suit/det_trenchcoat_techni
display_name = "technicolor trenchcoat (Detective)"
description = "A 23rd-century multi-purpose trenchcoat. It's fibres are hyper-absorbent. Can be painted into any color."
path = /obj/item/clothing/suit/storage/toggle/det_trench/technicolor
allowed_roles = list("Detective", "Head of Security")
/datum/gear/suit/ian
display_name = "worn shirt"
@@ -235,25 +242,21 @@
display_name = "Tau Ceti Foreign Legion jacket"
path = /obj/item/clothing/suit/storage/legion
/datum/gear/suit/miscellaneous/engi_dep_jacket
display_name = "department jacket, engineering"
/datum/gear/suit/dep_jacket
display_name = "department jackets selection"
description = "A selection of department jackets."
path = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
/datum/gear/suit/miscellaneous/supply_dep_jacket
display_name = "department jacket, supply"
path = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
/datum/gear/suit/dep_jacket/New()
..()
var/jacket = list()
jacket["department jacket, engineering"] = /obj/item/clothing/suit/storage/toggle/engi_dep_jacket
jacket["department jacket, supply"] = /obj/item/clothing/suit/storage/toggle/supply_dep_jacket
jacket["department jacket, science"] = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
jacket["department jacket, medical"] = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
jacket["department jacket, security"] = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
gear_tweaks += new/datum/gear_tweak/path(jacket)
/datum/gear/suit/miscellaneous/sci_dep_jacket
display_name = "department jacket, science"
path = /obj/item/clothing/suit/storage/toggle/sci_dep_jacket
/datum/gear/suit/miscellaneous/med_dep_jacket
display_name = "department jacket, medical"
path = /obj/item/clothing/suit/storage/toggle/med_dep_jacket
/datum/gear/suit/miscellaneous/sec_dep_jacket
display_name = "department jacket, security"
path = /obj/item/clothing/suit/storage/toggle/sec_dep_jacket
/datum/gear/suit/miscellaneous/peacoat
display_name = "peacoat"

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

@@ -143,11 +143,6 @@
..()
gear_tweaks = list(gear_tweak_free_color_choice)
/datum/gear/uniform/corpsecsuit
display_name = "uniform, corporate (Security)"
path = /obj/item/clothing/under/rank/security/corp
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet")
/datum/gear/uniform/uniform_hop
display_name = "uniform, HoP dress"
path = /obj/item/clothing/under/dress/dress_hop
@@ -158,21 +153,6 @@
path = /obj/item/clothing/under/dress/dress_hr
allowed_roles = list("Head of Personnel")
/datum/gear/uniform/navysecsuit
display_name = "uniform, navyblue (Security Officer)"
path = /obj/item/clothing/under/rank/security/navyblue
allowed_roles = list("Security Officer", "Head of Security", "Warden")
/datum/gear/uniform/navysecsuit_warden
display_name = "uniform, navyblue (Warden)"
path = /obj/item/clothing/under/rank/warden/navyblue
allowed_roles = list("Head of Security", "Warden")
/datum/gear/uniform/navysecsuit_hos
display_name = "uniform, navyblue (Head of Security)"
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."
@@ -276,4 +256,39 @@
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/zeng
gear_tweaks += new/datum/gear_tweak/path(uniform)
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/officer
display_name = "uniforms, (Security Officer)"
description = "A selection of officer uniforms."
path = /obj/item/clothing/under/rank/security
allowed_roles = list("Security Officer")
/datum/gear/uniform/officer/New()
..()
var/uniform = list()
uniform["officer uniform, standard"] = /obj/item/clothing/under/rank/security
uniform["officer uniform, corporate"] = /obj/item/clothing/under/rank/security/corp
uniform["officer uniform, blue"] = /obj/item/clothing/under/rank/security/blue
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/warden
display_name = "uniforms, (Warden)"
description = "A selection of Warden uniforms."
path = /obj/item/clothing/under/rank/warden
allowed_roles = list("Warden")
/datum/gear/uniform/warden/New()
..()
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
gear_tweaks += new/datum/gear_tweak/path(uniform)
/datum/gear/uniform/hos
display_name = "uniform, corporate (Head of Security)"
path = /obj/item/clothing/under/rank/head_of_security/corp
allowed_roles = list("Head of Security")