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 <retron404@gmail.com>

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/closets.yml
index fb00db7aa6bb1395341aa0b9b092665eded475af..3bef14b33fee4917f8006fec04809139732b9c45 100644 (file)
--- 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 32202e41fdf350ff610d1aed701c1b7edf959e1f..08c14e39159111674c968966c0733f1a33ccf39a 100644 (file)
--- 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 c52bc13540e16452c5eb38af608dfe851ef81149..329c7b5a4f880c5d05db94efefc983741e49dbbb 100644 (file)
--- 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 (file)
index 0000000..c7b975f
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/n2.png differ

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 (file)
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png differ

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 (file)
index 0000000..9851d97
Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png differ

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
index 34a538fda9cd7bb3fe4410e32ee1b773503deb06..268f528e07474ae665d40e8f7b56ae207ec8a23a 100644 (file)
--- 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 (file)
index 0000000..c52247c
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/vox.png differ

diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/voxcross.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/voxcross.png
deleted file mode 100644 (file)
index 2262bb3..0000000
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/voxcross.png and /dev/null differ