Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

This commit is contained in:
Roxy
2025-11-12 16:44:13 -05:00
379 changed files with 37535 additions and 33147 deletions
+1
View File
@@ -52,6 +52,7 @@
/obj/item/clothing/accessory/waistcoat = 4,
/obj/item/clothing/suit/toggle/suspenders = 4,
/obj/item/clothing/neck/tie/horrible = 3,
/obj/item/clothing/neck/robe_cape = 3,
/obj/item/clothing/glasses/regular = 3,
/obj/item/clothing/glasses/regular/jamjar = 3,
/obj/item/clothing/glasses/orange = 3,
+4 -1
View File
@@ -98,7 +98,10 @@
break
/obj/machinery/vending/item_interaction(mob/living/user, obj/item/attack_item, list/modifiers)
. = NONE
. = ..()
if(. & ITEM_INTERACT_ANY_BLOCKER)
return .
if(panel_open && is_wire_tool(attack_item))
wires.interact(user)
return ITEM_INTERACT_SUCCESS