cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 13:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Should be able to attach accessories by clicking the target item again

Browse Source
This commit is contained in:
Anewbe
2018-02-24 20:02:38 -05:00
committed by Arokha Sieyes
parent 325d05317a
commit ff2496a2e6
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing_accessories.dm
+13 -13
View File
@@ -1,21 +1,20 @@
/obj/item/clothing/proc/can_attach_accessory(obj/item/clothing/accessory/A)
if(valid_accessory_slots && istype(A) && (A.slot in valid_accessory_slots))
if(accessories.len && restricted_accessory_slots && (A.slot in restricted_accessory_slots))
var/obj/item/clothing/accessory/attach = A
if(src.valid_accessory_slots && (attach.slot in src.valid_accessory_slots))
if(accessories.len && restricted_accessory_slots && (attach.slot in restricted_accessory_slots))
for(var/obj/item/clothing/accessory/AC in accessories)
if (AC.slot == A.slot)
return 0
return 1
return 0
if(accessories.len && restricted_accessory_slots && (A.slot in restricted_accessory_slots))
for(var/obj/item/clothing/accessory/AC in accessories)
if (AC.slot == A.slot)
return 0
return 1
if (AC.slot == attach.slot)
return FALSE
return TRUE
return TRUE
else
return FALSE
/obj/item/clothing/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/clothing/accessory))
attempt_attach_accessory(I, user)
var/obj/item/clothing/accessory/A = I
if(attempt_attach_accessory(user, A))
return
if(accessories.len)
for(var/obj/item/clothing/accessory/A in accessories)
@@ -81,6 +80,7 @@
to_chat(user, "<span class='warning'>You cannot attach more accessories of this type to [src].</span>")
return FALSE
/obj/item/clothing/proc/attach_accessory(mob/user, obj/item/clothing/accessory/A)
accessories += A
A.on_attached(src, user)