Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Surrender text clarity revive #7059

Merged
alexkar598 merged 7 commits into from
Nov 17, 2019
Merged

Surrender text clarity revive #7059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
856950c
Revert "Restoring my main branch"
Hopekz Oct 15, 2019
00b5eb0
Revert "Revert "Restoring my main branch""
Hopekz Oct 15, 2019
b122222
Merge remote-tracking branch 'upstream/master'
Hopekz Oct 15, 2019
4e9bfc7
Revive SurrenderText PR
Hopekz Nov 10, 2019
3949a28
Makes the text easier to see
Hopekz Nov 10, 2019
bca6dbe
Surrendering now has its own span
Hopekz Nov 11, 2019
f585662
Stole Alex's span
Hopekz Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions code/modules/goonchat/browserassets/css/browserOutput.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,24 @@ em {font-style: normal; font-weight: bold;}
.shadowling {color: #8e8a99;}
.velvet {color: #37198b;}
.cult {color: #aa1c1c;}
.surrender {
color: #1235d1;
font-weight: bold;
font-size: 27px;
animation: surrender 1s ease-in-out infinite alternate;
transform-origin: 0 0;
display: inline-block;
}
@keyframes surrender {
0% {
transform: scale(1,1);
color: #ff0000;
}
100% {
transform: scale(1.05,1);
color: #0000ff
}
}

.cultitalic {color: #aa1c1c; font-style: italic;}
.cultbold {color: #aa1c1c; font-style: italic; font-weight: bold;}
Expand Down
18 changes: 18 additions & 0 deletions code/modules/goonchat/browserassets/css/browserOutput_white.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,24 @@ h1.alert, h2.alert {color: #000000;}
.shadowling {color: #3b2769;}
.velvet {color: #21007F;}
.cult {color: #960000;}
.surrender {
color: #1235d1;
font-weight: bold;
font-size: 27px;
animation: surrender 1s ease-in-out infinite alternate;
transform-origin: 0 0;
display: inline-block;
}
@keyframes surrender {
0% {
transform: scale(1,1);
color: #ff0000;
}
100% {
transform: scale(1.05,1);
color: #0000ff
}
}

.cultitalic {color: #960000; font-style: italic;}
.cultbold {color: #960000; font-style: italic; font-weight: bold;}
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/emote.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
/datum/emote/living/surrender
key = "surrender"
key_third_person = "surrenders"
message = "puts their hands on their head and falls to the ground, they surrender!"
message = "<span class='surrender'>puts their hands on their head and falls to the ground, they surrender!</span>"
emote_type = EMOTE_AUDIBLE

/datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional)
Expand Down
18 changes: 18 additions & 0 deletions interface/stylesheet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,24 @@ h1.alert, h2.alert {color: #000000;}
.hierophant_warning {color: #660099; font-style: italic;}
.purple {color: #5e2d79;}
.holoparasite {color: #35333a;}
.surrender {
color: #1235d1;
font-weight: bold;
font-size: 3;
animation: surrender 1s ease-in-out infinite alternate;
transform-origin: 0 0;
display: inline-block;
}
@keyframes surrender {
0% {
transform: scale(1,1);
color: #ff0000;
}
100% {
transform: scale(1.05,1);
color: #0000ff
}
}

.revennotice {color: #1d2953;}
.revenboldnotice {color: #1d2953; font-weight: bold;}
Expand Down