]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Four 'new' signs (#20792)
authorFluffiest Floofers <thebluewulf@gmail.com>
Fri, 6 Oct 2023 18:45:27 +0000 (20:45 +0200)
committerGitHub <noreply@github.com>
Fri, 6 Oct 2023 18:45:27 +0000 (12:45 -0600)
* 4 signs from tg

* based photoshop user, janitor sign

* forgot the hub in 'github'

Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
Resources/Textures/Structures/Wallmounts/signs.rsi/court.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/signs.rsi/law.png [new file with mode: 0644]
Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png [new file with mode: 0644]

index 1a2a8c73abe5e348050cc8054c88df47eb929f3d..287bf96056321d1b5678913c0855173b55a532f7 100644 (file)
   - type: Sprite
     state: conference_room
 
+- type: entity
+  parent: BaseSign
+  id: SignCourt
+  name: court sign
+  description: A sign labelling the courtroom.
+  components:
+  - type: Sprite
+    state: court
+
 - type: entity
   parent: BaseSign
   id: SignDisposalSpace
   - type: Sprite
     state: interrogation
 
+- type: entity
+  parent: BaseSign
+  id: SignJanitor
+  name: janitor sign
+  description: A sign labelling an area where the janitor works.
+  components:
+  - type: Sprite
+    state: janitor
+
+- type: entity
+  parent: BaseSign
+  id: SignLawyer
+  name: lawyer sign
+  description: A sign labelling an area where the Lawyers work.
+  components:
+  - type: Sprite
+    state: law
+
 - type: entity
   parent: BaseSign
   id: SignLibrary
   - type: Sprite
     state: prison
 
+- type: entity
+  parent: BaseSign
+  id: SignPsychology
+  name: psychology sign
+  description: A sign labelling an area where the Psychologist works.
+  components:
+  - type: Sprite
+    state: psychology
+
 - type: entity
   parent: BaseSign
   id: SignRND
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png
new file mode 100644 (file)
index 0000000..fbb8c50
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/court.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png
new file mode 100644 (file)
index 0000000..789a538
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png
new file mode 100644 (file)
index 0000000..de6e16d
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/law.png differ
index e2cbbff9892157a13e461c40dc3cd42a3938e561..9a5f64759bd661a664b4b7c34d6784375644213a 100644 (file)
@@ -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, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202",
+  "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, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202, 'janitor' edited by forgotmyotheraccount on github",
     "states": [
         {
             "name": "ai",
                 ]
             ]
         },
+        {
+            "name": "court",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "cryogenics",
             "delays": [
                 ]
             ]
         },
+        {
+            "name": "janitor",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "laser",
             "delays": [
                 ]
             ]
         },
+        {
+            "name": "law",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "magnetics",
             "delays": [
                 ]
             ]
         },
+        {
+            "name": "psychology",
+            "delays": [
+                [
+                    1
+                ]
+            ]
+        },
         {
             "name": "radiation",
             "delays": [
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png
new file mode 100644 (file)
index 0000000..9b0761c
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png differ