cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-18 02:25:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

More accessory runtimes and bugfixes

Browse Source
This commit is contained in:
Anewbe
2018-02-24 18:38:11 -06:00
parent 7b87cd61a6
commit bbd870e502
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing_accessories.dm
+8 -5
View File
@@ -13,7 +13,7 @@
/obj/item/clothing/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/clothing/accessory))
var/obj/item/clothing/accessory/A = I
if(attempt_attach_accessory(user, A))
if(attempt_attach_accessory(A, user))
return
if(accessories.len)
@@ -66,18 +66,21 @@
* user is the user doing the attaching. Can be null, such as when attaching
* items on spawn
*/
/obj/item/clothing/proc/attempt_attach_accessory(mob/user, obj/item/clothing/accessory/A)
/obj/item/clothing/proc/attempt_attach_accessory(obj/item/clothing/accessory/A, mob/user)
if(!valid_accessory_slots || !valid_accessory_slots.len)
to_chat(user, "<span class='warning'>You cannot attach accessories of any kind to \the [src].</span>")
if(user)
to_chat(user, "<span class='warning'>You cannot attach accessories of any kind to \the [src].</span>")
return FALSE
var/obj/item/clothing/accessory/acc = A
if(can_attach_accessory(acc))
user.drop_item()
if(user)
user.drop_item()
attach_accessory(user, acc)
return TRUE
else
to_chat(user, "<span class='warning'>You cannot attach more accessories of this type to [src].</span>")
if(user)
to_chat(user, "<span class='warning'>You cannot attach more accessories of this type to [src].</span>")
return FALSE
code/modules/mob/living/carbon/human/inventory.dm
+1 -1
View File
@@ -319,7 +319,7 @@ This saves us from having to call add_fingerprint() any time something is put in
for(var/obj/item/clothing/C in worn_clothing)
if(istype(W, /obj/item/clothing/accessory))
var/obj/item/clothing/accessory/A = W
if(C.attempt_attach_accessory(usr, A))
if(C.attempt_attach_accessory(A))
return
else
src << "<font color='red'>You are trying to equip this item to an unsupported inventory slot. How the heck did you manage that? Stop it...</font>"