diff --git a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml index 0c3aeb82aa..46c4187b07 100644 --- a/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml +++ b/Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml @@ -17,9 +17,9 @@ - type: entity - id: BarSignMalteseFalcon - name: Maltese Falcon + id: BarSignEngineChange + name: The Engine Change parent: BarSign components: - type: BarSign - current: MalteseFalcon + current: EngineChange diff --git a/Resources/Prototypes/bar_signs.yml b/Resources/Prototypes/bar_signs.yml index 61854e558f..b7986002b4 100644 --- a/Resources/Prototypes/bar_signs.yml +++ b/Resources/Prototypes/bar_signs.yml @@ -1,15 +1,3 @@ -- type: barSign - id: MalteseFalcon - name: "Maltese Falcon" - icon: "maltesefalcon" - description: "The Maltese Falcon, Space Bar and Grill." - -- type: barSign - id: TheBark - name: "The Bark" - icon: "thebark" - description: "Ian's bar of choice." - - type: barSign id: Harmbaton name: "The Harmbaton" @@ -28,72 +16,24 @@ icon: "thedrunkcarp" description: "Don't drink and swim." -- type: barSign - id: ScotchServinWill - name: "Scotch Servin Willy's" - icon: "scotchservinwill" - description: "Willy sure moved up in the world from clown to bartender." - - type: barSign id: OfficerBeersky name: "Officer Beersky's" icon: "officerbeersky" description: "Man eat a dong, these drinks are great." -- type: barSign - id: TheCavern - name: "The Cavern" - icon: "thecavern" - description: "Fine drinks while listening to some fine tunes." - - type: barSign id: TheOuterSpess name: "The Outer Spess" icon: "theouterspess" description: "This bar isn't actually located in outer space." -- type: barSign - id: SlipperyShots - name: "Slippery Shots" - icon: "slipperyshots" - description: "Slippery slope to drunkeness with our shots!" - -- type: barSign - id: TheGreyTide - name: "The Grey Tide" - icon: "thegreytide" - description: "Abandon your toolboxing ways and enjoy a lazy beer!" - -- type: barSign - id: HonkednLoaded - name: "Honked 'n' Loaded" - icon: "honkednloaded" - description: "Honk." - -- type: barSign - id: TheNest - name: "The Nest" - icon: "thenest" - description: "A good place to retire for a drink after a long night of crime fighting." - - type: barSign id: TheCoderbus name: "The Coderbus" icon: "thecoderbus" description: "A very controversial bar known for its wide variety of constantly-changing drinks." -- type: barSign - id: TheAdminbus - name: "The Adminbus" - icon: "theadminbus" - description: "An establishment visited mainly by space-judges. It isn't bombed nearly as much as court hearings." - -- type: barSign - id: OldCockInn - name: "The Old Cock Inn" - icon: "oldcockinn" - description: "Something about this sign fills you with despair." - - type: barSign id: TheWretchedHive name: "The Wretched Hive" @@ -118,18 +58,6 @@ icon: "combocafe" description: "Renowned system-wide for their utterly uncreative drink combinations." -- type: barSign - id: VladsSaladBar - name: "Vlad's Salad Bar" - icon: "vladssaladbar" - description: "Under new management. Vlad was always a bit too trigger happy with that shotgun." - -- type: barSign - id: TheShaken - name: "The Shaken" - icon: "theshaken" - description: "This establishment does not serve stirred drinks." - - type: barSign id: TheAleNath name: "The Ale' Nath" @@ -137,10 +65,10 @@ description: "All right, buddy. I think you've had EI NATH. Time to get a cab." - type: barSign - id: TheAlohaAnackbar - name: "The Aloha Snackbar" - icon: "alohasnackbar" - description: "A tasteful, inoffensive tiki bar sign." + id: TheFemboyBar + name: "Femboy Hooters" + icon: "femboy" + description: "There's something off about the waitresses, you just can't tell what..." - type: barSign id: TheNet @@ -181,13 +109,6 @@ rename_area: false hidden: true -- type: barSign - id: SyndiBarSign - name: "Syndi Cat" - icon: "syndibarsign" - description: "Syndicate or die." - hidden: true - - type: barSign id: SignOff name: "" diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png b/Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png deleted file mode 100644 index 15b94d5773..0000000000 Binary files a/Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json b/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json index c53f83374b..c3febf76c0 100644 --- a/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json +++ b/Resources/Textures/Constructible/Misc/barsign.rsi/meta.json @@ -134,16 +134,6 @@ ] ] }, - { - "name": "honkednloaded", - "directions": 1, - "delays": [ - [ - 0.4, - 1 - ] - ] - }, { "name": "maidcafe", "directions": 1, @@ -185,26 +175,6 @@ ] ] }, - { - "name": "oldcockinn", - "directions": 1, - "delays": [ - [ - 1.8, - 0.1, - 0.1, - 0.6, - 0.8, - 0.6, - 0.8, - 0.6, - 2.4, - 0.1, - 0.1, - 0.1 - ] - ] - }, { "name": "the_lightbulb", "directions": 1, @@ -288,16 +258,6 @@ ] ] }, - { - "name": "thegreytide", - "directions": 1, - "delays": [ - [ - 0.4, - 1 - ] - ] - }, { "name": "theharmbaton", "directions": 1, @@ -409,6 +369,33 @@ ] ] }, + { + "name": "robustacafe", + "directions": 1, + "delays": [ + [ + 1.8, + 0.1, + 0.1, + 0.1, + 0.1, + 1.6, + 0.1, + 0.1, + 0.6, + 0.6, + 0.6, + 0.6, + 0.6, + 0.6, + 0.6, + 0.6, + 0.6, + 0.1, + 0.1 + ] + ] + }, { "name": "femboy", "directions": 1, diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png b/Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png deleted file mode 100644 index 537d07a1e6..0000000000 Binary files a/Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png b/Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png new file mode 100644 index 0000000000..2e140b2953 Binary files /dev/null and b/Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png differ diff --git a/Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png b/Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png deleted file mode 100644 index 06561c568a..0000000000 Binary files a/Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png and /dev/null differ