mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
Merge pull request #14321 from Putnam3145/windbreaker-fix
Makes polychromic windbreaker's message not be nonsense
This commit is contained in:
@@ -1040,6 +1040,12 @@
|
||||
icon_state = "wbreakpoly"
|
||||
item_state = "wbreakpoly"
|
||||
|
||||
/obj/item/clothing/suit/toggle/wbreakpoly/on_toggle(mob/user)
|
||||
if(suittoggled)
|
||||
to_chat(usr, "<span class='notice'>You zip up [src].</span>")
|
||||
else
|
||||
to_chat(usr, "<span class='notice'>You unzip [src].</span>")
|
||||
|
||||
/obj/item/clothing/suit/toggle/wbreakpoly/polychromic/ComponentInitialize()
|
||||
. = ..()
|
||||
AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3)
|
||||
|
||||
@@ -110,6 +110,9 @@
|
||||
suit_toggle(user)
|
||||
return TRUE
|
||||
|
||||
/obj/item/clothing/suit/toggle/proc/on_toggle(mob/user) // override this, not suit_toggle, which does checks
|
||||
to_chat(usr, "<span class='notice'>You toggle [src]'s [togglename].</span>")
|
||||
|
||||
/obj/item/clothing/suit/toggle/ui_action_click()
|
||||
suit_toggle()
|
||||
|
||||
@@ -119,7 +122,7 @@
|
||||
if(!can_use(usr))
|
||||
return 0
|
||||
|
||||
to_chat(usr, "<span class='notice'>You toggle [src]'s [togglename].</span>")
|
||||
on_toggle(usr)
|
||||
if(src.suittoggled)
|
||||
src.icon_state = "[initial(icon_state)]"
|
||||
src.suittoggled = FALSE
|
||||
|
||||
Reference in New Issue
Block a user