From d3bfd0193b3c925c79846ca3e9e4d8d32f99ed21 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Fri, 6 Oct 2023 20:45:27 +0200 Subject: [PATCH] Four 'new' signs (#20792) * 4 signs from tg * based photoshop user, janitor sign * forgot the hub in 'github' --- .../Structures/Wallmounts/Signs/signs.yml | 36 ++++++++++++++++++ .../Structures/Wallmounts/signs.rsi/court.png | Bin 0 -> 431 bytes .../Wallmounts/signs.rsi/janitor.png | Bin 0 -> 552 bytes .../Structures/Wallmounts/signs.rsi/law.png | Bin 0 -> 367 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 34 ++++++++++++++++- .../Wallmounts/signs.rsi/psychology.png | Bin 0 -> 582 bytes 6 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/court.png create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/law.png create mode 100644 Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 1a2a8c73ab..287bf96056 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -396,6 +396,15 @@ - 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 @@ -540,6 +549,24 @@ - 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 @@ -603,6 +630,15 @@ - 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 index 0000000000000000000000000000000000000000..fbb8c50593e43a54c2f61f5a8d97fe98bdc090d1 GIT binary patch literal 431 zcmV;g0Z{&lP)gv`SZXI&h7d?+=Mz}li!a~{=o{Fl z&J)<#1wu#}NT;QW&!GN?zYOci&F;?KWkAMtasTgTX7^@mNyYYm0p13qqm{_#^8LXJ z0OIZLYtm?SqQwu}HQezY#0>z&JLivuJ=UN2H4`E;0v1p1uDAL7%AAWT!slKy`T5<) zED;AV?6=V z5Z(X~DYXcTHuX^~3z2DH?m6#zGXU54x`j|>{eb%-Djk3kC=I}EJfxu(cplK30=S|a z)61>tTN9Z8=;hH)TZ9;pm%D)u;L^LNx1z~x7YzV$wB+iGiG;Y<%ln%5)hzE%mR9*u Zd;%Sq$86x@y|e%T002ovPDHLkV1gIT!BhYM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png new file mode 100644 index 0000000000000000000000000000000000000000..789a53802c716b7cdf6c4b6f39d0c1764943123d GIT binary patch literal 552 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_o|n5N2eUHAey{$X?><>&pI|i%p1)iGN3VFi=P~GbEzKIX^cyHLnE7WngeFN=+|oS*v4Q~|FyB5=lQz5 z%l0t?MLIvFR!`&1m1#J8{R)H65v`V=^CD)w;#(l9aFfw3Y7x(Bew!m+!Dkuk>;E5G zRRPkvknht6mo}evs}sg+>^@9r6!~0W_2B>i`Up|w<#`d)T+Yqf5oE9Txh+j9qV|EJ zjkVI{9ZmCJxqjT4z1~wRV}%$~53?ZaiD}y$n{Rt~Pg!Vtnq}VG3Eu8sRxI@5FfcYu zTq`^w*nVd!!$Fe|^BWr*d#6r(c-;R_DbuFp74z6$P2!dO_jrZ)1#XR577Wwgen{P1 zd_8XRTwckITf2JS9GVclS)}>Ae4ODN>n&W_{~K7tqvwS?^k{vpf4aqZ!#>83H)r3H mo!oBj|L~10Z^iW-5e9~dwBB{R=L5O2=RgTEE5c|%4uil z=Kv5`ec&OS9qJ%Yt}(Nx;p8M2RwQBPF|&=QO~VAKIb zIRKOcNXhG@V|`*Nl)RYJveTiUG?biFyWd*=7I$ N002ovPDHLkV1g0hiWdL? 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 e2cbbff989..9a5f64759b 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, 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", @@ -250,6 +250,14 @@ ] ] }, + { + "name": "court", + "delays": [ + [ + 1 + ] + ] + }, { "name": "cryogenics", "delays": [ @@ -806,6 +814,14 @@ ] ] }, + { + "name": "janitor", + "delays": [ + [ + 1 + ] + ] + }, { "name": "laser", "delays": [ @@ -814,6 +830,14 @@ ] ] }, + { + "name": "law", + "delays": [ + [ + 1 + ] + ] + }, { "name": "magnetics", "delays": [ @@ -926,6 +950,14 @@ ] ] }, + { + "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 index 0000000000000000000000000000000000000000..9b0761c1bb42c81946926611c7e312ef5a29c8bc GIT binary patch literal 582 zcmV-M0=fN(P)azaO>tL=C^u5UPvhxg-YU9a29ui0h-v5jX1u$jZC)BMb?8hIJVaWoo@@@qn& zpDP-30nl73nKYufC@DZO8om&v05ab&fFVoHUbe}U_&_)TWY~M%IIl~xYtCB2Krok3 zKJrQd43Z)RIto|^g!=E(2ug()fHuWUA;g4hgLQ}i`})WU0D8RunPY-s#^&Y699^D13!S`?4ExW^#|{j0bq_Jx%Y>Ogs`3ELlyjKR(4aJTKHD{2YlRS UT)*ABrvLx|07*qoM6N<$g2f{Qvj6}9 literal 0 HcmV?d00001 -- 2.51.2