Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/blank_vr.dm
This commit is contained in:
Verkister
2017-11-15 17:52:15 +02:00
10 changed files with 37 additions and 3 deletions
@@ -91,4 +91,15 @@
icon_override = 'icons/mob/back_vr.dmi'
item_state = "robustsaddle"
icon_state = "robustsaddle"
icon_base = "robustsaddle"
icon_base = "robustsaddle"
/obj/item/weapon/storage/backpack/saddlebag_common/vest //Shared bag for other taurs with sturdy backs
name = "Taur Duty Vest"
desc = "An armored vest with the armor modules replaced with various handy compartments with decent storage capacity. Useless for protection though."
icon = 'icons/obj/storage_vr.dmi'
icon_override = 'icons/mob/back_vr.dmi'
item_state = "taurvest"
icon_state = "taurvest"
icon_base = "taurvest"
max_storage_space = INVENTORY_STANDARD_SPACE
slowdown = 0