Surrender text clarity revive (#7059)

* Revert "Restoring my main branch"

This reverts commit 39cb232542.

* Revert "Revert "Restoring my main branch""

This reverts commit 856950caa8.

* Revive SurrenderText PR

This PR got closed for a stupid reason then died so I'm bringing it back.
Fixed line endings.

* Makes the text easier to see

Nich brought this up. Valid point. Changed to a very easy to see span.

* Surrendering now has its own span

Per Xoxeyos's suggestion

* Stole Alex's span

Yoink my span nerd
This commit is contained in:
Hopekz
2019-11-17 07:03:10 -06:00
committed by alexkar598
parent 2fd284c259
commit 11957303b7
4 changed files with 55 additions and 1 deletions

View File

@@ -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;}

View File

@@ -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;}

View File

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

View File

@@ -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;}