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-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes alt click, themes a little, and re enter corpse

Browse Source
This commit is contained in:
Artur
2020-09-07 13:06:34 +03:00
parent a175c397f0
commit 589bedcfaf
8 changed files with 430 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__DEFINES/dcs/signals.dm
View File

@@ -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)

4
code/_onclick/click.dm
View File

@@ -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)

4
code/modules/mob/dead/observer/observer.dm
View File

@@ -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"

4
tgui/packages/tgui-panel/Panel.js
View File

@@ -33,7 +33,7 @@ export const Panel = (props, context) => {
}
}
return (
<Pane theme={settings.theme}>
<Pane theme={settings.theme === 'default' ? 'light' : settings.theme}>
<Flex
direction="column"
height="100%">
@@ -116,7 +116,7 @@ export const Panel = (props, context) => {
const HoboPanel = (props, context) => {
const settings = useSettings(context);
return (
<Pane theme={settings.theme}>
<Pane theme={settings.theme === 'default' ? 'light' : settings.theme}>
<Pane.Content scrollable>
<Button
style={{

228
tgui/packages/tgui-panel/styles/goon/chat-dark.scss
View File

@@ -3,7 +3,7 @@
* SPDX-License-Identifier: MIT
*/
em {
em {
font-style: normal;
font-weight: bold;
}
@@ -287,6 +287,16 @@ em {
font-weight: bold;
}
.looc {
color: #6699CC;
font-weight: bold;
}
.antagooc {
color: #b8002e;
font-weight: bold;
}
.adminobserverooc {
color: #0099cc;
font-weight: bold;
@@ -302,11 +312,28 @@ em {
font-weight: bold;
}
/* @adminobserver compatability*/
.adminobserver {
color: #996600;
font-weight: bold;
}
.admin {
color: #5975da;
font-weight: bold;
}
/* cit-specific mentorsay*/
.mentorsay {
color: #E236D8;
font-weight: bold;
}
.mentorsay_admin {
color: #8A2BE2;
font-weight: bold;
}
.name {
font-weight: bold;
}
@@ -448,22 +475,12 @@ em {
}
.tinynotice {
color: #6685f5;
font-size: 85%;
}
.tinynoticeital {
color: #6685f5;
font-style: italic;
font-size: 85%;
}
.smallnotice {
color: #6685f5;
font-size: 90%;
}
.smallnoticeital {
color: #6685f5;
font-style: italic;
font-size: 90%;
@@ -515,40 +532,40 @@ em {
}
.cult {
color: #973e3b;
color: #aa1c1c;
}
.cultitalic {
color: #973e3b;
color: #aa1c1c;
font-style: italic;
}
.cultbold {
color: #973e3b;
color: #aa1c1c;
font-style: italic;
font-weight: bold;
}
.cultboldtalic {
color: #973e3b;
color: #aa1c1c;
font-weight: bold;
font-size: 185%;
}
.cultlarge {
color: #973e3b;
color: #aa1c1c;
font-weight: bold;
font-size: 185%;
}
.narsie {
color: #973e3b;
color: #aa1c1c;
font-weight: bold;
font-size: 925%;
}
.narsiesmall {
color: #973e3b;
color: #aa1c1c;
font-weight: bold;
font-size: 370%;
}
@@ -607,12 +624,155 @@ em {
font-size: 185%;
}
.umbra {
color: #5000A0;
}
.umbra_emphasis {
color: #5000A0;
font-weight: bold;
font-style: italic;
}
.umbra_large {
color: #5000A0;
font-weight: bold;
font-style: italic;
font-size: 3;
}
.deconversion_message {
color: #a947ff;
color: #5000A0;
font-size: 185%;
font-style: italic;
}
/* coggers dosen't exist on tg :( */
/* from decon_msg: font-size: 185% == font-size 3*/
.brass {
color: #BE8700;
}
.heavy_brass {
color: #BE8700;
font-weight: bold;
font-style: italic;
}
.large_brass {
color: #BE8700;
font-size: 185%;
}
.big_brass {
color: #BE8700;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.ratvar {
color: #BE8700;
font-size: 6;
font-weight: bold;
font-style: italic;
}
.alloy {
color: #42474D;
}
.heavy_alloy {
color: #42474D;
font-weight: bold;
font-style: italic;
}
.nezbere_large {
color: #42474D;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.nezbere {
color: #42474D;
font-weight: bold;
font-style: italic;
}
.nezbere_small {
color: #42474D;
}
.sevtug_large {
color: #AF0AAF;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.sevtug {
color: #AF0AAF;
font-weight: bold;
font-style: italic;
}
.sevtug_small {
color: #AF0AAF;
}
.inathneq_large {
color: #1E8CE1;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.inathneq {
color: #1E8CE1;
font-weight: bold;
font-style: italic;
}
.inathneq_small {
color: #1E8CE1;
}
.nzcrentr_large {
color: #DAAA18;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.nzcrentr {
color: #DAAA18;
font-weight: bold;
font-style: italic;
}
.nzcrentr_small {
color: #DAAA18;
}
.neovgre_large {
color: #6E001A;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.neovgre {
color: #6E001A;
font-weight: bold;
font-style: italic;
}
.neovgre_small {
color: #6E001A;
}
.ghostalert {
color: #6600ff;
font-style: italic;
@@ -696,6 +856,11 @@ em {
font-size: 185%;
}
.yellowtext {
color: #FFCC00;
font-size: 185%;
}
.clown {
color: #ff70c1;
font-size: 160%;
@@ -743,6 +908,31 @@ em {
}
}
.velvet {
color: #660015;
font-weight: bold;
animation: velvet 5000ms infinite;
animation-direction: alternate;
}
@keyframes velvet {
0% {
color: #400020;
}
40% {
color: #FF0000;
}
50% {
color: #FF8888;
}
60% {
color: #FF0000;
}
100% {
color: #400020;
}
}
.phobia {
color: #dd0000;
font-weight: bold;

221
tgui/packages/tgui-panel/styles/goon/chat-light.scss
View File

@@ -11,7 +11,7 @@ html, body {
}
body {
background: #fff;
background: #E0E0E0; /*CIT CHANGE - darkens chatbox a lil*/
font-family: Verdana, sans-serif;
font-size: 13px;
line-height: 1.2;
@@ -306,6 +306,16 @@ em {
font-weight: bold;
}
.looc {
color: #6699CC;
font-weight: bold;
}
.antagooc {
color: #b8002e;
font-weight: bold;
}
.adminobserverooc {
color: #0099cc;
font-weight: bold;
@@ -321,11 +331,28 @@ em {
font-weight: bold;
}
/* @adminobserver compatability*/
.adminobserver {
color: #996600;
font-weight: bold;
}
.admin {
color: #4473ff;
font-weight: bold;
}
/* cit-specific mentorsay*/
.mentorsay {
color: #E236D8;
font-weight: bold;
}
.mentorsay_admin {
color: #8A2BE2;
font-weight: bold;
}
.name {
font-weight: bold;
}
@@ -489,11 +516,6 @@ h1.alert, h2.alert {
}
.tinynotice {
color: #000099;
font-size: 85%;
}
.tinynoticeital {
color: #000099;
font-style: italic;
font-size: 85%;
@@ -556,40 +578,40 @@ h1.alert, h2.alert {
}
.cult {
color: #973e3b;
color: #960000;
}
.cultitalic {
color: #973e3b;
color: #960000;
font-style: italic;
}
.cultbold {
color: #973e3b;
color: #960000;
font-style: italic;
font-weight: bold;
}
.cultboldtalic {
color: #973e3b;
color: #960000;
font-weight: bold;
font-size: 185%;
}
.cultlarge {
color: #973e3b;
color: #960000;
font-weight: bold;
font-size: 185%;
}
.narsie {
color: #973e3b;
color: #960000;
font-weight: bold;
font-size: 925%;
}
.narsiesmall {
color: #973e3b;
color: #960000;
font-weight: bold;
font-size: 370%;
}
@@ -648,12 +670,155 @@ h1.alert, h2.alert {
font-size: 185%;
}
.umbra {
color: #5000A0;
}
.umbra_emphasis {
color: #5000A0;
font-weight: bold;
font-style: italic;
}
.umbra_large {
color: #5000A0;
font-weight: bold;
font-style: italic;
font-size: 3;
}
.deconversion_message {
color: #5000A0;
font-size: 185%;
font-style: italic;
}
/* coggers dosen't exist on tg :( */
/* from decon_msg: font-size: 185% == font-size 3*/
.brass {
color: #BE8700;
}
.heavy_brass {
color: #BE8700;
font-weight: bold;
font-style: italic;
}
.large_brass {
color: #BE8700;
font-size: 185%;
}
.big_brass {
color: #BE8700;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.ratvar {
color: #BE8700;
font-size: 6;
font-weight: bold;
font-style: italic;
}
.alloy {
color: #42474D;
}
.heavy_alloy {
color: #42474D;
font-weight: bold;
font-style: italic;
}
.nezbere_large {
color: #42474D;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.nezbere {
color: #42474D;
font-weight: bold;
font-style: italic;
}
.nezbere_small {
color: #42474D;
}
.sevtug_large {
color: #AF0AAF;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.sevtug {
color: #AF0AAF;
font-weight: bold;
font-style: italic;
}
.sevtug_small {
color: #AF0AAF;
}
.inathneq_large {
color: #1E8CE1;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.inathneq {
color: #1E8CE1;
font-weight: bold;
font-style: italic;
}
.inathneq_small {
color: #1E8CE1;
}
.nzcrentr_large {
color: #DAAA18;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.nzcrentr {
color: #DAAA18;
font-weight: bold;
font-style: italic;
}
.nzcrentr_small {
color: #DAAA18;
}
.neovgre_large {
color: #6E001A;
font-size: 185%;
font-weight: bold;
font-style: italic;
}
.neovgre {
color: #6E001A;
font-weight: bold;
font-style: italic;
}
.neovgre_small {
color: #6E001A;
}
.ghostalert {
color: #5c00e6;
font-style: italic;
@@ -737,6 +902,11 @@ h1.alert, h2.alert {
font-size: 185%;
}
.yellowtext {
color: #FFCC00;
font-size: 185%;
}
.clown {
color: #FF69Bf;
font-size: 160%;
@@ -784,6 +954,31 @@ h1.alert, h2.alert {
}
}
.velvet {
color: #660015;
font-weight: bold;
animation: velvet 5000ms infinite;
animation-direction: alternate;
}
@keyframes velvet {
0% {
color: #400020;
}
40% {
color: #FF0000;
}
50% {
color: #FF8888;
}
60% {
color: #FF0000;
}
100% {
color: #400020;
}
}
.phobia {
color: #dd0000;
font-weight: bold;

2
tgui/public/tgui-panel.bundle.css
View File

File diff suppressed because one or more lines are too long

2
tgui/public/tgui-panel.bundle.js
View File

File diff suppressed because one or more lines are too long