From 1b1d63f5d6e6830f0c2f67a2bca4e346e2e625b1 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Fri, 6 Sep 2024 07:26:26 +0200 Subject: [PATCH] Vox sign/N2 locker update (#31845) * Vox sign/N2 locker update The "vox area" sign and N2 locker sprite were both taken from /vg/station. These sprites have bad racist connotations as discussed in https://github.com/space-wizards/space-station-14/issues/31840, and do not fit our server culture. The new N2 locker is not a taped on piece of trash. It now also has a blue stripe to mimic the regular O2 locker and make it more distinct from fire safety closets. The new "vox area" sign sprite follows the same style as other "area indicator" signs used throughout the blue and isn't an explicit warning sign anymore. It still has "No O2" on it to fill that role though. * emogarbage adjustments --------- Co-authored-by: EmoGarbage404 --- .../Structures/Storage/Closets/closets.yml | 4 ++-- .../Structures/Wallmounts/Signs/signs.yml | 4 ++-- .../Structures/Storage/closet.rsi/meta.json | 8 +++++++- .../Structures/Storage/closet.rsi/n2.png | Bin 0 -> 324 bytes .../Structures/Storage/closet.rsi/n2_door.png | Bin 357 -> 366 bytes .../Structures/Storage/closet.rsi/n2_open.png | Bin 0 -> 318 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 4 ++-- .../Structures/Wallmounts/signs.rsi/vox.png | Bin 0 -> 566 bytes .../Wallmounts/signs.rsi/voxcross.png | Bin 429 -> 0 bytes 9 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/n2.png create mode 100644 Resources/Textures/Structures/Storage/closet.rsi/n2_open.png create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/vox.png delete mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/voxcross.png diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml index fb00db7aa6..3bef14b33f 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml @@ -46,8 +46,8 @@ components: - type: Appearance - type: EntityStorageVisuals - stateBaseClosed: fire - stateDoorOpen: fire_open + stateBaseClosed: n2 + stateDoorOpen: n2_open stateDoorClosed: n2_door # Fire safety closet diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 32202e41fd..08c14e3915 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1103,10 +1103,10 @@ parent: BaseSign id: SignVox name: vox area sign - description: A sign indicating that the area ahead possibly contains a nitrogen-filled atmosphere. + description: A sign indicating that the area ahead is intended for Vox crew members and does not have an oxygen atmosphere. components: - type: Sprite - state: voxcross + state: vox # Atmos Warnings diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index c52bc13540..329c7b5a4f 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2_door state modified by Flareguy from fire_door, using sprites from /vg/station at https://github.com/vgstation-coders/vgstation13/commit/02b9f6894af4419c9f7e699a22c402b086d8067e", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites", "license": "CC-BY-SA-3.0", "states": [ { @@ -398,6 +398,12 @@ { "name": "mixed_door" }, + { + "name": "n2" + }, + { + "name": "n2_open" + }, { "name": "n2_door" }, diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2.png b/Resources/Textures/Structures/Storage/closet.rsi/n2.png new file mode 100644 index 0000000000000000000000000000000000000000..c7b975f763b60f430eb19693ed5a168475906ad1 GIT binary patch literal 324 zcmV-K0lWT*P)Px#{z*hZR9J=WmQ4!6FcgF*{h`(daZ#{6f#4x}3s2zjyh2yqyKv)LSC-P1s4ZBC zE5YSFNeMy+vYSl4Jl-P#980mrZI&5H@V>68?0`Ldm*-dx19kW{3<1C}5FV8{q9y>U z2LRymdSRWWl=s-Sb^&w{pln-|f?yqRccWbQVZiP2pbrNCB#AwMk7jX9`TDM-Go3f# z1TX=JrXcct%GV1r#T76{^eWp2P>TLS*aJ{S0RWhL9<{#rSOFMQq9$Y?7>TF~n5q&7 zvwK8WipepQ=)Zd4{Cv6vSVa-#lYCx801H=BFs7UXh-!Lh8aDtNt#J|tZ?yga$AR9J WDK&CJ=e}hC0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png index f6d9499f10ab3a034df4055af67a163859fd68d3..a1e279b81b10e1b25339a953a3e93d7c63edffb9 100644 GIT binary patch delta 350 zcmV-k0ipio0`3Bk8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00AgTL_t(og=1hC1*2dT zjC8H}O)PEgeVWQMtdHa?j<=Hc$%%&&=r~!yB2j2YtO;F92 z2M;K53x2S3=g$8xU%tePo0^*bGqQ00Z)$2Hy3`!-C>U@D5S596(C;8U@4x0C=%_j@Gd<_y7O^07*qoM6N<$g3tt$vH$=8 delta 341 zcmaFI^pt6WWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g^fKQ0) z!wp-usHmJgdGh)5=elwXbEKqB=;~fuy7a`#l_w4#KD>BwQ)+5wNJxdKXbmqfBMWDT zsOXc94n}4+paCL<0lz?0NswRge>kXzvl#sSp9=yNa29w(7BevL9R^{>)_e?{{Om~nWfiKrpBusxNl%%Oyu9KbFjsw|M8(GYxg?tc52c-cHO^kSp$F2xt}I}iJpHG?99`G53rtI zx^V`RUWDPEATLAKT?fldS@(%dxhhh@pEq^R;RkU)1^ygrQFnY`z#4PmxkA8QMw6!w VpTebNM1js@@O1TaS?83{1OU3cj&J|~ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png b/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png new file mode 100644 index 0000000000000000000000000000000000000000..9851d97c0a0cf1d8e19446e813400f13043dcfcd GIT binary patch literal 318 zcmV-E0m1%>P)Px#_(?=TR9J=Wm%R;wKpaPZ5E4;?3M<&sn7Dxjp?3r=sa?UIHC(_#Ctw9@3k{eM z6cQ6G@GgAD#y{8GtGMHm_i_+E0Et8*7^Q8}F^s%CKE`qDx__Y6WdN`?XO;0Wj;Z|6 z+Ju)^%8%zmolMRH>e4<@g;-^P3@8VfmL)bI3PZ60zZP6KThagx01nXu3%z*ajXaN3 z*a(=qZXveqUd241>%`OddkIh+!^qk8w_zg3?sg}89ji=ICP)$lNkZkUP`Lz5ddl7a zfaSR70481yI&Tfy04A0@Abbb**5o_W_+F(8Fp+cdInBt$m4LdC@;{)?2Q^VfF^l(> QegFUf07*qoM6N<$f^ZChM*si- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 34a538fda9..268f528e07 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github), 'direction_atmos' made by SlamBamActionman. 'vox' based on sprites taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi", "states": [ { "name": "ai" @@ -390,7 +390,7 @@ "name": "zomlab" }, { - "name": "voxcross" + "name": "vox" }, { "name": "small_secure_red" diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/vox.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c52247cbb933ba1741c5cb9adcdf3b5e96abe10a GIT binary patch literal 566 zcmV-60?GY}P)Px$@JU2LR9J=WS20V&KotI}qJk6x8XX+ct&lO)LKn@}Ur;yc-cfMKrc*b^?5^e) zxCI>q2>}rT4nhMiHB^-1D0RB?dbtaCX-fzFARM{7-1ohA@4egse;t*g!B)FFnHSOh z&6SXAt%%&JH?h4}o0)tx900&XBx1FQyjE{wV{?l>m#0U#d-|kp%cv$hm za^vJXV`m=#P&Lf+*O$i&mTN_(TE+5?Yr*p)bX*Gn;Q0~yy#_o#QeICgKm?v32vhWX z4Fq8d0CcS1YbdWN42)L0J8=$=Q8jjT^c7BFok2A z0074}>2~OfDHQ`jn9{%_``>XbDnb;5GDzzH4`LM|XGQS+WUh)3WdWWa!LiLLa$-Gz zTz{NoO6zKS003Q_CyA2`9oM4I!aU&ErjVQjrH%)*f{@*F;t@j1dWfAjR{_MOagyac z;`tG^S|{hCTN##qB$H;r zXgEOC*e!k3V&VA_xf|ply&28>Vv;^T2yaJAzncBy2TbxOj{Z0V=l}o!07*qoM6N<$ Ef*wHhQvd(} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/voxcross.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/voxcross.png deleted file mode 100644 index 2262bb33fed16b222e2786f69a4bfddfc8634acd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmV;e0aE^nP)Px$XGugsR9J=WR?BUKFc5u?C}F8#+u+D4N;%txJ3%N13gBWopaf(IN|+qLFm`Mf z11pqhpEN=SH7HHLEYE#t8iipPEIVR*!b=W}nej}4 zCEN<|e-7DU$h98*^^yBT@VEr2hZF@UDsAd zYc}`-07)sIi|~<~;5LK=@G-Z-e4Cc)b`e>YkW$L3LP!8s`U0^H$wic9>9ryhKC43H z!F?c2A(lq`oZt6-zbf1`q