cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 11:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
skull132
2016-07-10 14:25:54 -04:00
parent bcf840e02f 8dfb08dab1
commit 443a49a49b
42 changed files with 335 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/client/preferences_factions.dm
View File

@@ -45,7 +45,7 @@ var/global/list/faction_choices = list(
"Grayson Manufactories Ltd.",
"Aether Atmospherics",
"Zeng-Hu Pharmaceuticals",
"Hesphaistos Industries"
"Hephaestus Industries"
)
var/global/list/religion_choices = list(

28
code/modules/client/preferences_gear.dm
View File

@@ -556,6 +556,32 @@ var/global/list/gear_datums = list()
slot = slot_w_uniform
allowed_roles = list("Security Officer","Head of Security","Warden")
//medical scrubs
/datum/gear/bluescrub
display_name = "medical scrubs, blue"
path = /obj/item/clothing/under/rank/medical/blue
slot = slot_w_uniform
cost = 1
/datum/gear/greenscrub
display_name = "medical scrubs, green"
path = /obj/item/clothing/under/rank/medical/green
slot = slot_w_uniform
cost = 1
/datum/gear/purplescrub
display_name = "medical scrubs, purple"
path = /obj/item/clothing/under/rank/medical/purple
slot = slot_w_uniform
cost = 1
/datum/gear/blackscrub
display_name = "medical scrubs, black"
path = /obj/item/clothing/under/rank/medical/black
slot = slot_w_uniform
cost = 1
// Attachments
/datum/gear/armband_cargo
@@ -600,7 +626,7 @@ var/global/list/gear_datums = list()
slot = slot_tie
cost = 1
/datum/gear/armband_science
/datum/gear/armband_movement
display_name = "armband, synthetic intelligence movement"
path = /obj/item/clothing/accessory/armband/movement
slot = slot_tie