From 7f2ba95ba993038d5b1bbe1d2d785ae48bc61116 Mon Sep 17 00:00:00 2001 From: SlamBamActionman Date: Thu, 10 Oct 2024 19:21:46 +0200 Subject: [PATCH 1/2] moff --- .../Markers/Spawners/Random/posters.yml | 6 ++++++ .../Structures/Wallmounts/Signs/posters.yml | 10 ++++++++++ .../Structures/Wallmounts/posters.rsi/meta.json | 3 +++ .../Wallmounts/posters.rsi/poster52_legit.png | Bin 0 -> 15982 bytes 4 files changed, 19 insertions(+) create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_legit.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 4dcc97ad3164b6..fdfe759e0a0f49 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -150,4 +150,10 @@ - PosterLegitPeriodicTable - PosterLegitRenault - PosterLegitNTTGC + - PosterLegitSafetyMothDelam + - PosterLegitSafetyMothEpi + - PosterLegitSafetyMothPiping + - PosterLegitSafetyMothMeth + - PosterLegitSafetyMothHardhat + - PosterLegitSafetyMothSSD chance: 1 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 93124b377d5ab9..e9b976403c3dea 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -1060,6 +1060,16 @@ - type: Sprite state: poster51_legit +- type: entity + parent: PosterBase + id: PosterLegitSafetyMothSSD + name: "Safety Moth - Space Sleep Disorder" + description: "This informational poster uses Safety Mothâ„¢ to tell the viewer about Space Sleep Disorder (SSD), a condition where the person stops reacting to things. \"Treat SSD crew with care! They might wake up at any time!\"" + components: + - type: Sprite + state: poster52_legit + + #maps - type: entity diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index 34d277c984a24b..eb5aa9babf68d9 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -381,6 +381,9 @@ { "name": "poster51_legit" }, + { + "name": "poster52_legit" + }, { "name": "random_legit" }, diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..91954d0edc1dbe13d452fb21f4242018084dd7f0 GIT binary patch literal 15982 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 L% Date: Thu, 10 Oct 2024 19:29:16 +0200 Subject: [PATCH 2/2] Attribution --- Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index eb5aa9babf68d9..933f56495496ff 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_", + "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460, poster63_contraband by discord foboscheshir_, poster52_legit by SlamBamActionman", "size": { "x": 32, "y": 32