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

Merge branch 'upstream/development' into development

Browse Source 
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
This commit is contained in:
skull132
2016-12-18 01:06:45 +02:00
parent 30fbc7a67b 355504dabb
commit 9b094ad0eb
37 changed files with 543 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_gear.dm
+10 -4
View File
@@ -1108,6 +1108,12 @@ var/global/list/gear_datums = list()
path = /obj/item/clothing/gloves/white/tajara
cost = 2
slot = slot_gloves
/datum/gear/watch
display_name = "watch"
path = /obj/item/clothing/gloves/watch
cost = 2
slot = slot_gloves
// Shoelocker
@@ -1116,21 +1122,21 @@ var/global/list/gear_datums = list()
path = /obj/item/clothing/shoes/jackboots
cost = 1
slot = slot_shoes
allowed_roles = list("Security Cadet","Security Officer","Head of Security","Warden","Detective","Internal Affairs Agent","Quartermaster","Head of Personnel","Captain")
// allowed_roles = list("Security Cadet","Security Officer","Head of Security","Warden","Detective","Internal Affairs Agent","Quartermaster","Head of Personnel","Captain")
/datum/gear/toeless_jackboots
display_name = "toe-less jackboots"
path = /obj/item/clothing/shoes/jackboots/unathi
cost = 1
slot = slot_shoes
allowed_roles = list("Security Cadet","Security Officer","Head of Security","Warden","Detective","Internal Affairs Agent","Quartermaster","Head of Personnel","Captain")
// allowed_roles = list("Security Cadet","Security Officer","Head of Security","Warden","Detective","Internal Affairs Agent","Quartermaster","Head of Personnel","Captain")
/datum/gear/workboots
display_name = "workboots"
path = /obj/item/clothing/shoes/workboots
cost = 1
slot = slot_shoes
allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
// allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Engineering Apprentice")
/datum/gear/sandal
display_name = "sandals"
@@ -1558,4 +1564,4 @@ var/global/list/gear_datums = list()
display_name = "neck bandanna, black"
path = /obj/item/clothing/ears/bandanna/black
cost = 1
sort_category = "ears"
sort_category = "ears"