]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Change some posters to be rules-compliant (#32734)
authorSlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Thu, 24 Apr 2025 23:44:54 +0000 (01:44 +0200)
committerGitHub <noreply@github.com>
Thu, 24 Apr 2025 23:44:54 +0000 (19:44 -0400)
* 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>
Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_contraband.png
Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png
Resources/migration.yml

index 103278d896b72acef777ef0801fcf2b05fafad36..de82e7b6f0d10b7720c3523c045c33ea603a400b 100644 (file)
@@ -34,7 +34,7 @@
       - PosterContrabandFreeTonto
       - PosterContrabandAtmosiaDeclarationIndependence
       - PosterContrabandFunPolice
-      - PosterContrabandLustyExomorph
+      - PosterContrabandRealExomorph
       - PosterContrabandSyndicateRecruitment
       - PosterContrabandClown
       - PosterContrabandSmoke
@@ -65,7 +65,7 @@
       - PosterContrabandPunchShit
       - PosterContrabandTheGriffin
       - PosterContrabandFreeDrone
-      - PosterContrabandBustyBackdoorExoBabes6
+      - PosterContrabandRouny
       - PosterContrabandRobustSoftdrinks
       - PosterContrabandShamblersJuice
       - PosterContrabandPwrGame
index 25bcb5b93a00a7fb5e1256ca54daffce35ee6555..132318ee47cc44cd774a62a1f341c7fe93600a01 100644 (file)
@@ -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
 
 - 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
index 46f2b816dc91755fcaebe553aacf86287997d295..e58aaad6d05bca0d210612112b7f0d6479af0047 100644 (file)
@@ -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
index ef9e2f2803013124446edcdbcfb7225d17eb5d4a..bc21e9b2f8129d800c78f2a46d34404e09d51735 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster36_contraband.png differ
index 62ea801136d841b7037770a898549105be71a109..61ca22f0536b0ba588b69f6c3a3c1cb4534028ca 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster4_contraband.png differ
index 76109d0c609902b40680ea6f8e9d81770a4a1180..74b2ca987ff1a7a58de49aaf7cc6c4a8c3d1a3d7 100644 (file)
@@ -553,6 +553,10 @@ WeaponSubMachineGunVectorRubber: null
 # 2025-02-11
 WallShuttleInterior: WallShuttle
 
+# 2025-02-18
+PosterContrabandLustyExomorph: PosterContrabandRealExomorph
+PosterContrabandBustyBackdoorExoBabes6: PosterContrabandRouny
+
 # 2025-02-20
 MagazineBoxAntiMaterielBig: null
 MagazineBoxCaselessRifle10x24: null