cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 10:32:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

More custom loadout fixes and additions (#2633)

Browse Source 
Fixes #2622
-adds more clothing for people to play dress up with their spessmen.
-fixes some long description on the ian's shirt
-allows people to toggle night vision glasses and material scanners while wearing them
-tweaks more marking related things
This commit is contained in:
Alberyk
2017-06-10 03:27:49 -03:00
committed by skull132
parent 465ae330ac
commit 3758da0475
10 changed files with 130 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/modules/client/preference_setup/loadout/loadout_accessories.dm
View File

@@ -56,7 +56,7 @@
/datum/gear/accessory/brown_vest
display_name = "webbing, engineering"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/accessory/black_vest
display_name = "webbing, security"
@@ -66,7 +66,7 @@
/datum/gear/accessory/white_vest
display_name = "webbing, medical"
path = /obj/item/clothing/accessory/storage/white_vest
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
/datum/gear/accessory/webbing
display_name = "webbing, simple"
@@ -76,17 +76,17 @@
/datum/gear/accessory/brown_pouches
display_name = "drop pouches, engineering"
path = /obj/item/clothing/accessory/storage/brown_pouches
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer", "Engineering Apprentice")
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/accessory/black_pouches
display_name = "drop pouches, security"
path = /obj/item/clothing/accessory/storage/black_pouches
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective", "Forensic Technician")
allowed_roles = list("Security Officer","Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/accessory/white_pouches
display_name = "drop pouches, medical"
path = /obj/item/clothing/accessory/storage/white_pouches
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist","Geneticist", "Paramedic", "Nursing Intern")
/datum/gear/accessory/pouches
display_name = "drop pouches, simple"

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

@@ -27,13 +27,13 @@
caps["flat cap"] = /obj/item/clothing/head/flatcap
caps["green cap"] = /obj/item/clothing/head/soft/green
caps["grey cap"] = /obj/item/clothing/head/soft/grey
caps["mailman cap"] = /obj/item/clothing/head/mailman
caps["orange cap"] = /obj/item/clothing/head/soft/orange
caps["purple cap"] = /obj/item/clothing/head/soft/purple
caps["rainbow cap"] = /obj/item/clothing/head/soft/rainbow
caps["red cap"] = /obj/item/clothing/head/soft/red
caps["white cap"] = /obj/item/clothing/head/soft/mime
caps["yellow cap"] = /obj/item/clothing/head/soft/yellow
caps["mailman cap"] = /obj/item/clothing/head/mailman
gear_tweaks += new/datum/gear_tweak/path(caps)
/datum/gear/head/beret
@@ -50,17 +50,17 @@
path = /obj/item/clothing/head/beret/purple
/datum/gear/head/beret/sec
display_name = "beret,security"
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/beret/warden
display_name = "beret,security (warden)"
display_name = "beret, security (warden)"
path = /obj/item/clothing/head/beret/sec/warden
allowed_roles = list("Head of Security", "Warden")
/datum/gear/head/beret/hos
display_name = "beret,security (head of security)"
display_name = "beret, security (head of security)"
path = /obj/item/clothing/head/beret/sec/hos
allowed_roles = list("Head of Security")
@@ -77,7 +77,7 @@
/datum/gear/head/hardhat
display_name = "hardhat selection"
path = /obj/item/clothing/head/hardhat
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice")
/datum/gear/head/hardhat/New()
..()
@@ -112,7 +112,7 @@
gear_tweaks += new/datum/gear_tweak/path(hats)
/datum/gear/head/philosopher_wig
display_name = "natural philosopher's wig"
display_name = "natural philosopher wig"
path = /obj/item/clothing/head/philosopher_wig
/datum/gear/head/hijab

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

@@ -18,14 +18,27 @@
jackets["corporate brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen
jackets["black jacket"] = /obj/item/clothing/suit/storage/leather_jacket
jackets["brown jacket"] = /obj/item/clothing/suit/storage/toggle/brown_jacket
jackets["green flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel
jackets["red flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel/red
jackets["blue flannel jacket"] = /obj/item/clothing/suit/storage/toggle/flannel/blue
jackets["track jacket"] = /obj/item/clothing/suit/storage/toggle/tracksuit
jackets["flannel jacket, green"] = /obj/item/clothing/suit/storage/toggle/flannel
jackets["flannel jacket, red"] = /obj/item/clothing/suit/storage/toggle/flannel/red
jackets["flannel jacket, blue"] = /obj/item/clothing/suit/storage/toggle/flannel/blue
jackets["flannel jacket, grey"] = /obj/item/clothing/suit/storage/toggle/flannel/gray
jackets["flannel jacket, purple"] = /obj/item/clothing/suit/storage/toggle/flannel/purple
jackets["flannel jacket, yellow"] = /obj/item/clothing/suit/storage/toggle/flannel/yellow
gear_tweaks += new/datum/gear_tweak/path(jackets)
/datum/gear/suit/hazard_vest
display_name = "hazard vest"
display_name = "hazard vest selection"
path = /obj/item/clothing/suit/storage/hazardvest
/datum/gear/suit/hazard_vest/New()
..()
var/hazard = list()
hazard["hazard vest, orange"] = /obj/item/clothing/suit/storage/hazardvest
hazard["hazard vest, blue"] = /obj/item/clothing/suit/storage/hazardvest/blue
hazard["hazard vest, white"] = /obj/item/clothing/suit/storage/hazardvest/white
hazard["hazard vest, green"] = /obj/item/clothing/suit/storage/hazardvest/green
gear_tweaks += new/datum/gear_tweak/path(hazard)
/datum/gear/suit/hoodie
display_name = "hoodie, grey"
@@ -54,6 +67,12 @@
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
cost = 1
/datum/gear/suit/surgeryapron
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
cost = 1
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/suit/poncho
display_name = "poncho selection"
@@ -77,13 +96,18 @@
/datum/gear/suit/purple_lawyer_jacket
display_name = "suit jacket, purple"
path = /obj/item/clothing/suit/storage/lawyer/purpjacket
/datum/gear/suit/track_jacket
display_name = "track jacket"
path = /obj/item/clothing/suit/storage/toggle/tracksuit
/datum/gear/suit/trenchcoat
display_name = "trenchcoat, brown"
path = /obj/item/clothing/suit/storage/trench
/datum/gear/suit/trenchcoatgrey
display_name = "trenchcoat, grey"
path = /obj/item/clothing/suit/storage/trench/grey
/datum/gear/suit/ian
display_name = "worn shirt"
description = "A worn out, curiously comfortable t-shirt with a picture of Ian."
path = /obj/item/clothing/suit/ianshirt
/datum/gear/suit/winter

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

@@ -130,8 +130,8 @@
sort_category = "Xenowear"
/datum/gear/suit/tajaran_labcoat
display_name = "people's republic medical coat (Tajara)"
display_name = "PRA medical coat (Tajara)"
path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
whitelisted = "Tajara"
allowed_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern")
sort_category = "Xenowear"