Merge branch 'master' into martialartist

Resources/Changelog/DeltaVChangelog.yml

@@ -43,3 +43,9 @@ Entries:
       message: Added restock box for prideomat that is available in cargo
   id: 7
   time: '2023-09-16T06:26:04.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Add
+      message: Added various posters, signs and paintings.
+  id: 8
+  time: '2023-09-18T13:49:03.0000000+00:00'

Resources/Locale/en-US/nyanotrasen/barsign/barsign-component.ftl

@@ -0,0 +1,7 @@
+## Whiskey Echoes
+barsign-prototype-name-whiskeyecho = Whiskey Echoes
+barsign-prototype-description-whiskeyecho = Wew lad! Sit down and have a drink! No matter your affiliation, the slogan here is 'Death to sobriety!'
+
+## Klub Skub
+barsign-prototype-name-klubskub = Klub Skub
+barsign-prototype-description-klubskub = Skub!

Resources/Prototypes/Entities/Markers/Spawners/Random/paintings.yml

@@ -32,4 +32,5 @@
       - PaintingEmpty
       - PaintingMoony
       - PaintingAmogusTriptych
+      - PaintingMothBigCatch # Nyanotrasen Painting, see Resources/Prototypes/Nyanotrasen/Entities/Wallmount/painting.yml
     rareChance: 0.01

Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml

@@ -91,6 +91,8 @@
       - PosterContrabandEnlistGorlex
       - PosterContrabandInterdyne
       - PosterContrabandWaffleCorp
+      - PosterContrabandSaucerNumberOne # Nyanotrasen Poster
+      - PosterContrabandBreadLies # Nyanotrasen Poster
     chance: 1
 
 - type: entity
@@ -149,4 +151,17 @@
       - 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
     chance: 1

Resources/Prototypes/Nyanotrasen/Entities/Wallmount/bar_sign.yml

@@ -0,0 +1,17 @@
+- type: entity
+  parent: BaseBarSign
+  id: BarSignWhiskeyEcho
+  name: Whiskey Echoes
+  description: Wew lad! Sit down and have a drink! No matter your affiliation, the slogan here is 'Death to sobriety!'
+  components:
+  - type: BarSign
+    current: WhiskeyEcho
+
+- type: entity
+  parent: BaseBarSign
+  id: BarSignKlubSkub
+  name: Klub Skub
+  description: Skub!
+  components:
+  - type: BarSign
+    current: KlubSkub

Resources/Prototypes/Nyanotrasen/Entities/Wallmount/paintings.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: PaintingBase
+  id: PaintingMothBigCatch
+  name: Big Catch
+  description: Depicts a blue moth wearing a tophat who caught a relatively large space carp. 
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Paintings/wabungus.rsi
+    state: bigcatch

Resources/Prototypes/Nyanotrasen/Entities/Wallmount/posters.yml

