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

Loadout, clothing fixes and additions (#2467)

Browse Source 
-adds turbans at some people's request
-adds the forensic technician's allowed roles to sec related custom loadout
-fixes shoes having two species_restricted vars
-add species restrictions to galoshes and the like
-changed how the force var works on the shoes, regular shoes have 0, boots have 3 and combat boots/magboots have 5
-adds nitrile gloves after a forum request
This commit is contained in:
Alberyk
2017-05-27 06:41:10 -03:00
committed by skull132
parent 101b251c93
commit c598c84fae
18 changed files with 118 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_accessories.dm
+3 -3
View File
@@ -30,7 +30,7 @@
/datum/gear/accessory/holster
display_name = "holster selection"
path = /obj/item/clothing/accessory/holster/armpit
allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Security Cadet")
allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective", "Forensic Technician", "Security Cadet")
/datum/gear/accessory/holster/New()
..()
@@ -61,7 +61,7 @@
/datum/gear/accessory/black_vest
display_name = "webbing, security"
path = /obj/item/clothing/accessory/storage/black_vest
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective")
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/accessory/white_vest
display_name = "webbing, medical"
@@ -81,7 +81,7 @@
/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")
allowed_roles = list("Security Officer","Head of Security","Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/accessory/white_pouches
display_name = "drop pouches, medical"
code/modules/client/preference_setup/loadout/loadout_eyes.dm
+3 -3
View File
@@ -37,17 +37,17 @@
/datum/gear/eyes/security
display_name = "security HUD"
path = /obj/item/clothing/glasses/hud/security
allowed_roles = list("Security Officer","Head of Security","Warden")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/eyes/medical
display_name = "medical HUD"
path = /obj/item/clothing/glasses/hud/health
allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist")
allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Chemist", "Paramedic", "Geneticist", "Nursing Intern")
/datum/gear/eyes/shades
display_name = "sunglasses, fat"
path = /obj/item/clothing/glasses/sunglasses/big
allowed_roles = list("Security Officer","Head of Security","Warden","Captain","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Captain", "Head of Personnel", "Quartermaster", "Internal Affairs Agent", "Detective", "Forensic Technician")
/datum/gear/eyes/shades/prescriptionsun
display_name = "sunglasses, presciption"
code/modules/client/preference_setup/loadout/loadout_head.dm
+25 -5
View File
@@ -52,12 +52,12 @@
/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")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/head/beret/warden
display_name = "beret,security (warden)"
path = /obj/item/clothing/head/beret/sec/warden
allowed_roles = list("Head of Security","Warden")
allowed_roles = list("Head of Security", "Warden")
/datum/gear/head/beret/hos
display_name = "beret,security (head of security)"
@@ -67,12 +67,12 @@
/datum/gear/head/corp
display_name = "cap, corporate (security)"
path = /obj/item/clothing/head/soft/sec/corp
allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
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/soft/sec
allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician",)
/datum/gear/head/hardhat
display_name = "hardhat selection"
@@ -128,13 +128,33 @@
hijab["brown hijab"] = /obj/item/clothing/head/hijab/brown
hijab["green hijab"] = /obj/item/clothing/head/hijab/green
hijab["blue hijab"] = /obj/item/clothing/head/hijab/blue
hijab["white hijab"] = /obj/item/clothing/head/hijab/white
gear_tweaks += new/datum/gear_tweak/path(hijab)
/datum/gear/head/turban
display_name = "turban selection"
path = /obj/item/clothing/head/turban
/datum/gear/head/turban/New()
..()
var/turbans = list()
turbans["black turban"] = /obj/item/clothing/head/turban
turbans["blue turban"] = /obj/item/clothing/head/turban/blue
turbans["green turban"] = /obj/item/clothing/head/turban/green
turbans["grey turban"] = /obj/item/clothing/head/turban/grey
turbans["orange turban"] = /obj/item/clothing/head/turban/orange
turbans["purple turban"] = /obj/item/clothing/head/turban/purple
turbans["red turban"] = /obj/item/clothing/head/turban/red
turbans["white turban"] = /obj/item/clothing/head/turban/white
turbans["yellow turban"] = /obj/item/clothing/head/turban/yellow
gear_tweaks += new/datum/gear_tweak/path(turbans)
/datum/gear/head/surgical
display_name = "surgical cap selection"
path = /obj/item/clothing/head/surgery/blue
allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Geneticist","Chemist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective")
allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Chemist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/head/surgical/New()
..()
code/modules/client/preference_setup/loadout/loadout_suit.dm
+8 -8
View File
@@ -98,39 +98,39 @@
/datum/gear/suit/winter/security
display_name = "winter coat, security"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/security
allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet","Detective")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet", "Detective", "Forensic Technician")
/datum/gear/suit/winter/science
display_name = "winter coat, science"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/science
allowed_roles = list("Research Director","Scientist","Xenobiologist","Roboticist","Lab Assistant","Geneticist")
allowed_roles = list("Research Director", "Scientist", "Xenobiologist", "Roboticist", "Lab Assistant", "Geneticist")
/datum/gear/suit/winter/medical
display_name = "winter coat, medical"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
allowed_roles = list("Chief Medical Officer","Medical Doctor","Paramedic","Nursing Intern","Psychiatrist","Chemist")
allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Nursing Intern", "Psychiatrist", "Chemist")
/datum/gear/suit/winter/engineering
display_name = "winter coat, engineering"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering
allowed_roles = list("Station Engineer","Chief Engineer","Engineering Apprentice")
allowed_roles = list("Station Engineer", "Chief Engineer", "Engineering Apprentice")
/datum/gear/suit/winter/atmos
display_name = "winter coat, atmospherics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/atmos
allowed_roles = list("Atmospheric Technician","Chief Engineer")
allowed_roles = list("Atmospheric Technician", "Chief Engineer")
/datum/gear/suit/winter/hydro
display_name = "winter coat, hydroponics"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/hydro
allowed_roles = list("Head of Personnel","Gardener")
allowed_roles = list("Head of Personnel", "Gardener")
/datum/gear/suit/winter/cargo
display_name = "winter coat, cargo"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/cargo
allowed_roles = list("Cargo Technician","Quartermaster","Head of Personnel")
allowed_roles = list("Cargo Technician", "Quartermaster", "Head of Personnel")
/datum/gear/suit/winter/mining
display_name = "winter coat, mining"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/miner
allowed_roles = list("Quartermaster","Head of Personnel","Shaft Miner")
allowed_roles = list("Quartermaster", "Head of Personnel", "Shaft Miner")
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+3 -3
View File
@@ -82,7 +82,7 @@
/datum/gear/uniform/scrubs
display_name = "scrubs selection"
path = /obj/item/clothing/under/rank/medical/black
allowed_roles = list("Scientist","Chief Medical Officer","Medical Doctor","Chemist","Geneticist","Paramedic","Nursing Intern","Xenobiologist","Roboticist","Research Director","Detective")
allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Nursing Intern", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
/datum/gear/uniform/scrubs/New()
..()
@@ -118,7 +118,7 @@
/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")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet")
/datum/gear/uniform/uniform_hop
display_name = "uniform, HoP dress"
@@ -133,7 +133,7 @@
/datum/gear/uniform/navysecsuit
display_name = "uniform, navyblue (Security)"
path = /obj/item/clothing/under/rank/security/navyblue
allowed_roles = list("Security Officer","Head of Security","Warden","Security Cadet")
allowed_roles = list("Security Officer", "Head of Security", "Warden", "Security Cadet")
/datum/gear/uniform/gearharness
display_name = "gear harness"