From 735bbf93a919a42b3d6d98049d24e9d3cedba666 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 25 Apr 2025 01:44:54 +0200 Subject: [PATCH] Change some posters to be rules-compliant (#32734) * Initial commit * Minor edit * it's very hard to fit "disorder" * Revert No ERP poster, fix spawner * Attribution * Update text * Missed poster spawner --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- .../Markers/Spawners/Random/posters.yml | 4 ++-- .../Structures/Wallmounts/Signs/posters.yml | 12 ++++++------ .../Wallmounts/posters.rsi/meta.json | 2 +- .../posters.rsi/poster36_contraband.png | Bin 1233 -> 16499 bytes .../posters.rsi/poster4_contraband.png | Bin 1954 -> 17502 bytes Resources/migration.yml | 4 ++++ 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 103278d896..de82e7b6f0 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -34,7 +34,7 @@ - PosterContrabandFreeTonto - PosterContrabandAtmosiaDeclarationIndependence - PosterContrabandFunPolice - - PosterContrabandLustyExomorph + - PosterContrabandRealExomorph - PosterContrabandSyndicateRecruitment - PosterContrabandClown - PosterContrabandSmoke @@ -65,7 +65,7 @@ - PosterContrabandPunchShit - PosterContrabandTheGriffin - PosterContrabandFreeDrone - - PosterContrabandBustyBackdoorExoBabes6 + - PosterContrabandRouny - PosterContrabandRobustSoftdrinks - PosterContrabandShamblersJuice - PosterContrabandPwrGame diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 25bcb5b93a..132318ee47 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -79,9 +79,9 @@ - type: entity parent: PosterBase - id: PosterContrabandLustyExomorph - name: "Lusty Exomorph" - description: "A heretical poster depicting the titular star of an equally heretical book." + id: PosterContrabandRealExomorph + name: "Real! Exomorph" + description: "A conspiratorial poster about dangerous alien lifeforms." components: - type: Sprite state: poster4_contraband @@ -358,9 +358,9 @@ - type: entity parent: PosterBase - id: PosterContrabandBustyBackdoorExoBabes6 - name: "Busty Backdoor Exo Babes 6" - description: "Get a load, or give, of these all natural Exos!" + id: PosterContrabandRouny + name: "Have You Seen Him?" + description: "An old poster for a missing alien. Where did he run off to?" components: - type: Sprite state: poster36_contraband diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index 46f2b816dc..e58aaad6d0 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_, poster52_legit by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, modified by Spessmann, poster54_legit by hex_reject on Discord.", + "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_, poster4_contraband edited, poster36_contraband and poster52_legit made by SlamBamActionman, poster53_legit and the original version by @RCOI on discord, modified by Spessmann, poster54_legit by hex_reject on Discord.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_contraband.png index ef9e2f2803013124446edcdbcfb7225d17eb5d4a..bc21e9b2f8129d800c78f2a46d34404e09d51735 100644 GIT binary patch literal 16499 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 delta 1194 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