@@ -0,0 +1,190 @@
+- type: entity
+  parent: PosterBase
+  id: PosterLegitDejaVu
+  name: "Deja Vu Area"
+  description: "This is your first time here. If this station feels familiar, immediately alert a NanoTrasen employee."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Vordenburg.rsi
+    state: poster_dejavu
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitDontPanic
+  name: "Don't Panic"
+  description: "If there was ever something so soothing enough to keep me from panicking, it was a green blob floating through space with a pair of hands, a shiny red tongue, and big round teeth."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Vordenburg.rsi
+    state: poster_dontpanic
+
+- type: entity
+  parent: PosterBase
+  id: PosterContrabandSaucerNumberOne
+  name: "Saucer #1!"
+  description: "Out of every station in the NyanoTrasen jurisdiction, Saucer was rated #1 out of 5! Congratulations!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Vordenburg.rsi
+    state: poster_saucer1
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitBarDrinks
+  name: "Bar Poster"
+  description: "The Bartender is always there to hear your woes and get you plastered all at the same time. Go have a visit!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: BAR
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitBotanyFood
+  name: "Fruit Basket"
+  description: "Botany is always hard at work! Stop by and enjoy the best they can offer!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: BotanyFood
+
+- type: entity
+  parent: PosterBase
+  id: PosterContrabandBreadLies
+  name: "Bread Lies"
+  description: "You have been lied to. There is no \"Big Bread.\" It is not real. Please stop looking for it."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: BreadLies
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitHotDonkExplosion
+  name: "Donk!"
+  description: "Bite into a blast of flavour with any of our #1 rated fattening and unhealthy products for your enjoyment! DONK!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: DONK
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitEatMeat
+  name: "Eat Meat!"
+  description: "Who needs fruit or veggies? EAT MEAT! Build those muscles and go fight in the arena to show them gains!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: EATMEAT
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitMoreBread
+  name: "More Bread!"
+  description: "There is not enough bread! MAKE MORE!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: MoreBread
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitPieSlice
+  name: "Pie Poster"
+  description: "Pies are healthy and delicious! Beg your chef to start making some."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: PIE
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitPizzaHope
+  name: "Pizza Hope"
+  description: "In the darkest of times there is only one hope, PIZZA! Harass your local Quartermaster to order an emergency crate of pizza now!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Huvy.rsi
+    state: PIZZA
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitMedicate
+  name: "Take Your Meds"
+  description: "Possible side effects may include: nausea, upset stomach, inflammation, swelling of the face/throat, rash, fever, headache, dizziness, vomiting and/or diarrhea, easy bruising, seizures, insuppressible yawning, general feeling of discomfort or illness, hives, loss of voice, bleeding gums and/or eyeballs, loss of appetite, increased appetite, sudden onset of explosive crying, x-ray vision, slurred speech, impromptu levitation, incontinence, abrupt uncontrollable outburst of yodeling, insomnia, narcolepsy, leprosy, spontaneous growth of new limbs/genitalia, unstoppable back hair growth, weight loss, weight gain, shrinkage, colorblindness, rectal numbness, acute ability to taste colors, unquenchable bloodlust, restless fingernails, light-sensitivity, compulsion to wear schoolgirl uniforms, scurvy, eagerness to pursue mercenary life, violent craving for goat's blood, insurgent desire to develop a gambling addiction, itchy bumhole. Call your doctor for medical advice about these or any other side effects you may experience." #credit Chris Zappa
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Velcroboy.rsi
+    state: poster_medicate
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitNoTouching
+  name: "No Touching"
+  description: "No touching!"
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Velcroboy.rsi
+    state: poster_notouching
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitChknDnnr
+  name: "Winner Winner Chicken Dinner"
+  description: "An advertisement for crispy fried chicken."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/CerebralError.rsi
+    state: poster_ChknDnnr
+
+- type: entity
+  parent: PosterBase
+  id: PosterLegitShoukou
+  name: "Shōkō poster"
+  description: "Funny symbols that can be read as Shōkō or Xiaogang, depending on who you ask."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Hyenh.rsi
+    state: shoukouposter
+
+# Station Maps
+- type: entity
+  parent: PosterBase
+  id: PosterMapArena
+  name: "Arena Map"
+  description: "A map of Arena station."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Velcroboy.rsi
+    state: arenamap
+
+- type: entity
+  parent: PosterBase
+  id: PosterMapGlacier
+  name: "Glacier Map"
+  description: "A map of Glacier outpost."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Hyenh.rsi
+    state: glaciermap
+
+- type: entity
+  parent: PosterBase
+  id: PosterMapShoukou
+  name: "Shōkō Map"
+  description: "Shōkō no mappu desu."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Hyenh.rsi
+    state: shoukoumap
+
+- type: entity
+  parent: PosterBase
+  id: PosterMapNorthway
+  name: "Northway Map"
+  description: "A map of Northway spaceship."
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/Posters/Hyenh.rsi
+    state: northwaymap

Resources/Prototypes/Nyanotrasen/Entities/Wallmount/signs.yml

@@ -0,0 +1,61 @@
+- type: entity
+  parent: BaseSign
+  id: SignSec
+  name: security sign
+  description: A sign indicating the Security department.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi
+    state: sec
+
+- type: entity
+  parent: BaseSign
+  id: SignLaw
+  name: lawyer sign
+  description: A sign indicating a Lawyer's office.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi
+    state: law
+
+- type: entity
+  parent: BaseSign
+  id: SignCourt
+  name: court sign
+  description: A sign indicating the court.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/signs.rsi
+    state: court
+
+- type: entity
+  parent: BaseSign
+  id: SignLastIdiot
+  name: Zero Days Since Last Idiot
+  description: Must be an Engineering joke.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/last_idiot.rsi
+    state: icon
+    offset: "0.5,0"
+
+- type: entity
+  parent: BaseSign
+  id: SignConspiracyBoard
+  name: conspiracy board
+  description: Perfect for tracking the multiple layers of criminal activities.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/conspiracy_board.rsi
+    state: icon
+    offset: "0.5,0"
+
+- type: entity
+  parent: BaseSign
+  id: SignDojo
+  name: dojo sign
+  description: A sign indicating a place with discipline and tatami mats.
+  components:
+  - type: Sprite
+    sprite: Nyanotrasen/Structures/Wallmounts/doujou.rsi
+    state: doujousign

Resources/Prototypes/Nyanotrasen/bar_signs.yml

@@ -0,0 +1,11 @@
+- type: barSign
+  id: WhiskeyEcho
+  name: barsign-prototype-name-whiskeyecho
+  icon: "whiskeyechoes"
+  description: barsign-prototype-description-whiskeyecho
+
+- type: barSign
+  id: KlubSkub
+  name: barsign-prototype-name-klubskub
+  icon: "klubskub"
+  description: barsign-prototype-description-klubskub  

Resources/Textures/Nyanotrasen/Structures/Wallmounts/Paintings/wabungus.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by wabungus#9109",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "bigcatch"
+        }
+    ]
+}

Resources/Textures/Nyanotrasen/Structures/Wallmounts/Posters/CerebralError.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "CerebralError",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "poster_ChknDnnr"
+        }
+    ]
+}