From 0fa1208ec2ee6a42f919379aa58b3a9eec452530 Mon Sep 17 00:00:00 2001
From: DmitriyRubetskoy <75271456+DmitriyRubetskoy@users.noreply.github.com>
Date: Thu, 14 Jan 2021 12:41:56 +0300
Subject: [PATCH] Alert polish and brushup (#2863)

* Alerts rework

Reworked some alert images so they aren't so rough around the edges, as well as adding an original drawing for being pulled (stun icon has a different route and foulder but is still the turned off stun baton, someone should draw a better one and I am not up to the task). There are minor description changes so they sounds either more resonable or more informational.

* Updated weightless

* Updated according to commentary

* Quick fix of a fatal bug

* Pulled icon improved

* Pulling icon reverted

Co-authored-by: Rubetskoy Dmitriy <rubetskoy234@mail.ru>
---
 Resources/Prototypes/Alerts/alerts.yml        |  18 ++++++++----------
 .../Textures/Interface/Alerts/Pull/pulled.png | Bin 3952 -> 696 bytes
 .../Alerts/Weightless/weightless.png          | Bin 786 -> 515 bytes
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index d8f71e1d8e..ba9ee9ec27 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -40,7 +40,7 @@
   icon: /Textures/Interface/Alerts/Pressure/highpressure.png
   maxSeverity: 2
   name: "[color=red]High Pressure[/color]"
-  description: "The air around you is [color=red]hazardously thick[/color]. A [color=green]fire suit[/color] would protect you."
+  description: "The air around you is [color=red]hazardously thick[/color]. A [color=green]pressurized suit[/color] would be enough protect you"
 
 - type: alert
   alertType: Fire
@@ -69,23 +69,21 @@
   alertType: Weightless
   icon: /Textures/Interface/Alerts/Weightless/weightless.png
   name: Weightless
-  description: >-
-    Gravity has ceased affecting you, and you're floating around aimlessly. You'll need something large and heavy, like a
-    wall or lattice, to push yourself off if you want to move. A jetpack would enable free range of motion. A pair of
-    magboots would let you walk around normally on the floor. Barring those, you can throw things, use a fire extinguisher,
-    or shoot a gun to move around via Newton's 3rd Law of Motion.
+  description: >
+    Gravity has ceased affecting you, and you're floating around aimlessly. Find something sturdy to hold onto, or throw or shoot something in a direction opposite of you. 
+    Mag-boots or jetpacks would help you move with more control
 
 - type: alert
   alertType: Stun
-  icon: /Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png
+  icon: /Textures/Objects/Weapons/Melee/stunbaton.rsi/stunbaton_off.png #Should probably draw a proper icon
   name: "[color=yellow]Stunned[/color]"
-  description: "You're [color=yellow]stunned[/color]! Wait for it to wear off."
+  description: "You're [color=yellow]stunned[/color]! Something is impairing your ability to move or interact with objects"
 
 - type: alert
   alertType: Handcuffed
   icon: /Textures/Interface/Alerts/Handcuffed/Handcuffed.png
   name: "[color=yellow]Handcuffed[/color]"
-  description: "You're [color=yellow]handcuffed[/color] and can't act. If anyone drags you, you won't be able to move.."
+  description: "You're [color=yellow]handcuffed[/color] and can't use your hands. If anyone drags you, you won't be able to resist.."
 
 - type: alert
   alertType: Buckled
@@ -107,7 +105,7 @@
   category: Health
   icon: /Textures/Interface/Alerts/Human/humandead.png
   name: Dead
-  description: You're dead.
+  description: You're dead, note that you can still be revived!
 
 - type: alert
   alertType: HumanHealth
diff --git a/Resources/Textures/Interface/Alerts/Pull/pulled.png b/Resources/Textures/Interface/Alerts/Pull/pulled.png
index 3d1aec59f6b8ea7354fb78ea7729e1903517b09c..9c148fe459595e73eb3e2cdde68d14bcb1d8f56e 100644
GIT binary patch
delta 673
zcmV;S0$%;_9=HXNBYyw^b5ch_0Itp)=>Px%a!Eu%R9J=WRzZ&1Fcf`1<phv~E&-)g
zFEH(5Hn~Z{F_HtoF%oVPRqaS^Pf#fWwuCSznDV<|zUvq}lWMB2c#<`?$MJuDe*YWb
zh8ql|tCFQLGhBbA*~aGg(zn60O%_=~uQ^1KC8Y0BWC<<T8-FVUD*@Nyp;)drJamtd
zZSr3zFm$a|0TbqF%o7e7zxGi77a#BLRRaLi%`Qg+Kvh*&8PONZdIfFUss>ynoCRad
z!^vQSF4r55LLX7+qmP8ugud^q{&x3M^>@w5x=B@40Dw4-JM+Jou{+wo5%enX{l`}|
zw?96r{ty+4EPtVwf;$QLzTZ)y%u@n@#j~V+vc_=?BEoXL;dwB@JeUB0bNy9n^xao9
z^-&*MECL_fW2?y7t{`2NEWzIpp>F=H*Z1srAYGL_3&vN0N8|wn&@*3;fGG4)H?0t+
zIF40zhyiuXf^p{>tposA7e%2D&-1|NOMtp*)m79@i+}QA&j3`tm*7u)zK}N#sjFbE
zPM_}X@l7*ex+?kIGypSS0_G{DtFm)SAtiX?^W}u(DfvYOoq*MZdT;?Vcj%URN_Eph
znmHCFg-DsFv_C##7K}SSv(^DUD3QB_n}*WIHZzNILZZx5ay~}yqYs_&`7a)5G2@6l
z<pCiiN`DBf1em!~2LPzFi{83xfa{$wGos8>61AKPoKB|>^CC;AKD0P9u$bCO5RocE
zW>6QL1WW~l#P-nkzJ@x)kOCWNCxI^ypRMynme8&_VIEF;tEL1lvV_bO9Yg@=e{@_b
z==Gt<66(t$z>$V#VEyNm{Ld^Xx*B!Us&8aozZ!}gZqV@?>W9UzF^S@`00000NkvXX
Hu0mjfALu$o

