From 2fd0e9ce5aa8a4ce4174f194a4e612cc7c1ca970 Mon Sep 17 00:00:00 2001
From: Fluffiest Floofers <thebluewulf@gmail.com>
Date: Thu, 21 Sep 2023 21:06:35 +0200
Subject: [PATCH] wgw restored, fix some file placements (#33)

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
---
 .../Prototypes/Catalog/Fills/Crates/fun.yml   |   2 +-
 .../Structures/Wallmounts/Signs/posters.yml   |  19 +++++++++++
 .../Structures/Wallmounts/posters.yml         |   9 -----
 .../Markers/Spawners/Random/paintings.yml     |   2 +-
 .../Markers/Spawners/Random/posters.yml       |  32 ++++++++++--------
 .../Wallmounts/Signs}/bar_sign.yml            |   0
 .../Wallmounts/Signs}/paintings.yml           |   0
 .../Wallmounts/Signs}/posters.yml             |   0
 .../Wallmounts/Signs}/signs.yml               |   0
 .../Wallmounts/Posters/misc.rsi/meta.json     |  14 ++++++++
 .../Posters/misc.rsi/woodygotwood.png         | Bin 0 -> 2008 bytes
 11 files changed, 52 insertions(+), 26 deletions(-)
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml
 delete mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/posters.yml
 rename Resources/Prototypes/Nyanotrasen/Entities/{Wallmount => Structures/Wallmounts/Signs}/bar_sign.yml (100%)
 rename Resources/Prototypes/Nyanotrasen/Entities/{Wallmount => Structures/Wallmounts/Signs}/paintings.yml (100%)
 rename Resources/Prototypes/Nyanotrasen/Entities/{Wallmount => Structures/Wallmounts/Signs}/posters.yml (100%)
 rename Resources/Prototypes/Nyanotrasen/Entities/{Wallmount => Structures/Wallmounts/Signs}/signs.yml (100%)
 create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/woodygotwood.png

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index cffe592c5c..c5cf3f9239 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -24,7 +24,7 @@
       - id: PlushieXeno
       - id: PlushieHampter
       - id: PlushieMoth
-      - id: PlushieMothRandom # Nyanotrasen Random Moth Plushies
+      - id: PlushieMothRandom # Nyanotrasen - Random Moth Plushies
         amount: 2
 
 - type: entity
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml
new file mode 100644
index 0000000000..b0548d0e1b
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml
@@ -0,0 +1,19 @@
+- type: entity
+  parent: PosterBase
+  id: PosterLegitFuckAround
+  name: Fuck Around...
+  description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi
+    state: fuckaround
+
+- type: entity
+  parent: PosterBase
+  id: PosterContrabandGotWood
+  name: "Got Wood?"
+  description: "A grimy old advert for a seedy lumber company. \"You got a friend in me.\" is scrawled in the corner."
+  components:
+  - type: Sprite
+    sprite: DeltaV/Structures/Wallmounts/Posters/misc.rsi
+    state: woodygotwood
diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/posters.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/posters.yml
deleted file mode 100644
index fc27e243a0..0000000000
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/posters.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  parent: PosterBase
-  id: PosterLegitFuckAround
-  name: Fuck Around...
-  description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch.
-  components:
-  - type: Sprite
-    sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi
-    state: fuckaround
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
index 26af0f7ef9..fc537d240b 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml
@@ -32,5 +32,5 @@
       - PaintingEmpty
       - PaintingMoony
       - PaintingAmogusTriptych
-      - PaintingMothBigCatch # Nyanotrasen Painting, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/painting.yml
+      - PaintingMothBigCatch # Nyanotrasen Painting, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/painting.yml
     rareChance: 0.01
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
index cd9b33b54b..06b2f90cf6 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml
@@ -91,8 +91,9 @@
       - PosterContrabandEnlistGorlex
       - PosterContrabandInterdyne
       - PosterContrabandWaffleCorp
-      - PosterContrabandSaucerNumberOne # Nyanotrasen Poster
-      - PosterContrabandBreadLies # Nyanotrasen Poster
+      - PosterContrabandSaucerNumberOne # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterContrabandBreadLies # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterContrabandGotWood # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
     chance: 1
 
 - type: entity
