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 0000000000..8092daedde Binary files /dev/null and b/Resources/Textures/DeltaV/Structures/Wallmounts/Posters/misc.rsi/woodygotwood.png differ