Accessory fixes

This commit is contained in:
Markolie
2015-02-08 14:55:32 +01:00
parent 2734a1bcf6
commit fba99e154d
5 changed files with 10 additions and 8 deletions
+6 -6
View File
@@ -507,7 +507,7 @@
/mob/living/carbon/human/update_action_buttons()
var/num = 1
var/to_update = list()
var/list/to_update = list()
if(!hud_used) return
if(!client) return
@@ -521,11 +521,11 @@
if(istype(I,/obj/item/clothing/under))
var/obj/item/clothing/under/U = I
if(U.accessories)
for(var/obj/item/clothing/accessory/A in U.accessories)
if(A.icon_action_button)
to_update |= A
if(I.icon_action_button)
to_update |= I
for(var/obj/item/clothing/accessory/AC in U.accessories)
if(AC.icon_action_button)
to_update += AC
if(I.icon_action_button && (!I in to_update))
to_update += I
for(var/obj/item/I in to_update)
var/obj/screen/item_action/A = new(hud_used)
@@ -248,6 +248,7 @@
new /obj/item/clothing/under/rank/centcom_officer(src)
new /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield(src)
new /obj/item/clothing/shoes/centcom(src)
new /obj/item/clothing/accessory/holster(src)
new /obj/item/clothing/accessory/blue(src)
return
@@ -65,7 +65,7 @@
icon_state = "horribletie"
_color = "horribletie"
/obj/item/clothing/accessory/waistcoat
/obj/item/clothing/accessory/waistcoat // No overlay
name = "waistcoat"
desc = "For some classy, murderous fun."
icon_state = "waistcoat"
@@ -241,7 +241,7 @@
//SCARVES//
///////////
/obj/item/clothing/accessory/scarf
/obj/item/clothing/accessory/scarf // No overlay
name = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
@@ -6,6 +6,7 @@
slot = "utility"
var/holster_allow = /obj/item/weapon/gun
var/obj/item/weapon/gun/holstered = null
icon_action_button = "action_holster"
//subtypes can override this to specify what can be holstered
/obj/item/clothing/accessory/holster/proc/can_holster(obj/item/weapon/gun/W)