From 589bedcfafe012c27daa29dcedc0be4745eed626 Mon Sep 17 00:00:00 2001 From: Artur Date: Mon, 7 Sep 2020 13:06:34 +0300 Subject: [PATCH] Fixes alt click, themes a little, and re enter corpse --- code/__DEFINES/dcs/signals.dm | 3 + code/_onclick/click.dm | 4 + code/modules/mob/dead/observer/observer.dm | 4 +- tgui/packages/tgui-panel/Panel.js | 4 +- .../tgui-panel/styles/goon/chat-dark.scss | 228 ++++++++++++++++-- .../tgui-panel/styles/goon/chat-light.scss | 221 ++++++++++++++++- tgui/public/tgui-panel.bundle.css | 2 +- tgui/public/tgui-panel.bundle.js | 2 +- 8 files changed, 430 insertions(+), 38 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 8efb2617bd..a71f2d705c 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -244,6 +244,9 @@ #define COMPONENT_BLOCK_SWAP 1 #define COMSIG_PROCESS_BORGCHARGER_OCCUPANT "living_charge" +///from base of mob/AltClickOn(): (atom/A) +#define COMSIG_MOB_ALTCLICKON "mob_altclickon" + #define COMSIG_MOB_CANCEL_CLICKON (1<<0) // /client signals #define COMSIG_MOB_CLIENT_LOGIN "mob_client_login" //sent when a mob/login() finishes: (client) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 88bc9f3241..70de6cd614 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -324,6 +324,10 @@ /mob/proc/AltClickOn(atom/A) if(!A.AltClick(src)) altclick_listed_turf(A) + . = SEND_SIGNAL(src, COMSIG_MOB_ALTCLICKON, A) + if(. & COMSIG_MOB_CANCEL_CLICKON) + return + A.AltClick(src) /mob/proc/altclick_listed_turf(atom/A) var/turf/T = get_turf(A) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 62abd9e05d..8221e5e71b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -409,9 +409,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return client.change_view(CONFIG_GET(string/default_view)) SStgui.on_transfer(src, mind.current) // Transfer NanoUIs. - mind.current.client.init_verbs() + transfer_ckey(mind.current, FALSE) return TRUE - + /mob/dead/observer/verb/stay_dead() set category = "Ghost" set name = "Do Not Resuscitate" diff --git a/tgui/packages/tgui-panel/Panel.js b/tgui/packages/tgui-panel/Panel.js index fdd7977f4e..b04cd62967 100644 --- a/tgui/packages/tgui-panel/Panel.js +++ b/tgui/packages/tgui-panel/Panel.js @@ -33,7 +33,7 @@ export const Panel = (props, context) => { } } return ( - + @@ -116,7 +116,7 @@ export const Panel = (props, context) => { const HoboPanel = (props, context) => { const settings = useSettings(context); return ( - +