cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 05:06:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from Aurorastation/development

Browse Source 
Development
This commit is contained in:
skull132
2014-08-25 21:33:19 +03:00
parent c056a8e703 c673f3ceb4
commit 00b398cd31
19 changed files with 459 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_gear.dm
+61 -55
View File
@@ -60,79 +60,79 @@ proc/populate_gear_list()
display_name = "hair flower pin"
path = /obj/item/clothing/head/hairflower
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/bandana
display_name = "pirate bandana"
path = /obj/item/clothing/head/bandana
cost = 3
slot = slot_head
// slot = slot_head
/datum/gear/overalls
display_name = "overalls"
path = /obj/item/clothing/suit/apron/overalls
cost = 2
slot = slot_wear_suit
// slot = slot_wear_suit
/datum/gear/wcoat
display_name = "waistcoat"
path = /obj/item/clothing/suit/wcoat
cost = 2
slot = slot_wear_suit
// slot = slot_wear_suit
/datum/gear/prescription
display_name = "prescription sunglasses"
path = /obj/item/clothing/glasses/sunglasses/prescription
cost = 3
slot = slot_glasses
// slot = slot_glasses
/datum/gear/eyepatch
display_name = "eyepatch"
path = /obj/item/clothing/glasses/eyepatch
cost = 3
slot = slot_glasses
// slot = slot_glasses
/datum/gear/flatcap
display_name = "flat cap"
path = /obj/item/clothing/head/flatcap
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/redsoftcap
display_name = "red softcap"
path = /obj/item/clothing/head/soft/red
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/bluesoftcap
display_name = "blue softcap"
path = /obj/item/clothing/head/soft/blue
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/greensoftcap
display_name = "green softcap"
path = /obj/item/clothing/head/soft/green
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/greysoftcap
display_name = "grey softcap"
path = /obj/item/clothing/head/soft/grey
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/purplesoftcap
display_name = "purple softcap"
path = /obj/item/clothing/head/soft/purple
cost = 2
slot = slot_head
// slot = slot_head
/datum/gear/labcoat
display_name = "labcoat"
path = /obj/item/clothing/suit/storage/labcoat
cost = 3
slot = slot_wear_suit
// slot = slot_wear_suit
/datum/gear/bluescrubs
display_name = "blue scrubs"
@@ -149,11 +149,17 @@ proc/populate_gear_list()
path = /obj/item/clothing/under/rank/medical/green
cost = 1
/datum/gear/surgeryapron
display_name = "surgical apron"
path = /obj/item/clothing/suit/apron/surgery
cost = 1
/datum/gear/sandal
display_name = "sandals"
path = /obj/item/clothing/shoes/sandal
cost = 1
slot = slot_shoes
// slot = slot_shoes
/datum/gear/work_boots
display_name = "work boots"
@@ -164,121 +170,121 @@ proc/populate_gear_list()
display_name = "leather shoes"
path = /obj/item/clothing/shoes/leather
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/dress_shoes
display_name = "dress shoes"
path = /obj/item/clothing/shoes/centcom
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/black_gloves
display_name = "black gloves"
path = /obj/item/clothing/gloves/black
cost = 1
slot = slot_gloves
// slot = slot_gloves
/datum/gear/red_gloves
display_name = "red gloves"
path = /obj/item/clothing/gloves/red
cost = 1
slot = slot_gloves
// slot = slot_gloves
/datum/gear/blue_gloves
display_name = "blue gloves"
path = /obj/item/clothing/gloves/blue
cost = 1
slot = slot_gloves
// slot = slot_gloves
/datum/gear/orange_gloves
display_name = "orange gloves"
path = /obj/item/clothing/gloves/orange
cost = 1
slot = slot_gloves
// slot = slot_gloves
/datum/gear/purple_gloves
display_name = "purple gloves"
path = /obj/item/clothing/gloves/purple
cost = 1
slot = slot_gloves
// slot = slot_gloves
/datum/gear/brown_gloves
display_name = "brown gloves"
path = /obj/item/clothing/gloves/brown
cost = 1
slot = slot_gloves
// slot = slot_gloves
/datum/gear/green_gloves
display_name = "green gloves"
path = /obj/item/clothing/gloves/green
cost = 2
slot = slot_gloves
// slot = slot_gloves
/datum/gear/white_gloves
display_name = "white gloves"
path = /obj/item/clothing/gloves/white
cost = 2
slot = slot_gloves
// slot = slot_gloves
/datum/gear/black_shoes
display_name = "black shoes"
path = /obj/item/clothing/shoes/black
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/blue_shoes
display_name = "blue shoes"
path = /obj/item/clothing/shoes/blue
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/brown_shoes
display_name = "brown shoes"
path = /obj/item/clothing/shoes/brown
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/green_shoes
display_name = "green shoes"
path = /obj/item/clothing/shoes/green
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/orange_shoes
display_name = "orange shoes"
path = /obj/item/clothing/shoes/orange
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/purple_shoes
display_name = "purple shoes"
path = /obj/item/clothing/shoes/purple
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/red_shoes
display_name = "red shoes"
path = /obj/item/clothing/shoes/red
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/white_shoes
display_name = "white shoes"
path = /obj/item/clothing/shoes/white
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/yellow_shoes
display_name = "yellow shoes"
path = /obj/item/clothing/shoes/yellow
cost = 2
slot = slot_shoes
// slot = slot_shoes
/datum/gear/jackboots
display_name = "jackboots"
path = /obj/item/clothing/shoes/jackboots
cost = 3
slot = slot_shoes
// slot = slot_shoes
/datum/gear/webbing
display_name = "webbing"
@@ -323,76 +329,76 @@ proc/populate_gear_list()
/datum/gear/skirt_blue
display_name = "blue plaid skirt"
path = /obj/item/clothing/under/dress/plaid_blue
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/skirt_red
display_name = "red plaid skirt"
path = /obj/item/clothing/under/dress/plaid_red
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/skirt_purple
display_name = "purple plaid skirt"
path = /obj/item/clothing/under/dress/plaid_purple
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/skirt_green
display_name = "green plaid skirt"
path = /obj/item/clothing/under/dress/plaid_green
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/skirt_black
display_name = "black skirt"
path = /obj/item/clothing/under/blackskirt
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/sundress
display_name = "sundress"
path = /obj/item/clothing/under/sundress
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/uniform_captain
display_name = "captain's dress uniform"
path = /obj/item/clothing/under/dress/dress_cap
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
allowed_roles = list("Captain")
/datum/gear/uniform_hop
display_name = "HoP dress uniform"
path = /obj/item/clothing/under/dress/dress_hop
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
allowed_roles = list("Head of Personnel")
/datum/gear/uniform_hr
display_name = "HR director uniform"
path = /obj/item/clothing/under/dress/dress_hr
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
allowed_roles = list("Head of Personnel")
/datum/gear/kilt
display_name = "kilt"
path = /obj/item/clothing/under/kilt
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/exec_suit
display_name = "executive suit"
path = /obj/item/clothing/under/suit_jacket/really_black
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/exec_suit
display_name = "executive suit"
path = /obj/item/clothing/under/suit_jacket/really_black
slot = slot_w_uniform
// slot = slot_w_uniform
cost = 3
/datum/gear/oldmansuit
@@ -406,7 +412,7 @@ proc/populate_gear_list()
display_name = "Security HUD"
path = /obj/item/clothing/glasses/hud/security
cost = 3
slot = slot_glasses
// slot = slot_glasses
allowed_roles = list("Security Officer","Head of Security","Warden")
/datum/gear/black_vest
@@ -417,7 +423,7 @@ proc/populate_gear_list()
/datum/gear/armpit
display_name = "shoulder holster"
path = /obj/item/clothing/tie/holster/armpit
// path = /obj/item/clothing/tie/holster/armpit
cost = 3
allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Head of Security")
@@ -425,7 +431,7 @@ proc/populate_gear_list()
display_name = "security beret"
path = /obj/item/clothing/head/beret/sec
cost = 1
slot = slot_head
// slot = slot_head
allowed_roles = list("Security Officer","Head of Security","Warden")
//Engineering
@@ -433,7 +439,7 @@ proc/populate_gear_list()
display_name = "engineering beret"
path = /obj/item/clothing/head/beret/eng
cost = 1
slot = slot_head
// slot = slot_head
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")
/datum/gear/brown_vest
@@ -446,7 +452,7 @@ proc/populate_gear_list()
display_name = "engineering bandana"
path = /obj/item/clothing/head/helmet/greenbandana/fluff/taryn_kifer_1
cost = 2
slot = slot_head
// slot = slot_head
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")
//Science
@@ -464,14 +470,14 @@ proc/populate_gear_list()
display_name = "Zhan-Khazan furs"
path = /obj/item/clothing/suit/tajaran/furs
cost = 3
slot = slot_wear_suit
// slot = slot_wear_suit
whitelisted = "Tajaran"
/datum/gear/zhan_scarf
display_name = "Zhan-Khazan headscarf"
path = /obj/item/clothing/head/tajaran/scarf
cost = 2
slot = slot_head
// slot = slot_head
whitelisted = "Tajaran"
*/
@@ -479,12 +485,12 @@ proc/populate_gear_list()
display_name = "roughspun robe"
path = /obj/item/clothing/suit/unathi/robe
cost = 3
slot = slot_wear_suit
// slot = slot_wear_suit
whitelisted = "Unathi"
/datum/gear/unathi_mantle
display_name = "hide mantle"
path = /obj/item/clothing/suit/unathi/mantle
cost = 2
slot = slot_wear_suit
// slot = slot_wear_suit
whitelisted = "Unathi"