[MIRROR] Begin clickcode attack_self fix (#12173)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-12-29 15:51:44 -05:00
committed by GitHub
co-authored by Cameron Lennox
parent 063cf6cf48
commit 3cac28f9ad
361 changed files with 2676 additions and 998 deletions
+6 -2
View File
@@ -21,6 +21,7 @@
var/apply_colour //temp pending icon rewrite
drop_sound = 'sound/items/drop/axe.ogg'
pickup_sound = 'sound/items/pickup/axe.ogg'
custom_handling = TRUE
/obj/item/stack/material/Initialize(mapload)
. = ..()
@@ -90,9 +91,12 @@
M.update_strings()
return transfer
/obj/item/stack/material/attack_self(var/mob/user)
/obj/item/stack/material/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(!material.build_windows(user, src))
..()
tgui_interact(user)
/obj/item/stack/material/attackby(var/obj/item/W, var/mob/user)
if(istype(W,/obj/item/stack/cable_coil))
@@ -158,9 +158,13 @@
desc = "A collar made out of pliable material."
icon_state = "collar_handmade"
var/given_name
special_handling = TRUE
/obj/item/clothing/glasses/sunglasses/blindfold/whiteblindfold/craftable
name = "handmade blindfold"
desc = "A handmade blindfold that covers the eyes, preventing sight."
/obj/item/clothing/accessory/collar/craftable/attack_self(mob/living/user)
/obj/item/clothing/accessory/collar/craftable/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
given_name = sanitizeSafe(tgui_input_text(user, "What would you like to label the collar?", "Collar Labelling", null, MAX_NAME_LEN, encode = FALSE), MAX_NAME_LEN)