diff --git a/Resources/Locale/en-US/barsign/barsign-component.ftl b/Resources/Locale/en-US/barsign/barsign-component.ftl index cf7ddd1e24..af9bfa56b2 100644 --- 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 721b5e1320..653031133c 100644 --- 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 e3f9d30a42..3bfeedbe44 100644 --- 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 index 0000000000..bbe6df843f 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 a7b77a84fd..ab57aa99cb 100644 --- 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 index 0000000000..894d19286d Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png differ