ports two barsigns from frontier (#35296)

* adds two new barsigns

* webedit to fix a typo

* the typo was in two locations

* reformatted meta.json and added attribution links

diff --git a/Resources/Locale/en-US/barsign/barsign-component.ftl b/Resources/Locale/en-US/barsign/barsign-component.ftl
index cf7ddd1e246a3b8b536457fb2af64250ea1087a8..af9bfa56b28cd8326638350b6c3cb358a9095875 100644 (file)
--- a/Resources/Locale/en-US/barsign/barsign-component.ftl
+++ b/Resources/Locale/en-US/barsign/barsign-component.ftl
@@ -96,6 +96,14 @@ barsign-prototype-description-emprah = Enjoyed by fanatics, heretics, and brain-
 barsign-prototype-name-spacebucks = Spacebucks
 barsign-prototype-description-spacebucks = You can't get away from them, even in space, and even after we started calling them 'spesos' instead.
 
+## Maltroach
+barsign-prototype-name-maltroach = Maltroach
+barsign-prototype-description-maltroach = Squeak!
+
+## Whiskey Echoes
+barsign-prototype-name-whiskeyechoes = Whiskey Echoes
+barsign-prototype-description-whiskeyechoes = An elite bar for elite oper-wait, this is a Nanotrasen station. Why's this sign in the database?
+
 ## EmpBarSign
 barsign-prototype-description-empbarsign = Something has gone very wrong.
 

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 721b5e13202dc95ddf126e57888f46623d06993e..653031133c1f75b1adf4ca1a9b0844157a4edbe5 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -273,3 +273,21 @@
   components:
   - type: BarSign
     current: Spacebucks
+
+- type: entity
+  parent: BaseBarSign
+  id: BarSignMaltroach
+  name: The Maltroach
+  description: Squeak!
+  components:
+  - type: BarSign
+    current: Maltroach
+
+- type: entity
+  parent: BaseBarSign
+  id: BarSignWhiskeyEchoes
+  name: Whiskey Echoes
+  description: An elite bar for elite oper-wait, this is a Nanotrasen station. Why's this sign in the database?
+  components:
+  - type: BarSign
+    current: WhiskeyEchoes

diff --git a/Resources/Prototypes/bar_signs.yml b/Resources/Prototypes/bar_signs.yml
index e3f9d30a42d8d8ab83f8d55aa04849980b1b93f0..3bfeedbe449ea79eb9bb6817ba5c63b534e39bb7 100644 (file)
--- a/Resources/Prototypes/bar_signs.yml
+++ b/Resources/Prototypes/bar_signs.yml
@@ -181,3 +181,19 @@
     sprite: Structures/Wallmounts/barsign.rsi
     state: spacebucks
   description: barsign-prototype-description-spacebucks
+
+- type: barSign
+  id: Maltroach
+  name: barsign-prototype-name-maltroach
+  icon:
+    sprite: Structures/Wallmounts/barsign.rsi
+    state: maltroach
+  description: barsign-prototype-description-maltroach
+
+- type: barSign
+  id: WhiskeyEchoes
+  name: barsign-prototype-name-whiskeyechoes
+  icon:
+    sprite: Structures/Wallmounts/barsign.rsi
+    state: whiskeyechoes
+  description: barsign-prototype-description-whiskeyechoes

diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltroach.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltroach.png
new file mode 100644 (file)
index 0000000..bbe6df8
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltroach.png differ

diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
index a7b77a84fd0ed981f01df99375f2d6a346ab213c..ab57aa99cbb7bc89c1fbb89786f97316b9220969 100644 (file)
--- a/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
@@ -5,9 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715",
-  "copyright": "https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae",
-  "copyright": "https://github.com/space-wizards/space-station-14/commit/b301d3ac26cb2301048eda4535667c28e2283d41 - Made by ProPandaBear for SS14",
+  "copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715, https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae, https://github.com/space-wizards/space-station-14/commit/b301d3ac26cb2301048eda4535667c28e2283d41 - Made by ProPandaBear for SS14, maltroach made by robinthedragon for SS14, based on maltroach by MoffNyan for tgstation at commit https://github.com/tgstation/tgstation/commit/dcf2f8268d21e91dcb9d9d4c199e8e8dd3984d60, whiskeyechoes by cerebralerror (Discord) from frontier station at commit https://github.com/new-frontiers-14/frontier-station-14/commit/9ecd9645151fd03c6b0bfdda104188a2bc73c96b",
   "states": [
     {
       "name": "combocafe",
@@ -496,6 +494,41 @@
           2.2
         ]
       ]
+    },
+    {
+      "name": "maltroach",
+      "delays": [
+        [
+          0.75,
+          0.75,
+          0.75,
+          0.75,
+          0.75,
+          0.75,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "whiskeyechoes",
+      "delays": [
+        [
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1
+        ]
+      ]
     }
   ]
 }

diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png
new file mode 100644 (file)
index 0000000..894d192
Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png differ