literal 3952
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
KMNUMnLSTYpzkeA3

diff --git a/Resources/Textures/Interface/Alerts/Weightless/weightless.png b/Resources/Textures/Interface/Alerts/Weightless/weightless.png
index 7ee4f0108359a9f9112e3aaa171ebfbc8f7b5dc6..87e541084e96f14642eddd3377f396ac92a73972 100644
GIT binary patch
delta 490
zcmV<G0Tup|27?5UBYyw^b5ch_0Itp)=>Px$y-7qtR9J=WRy|L`P!v5i4p0~zOvFJF
zScrorjK<Z`r9Z*CbubNs1_y~O1_onl;#QfRTo_rI8JJiwfdQJ-*a1qn=g?GIKFWLa
z5f{$bcW=(Q=id8Xfi1R(h_YTMSGP}O-TWOMA`XwTSXV@30e`J#0|4OIqqXuQ3;2A0
z5da{QJB1{x%r0<g0pL2|iJ65`(uh*h7K-B{ASNb4&r|8_(im<Itio5Py*UAvX)HY}
z>-EsN;38me{~(mS)od)C53VinZvhQC0PON0cI>h1LZ=N$R!RQ+0yN~@1b8^kpZ!hy
zu-B!^2~~Ih`hP)UVgi<F1p54NeJS{3fZ!?)dtD6r-Idh?6b@LX;jWNxjg*o`-X3p+
zLPejOa29f4g#!RksOaSR?m7@B$tua@P5=NgF&U_yrtf~N+=5whz`g&yi)Ge&RzzCE
zn3$aV#!@{%(SlhNDmw9OckD3+{b|+lxa$VX3@|z1y<=#e?UrevRxJv(YEiIEBOr$M
zX=c6${I>fE{S_-Ejrh;F3UKTZEYrYbGG<MUF5u_efYYB6FY2=-t0a}qg4ThJK$2Cm
g&hOb4Tl@=t0h6D<Rrz!xGXMYp07*qoM6N<$f>UhdjQ{`u

delta 763
zcmV<X0tEeo1d;}jBYy(fNkl<ZScS!xKWN)P6vjW9nkYVFWw4#Nrh#|~32DLL#dS7!
zDJ^segpf=rm@XYUg%&y%0-d{M=+saQ8CobEnt+F<lW7LK1yf=}jZqcJR07M<WID*F
z$ogYPvDJK&bkg1X-tXQ?cTA~N!utAV2iKrtaX-w&<2O68SbyR=;zJa9+^{sT|08fL
zmeA<6VL%jlHWG;-8jWkt-7eJY^#<+(fxxAMOVSxDiabkA3=jwgr!+-TYypO8YiE}<
zY88C@u&<7KHxLLQ7@X1o7^DXba2)3;I91|S3U?oEk{_i{mom|Ai^lzc0k7Euz{&9;
zmeN^h-3}B*8Gre{b-KnT(5jZzrF51oEZ%|ERY|K_9!g>21gNxb2S1OG9E0aK3IqU-
z-tVasCjbC!h(POhz;T@8^SSvHWJv(WasCmY{oT~4RiG%!<ZA!`WJxgkTlMhCb7CIf
z7XmZUS;&%LBe1ozO8|YP(E9L&0M&9XZ>$2E`N{DiT7T8DO6mAQK<lcQiOvGG3X&@s
zlFr=&4Q^c-z7kkUXTgT_DgX1kZj5O)aA^W-PhS!?L?BCoo?&0_UcXSy@6c;=aK2f0
z{4RJVAWH%owF*$H7;X8D0x5qks;g_;1QyZY=6Sy|frB@%)CZ5B5nCoX5OZ*vIRMwp
z%?8XGNq^w$!CPA<{Yobbi?;`YyUn}Rz(iI-5&#<t+uDa^PYsymc@?a#Z4)*W?tlMP
zy*~Pyo+ij|6bP*WHv?BDK>unKyDSODPG~uoCo=TS2>>KlGWOcR1PGY1^Ub<3-!$V^
zwT#UDbz**IH855UXx$EENx=EJYV>iF)3dP%{B&&#(3%%ioz{ACB}3-sQ}Bhr_b(qu
zZaNix-U%Jg$$(il0)Tzr?^U!Ooc;p<+zFhX{$kw@CSFVpJE%y~8Otz?-9Rjs&_t1E
t+ilU;;~B#+&POw9!q4E2hOYZ~{tpv}y4I69@R9%k002ovPDHLkV1jz4Vf+99