cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14321 from Putnam3145/windbreaker-fix

Browse Source 
Makes polychromic windbreaker's message not be nonsense
This commit is contained in:
Lin
2021-02-27 14:43:35 -06:00
committed by GitHub
parent 6cd8486c77 ac0fd530f2
commit 41f227bc5e
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -1040,6 +1040,12 @@
icon_state = "wbreakpoly" icon_state = "wbreakpoly"
item_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() /obj/item/clothing/suit/toggle/wbreakpoly/polychromic/ComponentInitialize()
. = ..() . = ..()
AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3) AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3)

5
code/modules/clothing/suits/toggles.dm
View File

@@ -110,6 +110,9 @@
suit_toggle(user) suit_toggle(user)
return TRUE 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() /obj/item/clothing/suit/toggle/ui_action_click()
suit_toggle() suit_toggle()
@@ -119,7 +122,7 @@
if(!can_use(usr)) if(!can_use(usr))
return 0 return 0
to_chat(usr, "<span class='notice'>You toggle [src]'s [togglename].</span>") on_toggle(usr)
if(src.suittoggled) if(src.suittoggled)
src.icon_state = "[initial(icon_state)]" src.icon_state = "[initial(icon_state)]"
src.suittoggled = FALSE src.suittoggled = FALSE