@@ -151,17 +152,18 @@
       - PosterLegitPeriodicTable
       - PosterLegitRenault
       - PosterLegitNTTGC
-      - PosterLegitDejaVu # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitDontPanic # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitBarDrinks # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitBotanyFood # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitHotDonkExplosion # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitEatMeat # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitMoreBread # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitPieSlice # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitPizzaHope # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitMedicate # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitNoTouching # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitChknDnnr # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
-      - PosterLegitShoukou # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
+      - PosterLegitDejaVu # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitDontPanic # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitBarDrinks # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitBotanyFood # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitHotDonkExplosion # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitEatMeat # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitMoreBread # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitPieSlice # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitPizzaHope # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitMedicate # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitNoTouching # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitChknDnnr # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitShoukou # Nyanotrasen Poster, see Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmount/Signs/posters.yml
+      - PosterLegitFuckAround # DeltaV Poster, see Resources/Prototypes/DeltaV/Entities/Structures/Wallmount/Signs/posters.yml
     chance: 1
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Wallmount/bar_sign.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/bar_sign.yml
similarity index 100%
rename from Resources/Prototypes/Nyanotrasen/Entities/Wallmount/bar_sign.yml
rename to Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/bar_sign.yml
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Wallmount/paintings.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/paintings.yml
similarity index 100%
rename from Resources/Prototypes/Nyanotrasen/Entities/Wallmount/paintings.yml
rename to Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/paintings.yml
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml
similarity index 100%
rename from Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml
rename to Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/posters.yml
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Wallmount/signs.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/signs.yml
similarity index 100%
rename from Resources/Prototypes/Nyanotrasen/Entities/Wallmount/signs.yml
rename to Resources/Prototypes/Nyanotrasen/Entities/Structures/Wallmounts/Signs/signs.yml
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/meta.json b/Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/meta.json
new file mode 100644
index 0000000000..cc9d07d2d2
--- /dev/null
+++ b/Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from  at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "woodygotwood"
+        }
+    ]
+}
diff --git a/Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/woodygotwood.png b/Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/woodygotwood.png
new file mode 100644
index 0000000000000000000000000000000000000000..8092daeddeb5afcd81885acdb6bf9daec915fe26
GIT binary patch
literal 2008
zcmV;}2PgQ6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<Yib+I4RCt{2SN(5ZRUQA_bMJkgXV1F!*-LA6Tdk2Oi8zrc+RUhH
zgsqG@XF(AsNEXOkvXWqsFrvU58AE3>lD)(%O!;Aq80~6lfkBb30T!oDT%3|DNW0OO
zwLE=&Uhh5U_&Mj^wol_90Eyh@>^}FreLvsN`F_6VI}h*k^C5r_27q-pd`<I#Y35N{
z0ot)|trQ&g#Y6TH!etZD2M45z=D~67n@b`1+liZ<#y|7htefrY?dfy8*-h4b{%Yik
zQ>a;zfppR+2CMPro3CN#hA||3jRa@*PCNkN`jK%*#0FdxN<(&=T;Uz0lMQek3D>Jb
zAwLMELgWjB^a`k1?Bkk-YD|s~qO+@ao&n=|{qj0ox>7<akwAJ;0?)njI@((1jk{h3
z8$Y%WFJ<>2a)8FIHv&~&13`?y^HXsBBzj)#z@fYTic+`?gOd(k9li;ks6oThEJm|e
zXwPz50f2wyQW37}AeBne_(imB=!fs6@!Hh==>5|P?7!m@T%idhfsT&DIC{_9q!|$y
zLpk?2cJU6Z%+x{hE0vT4sIh7(*Swb^Gb?dvnqy%ZQU+Y~Y9#|esLG_*;lu>D5=hc>
z-#4BoaYM`9czGhlaStau4&tfpStQ*n*0^xAHKcSszP$7q>^|{Hbllg6Fccgc<(yhv
zzpNc^l^^2KiWo8G;$ZFwAd+z05+(~}ehX5sVgL!-JW^{G(=RMeyv0EK2--)E*duuQ
z_^<HCAOFjOHr{)FePqW{1Rg8*QAs=3+Ea3&3e3QGxC#Y13SV4B1}-C+hyZkVAH#2V
zyv@yr*<X(n`qS_{6Y<e;7z;)xCRS3M-+p)}zVV}j=zFLe#c~7p);O2jhDAJDNid4W
z1p{*d0Bxm|;k$%DW~>(p&j8Ta(t0m$KXec$?~AAo?N}H|jfyZ-nm(U984#Y!GuGx?
zTJKF;p3ye&^2&=P>>2!(3`A6W4x`wOVjvMSaLdYj@jV*%yogcbt?xxz|H105cI};y
zXdB9g>YA!$2w?Qy2p5KajZdt~W2P)IaM`!s|1Sed<1453BU_(9<K;XyN`<?Rei6^M
zy-u$rjZ64}MDUD*o{Rlx+H*6`KKhS26-14&PmII6=X#tcqu2cGHvDtXInwT+{=l!X
z;zAB<NK>Az;JP?dwRj$Yd0Z~?**t>rna!RWI)mT=BM$;JY=$(z%*a!~nSY;z`i@DN
z3`u4Bqb!<i{wTasKo1oz{Ovg8H(f~Ih4+Oz^l|N1_maPoM0u~6O#`!ez~~s(xTm8H
z9n-5}-}YN0YAWtGDLU>mIu??^$()EA7)j520yq6Z;q1>9wj5FzZv#%#V$*{X;lZ$i
z0dA1G3&?jG1{BWld;MN&`+kjH8rXbH+Mp7SLh)8%0lmbwr7N`5o77uaC(wB6-54Ml
z;rVE0N~Hvv2rjq7o#R_EfJ9{;kd|YO3tarE2kGse=uG=KcJmR5;tvHgm_`pB+x&Zp
z&Tj!*o@0ND3y0pGVt;FI8O5~%FVKP3vw=-Sn?s3GnR7yWx1pCtzy2^V@fbfAR{$^<
zg?WV17M(V{R^;nhmLkRINL$bg$JzBfU#)+Z$bBh^z}zR4#f`^Z8|1IJ0_z?FCLbXy
zZoI{u3`v)iMhy-EB9|gc7>bA$`|R7$NrO_F4LFCJN>|upQPjO86DlD<rxDO_i77p#
zj)Ty_qM-myjQr_`1p=-KO-9remyt;hZ#*q<?e|I30fFY9XiWdq#abcJz0<>{qk&B{
z8;N@6HXqHDLVK%^%_l=E#Z6>ox+RHb=7Ha}_}J9VjRS!j0|%wRMM&_cIdSbS2Q$BL
zP!{udLIi*xpJ6Mt18ex6+3zA{Za$)1%Qmy!WrXwkHEM7pRWy@<nOl9^XJzO`d4C<(
zPkvXROvGh+UGiMM1+L@osV8Cv4C+c5x*Y8J+<K&IndcK#xT?X&syc-*H^#9NGMOcI
z&M$ZELrvPpom+2@sv8Ft6;Je!A{fO$99Xd)SJw^^c!;T~EOPlA#;5Zb%vNJ!It}si
zlNCW|N-63#pS^$;t3Qi0v)|b8Fa&j+GSx^9IJWNz?AW#yHFc};M#pbh8$^*;8LFnP
z&=v%Pe0>u)Phf2HGOzl;#+h-ZZs{n>YWc$JING92J(Iq{^Z3h%;A9`m8m@((NWv|o
zuq2(pqD(!;hX-)3|2@0vy2j;Lpou62P}V@U>rwP?xCO=H1TQEaMPQ^^#!OM5kSooK
zU_KG$Cr9X2RBWcI8*TBC%O@F3DfGAR!nZeVM46j(b#`Fe_BPCny^9yRI!&oL$3dJw
zEr`ith}wJsios}#Ta!nW_E~FIA)jZqj3}H>#oAQBCI|4NINgubl8<A0=<gPYz3;1Q
zksTSpz<3ea;eJ%FSc(2@p&}1Bb3b)lrwwH5DOY-KBpsC40!&W*2SE_h*$MzAaE6E9
zi7F$TjChvnJcCKcK_#*Kz~Q)GWA~BcG3eRk6kUl?0TdOh#={q%ecUqYntVZa-Pw}d
q)Do2dPP0D8`}BM;{%7=m4dA~w;E%+vH!Xtz0000<MNUMnLSTZ%s>?<I

literal 0
HcmV?d00001