From babb5ec69d5ef9d5e9c8a87d8586f41fa432fb2c Mon Sep 17 00:00:00 2001 From: Swept Date: Sat, 22 Aug 2020 17:20:02 -0700 Subject: [PATCH] Removes old/cruddy bar signs --- .../Entities/Constructible/Walls/bar_sign.yml | 6 +- Resources/Prototypes/bar_signs.yml | 87 +----------------- .../Misc/barsign.rsi/honkednloaded.png | Bin 730 -> 0 bytes .../Constructible/Misc/barsign.rsi/meta.json | 67 ++++++-------- .../Misc/barsign.rsi/oldcockinn.png | Bin 1324 -> 0 bytes .../Misc/barsign.rsi/robustacafe.png | Bin 0 -> 1334 bytes .../Misc/barsign.rsi/thegreytide.png | Bin 568 -> 0 bytes 7 files changed, 34 insertions(+), 126 deletions(-) delete mode 100644 Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png delete mode 100644 Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png create mode 100644 Resources/Textures/Constructible/Misc/barsign.rsi/robustacafe.png delete mode 100644 Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png 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 15b94d57733d37002ff4106139c643d467ad51d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 730 zcmV<00ww*4P)R15u03ZJV0RLcM|Ahx_K|Kf`O|Nk=W zvQ_{900DGTPE!Ct=GbNc00L4;L_t(o!|j*bdZZu>fa@5+sG;)yFS|LR*s3$y*>Crv z5eL*lesd~*eEiCPAnk2=(|ousxH!`XMIxr;Q;_x^Ug2Jlji^dgEs8|1InH1$q@jNEjq){wgbQ*C-BI6)z5u%1VCh~ z&PX8;BFTw7qQJdALc6sOK%@looJ^zr3}8q56oBYc20|3OGAPlQ5%Bx#sUQR<$Kb!$nX~;C5hLU-jdun}p5#VnWBE7QsU#rm-fN7e( zjgA2JM1uS4=nBB3QV*^Hcz#ubYXGJ;i);us0FvHjWodc_u%g4cl@ia7JYPoBK0tE{ z(D!-fqwfy@f+d+0x)Op?b2Q}@x{s+#QKz2(G>yl(o{e2ILC^a0V}4{N=yzSP20E4` z^eV&;d*P3d^oa5XJsbjPQ^j8JO3_gOv48-yM*vF!F7*dX(P6c@V+(YdQQ#RsIhsw~ z%^63``6vx5fO2>pa&@`m`CUHQ51d&*BxcO9eF0#{0wOVDjBp0ftZ)4#2Am+q_6)#$ zUj7NyG2k}H8Q_H-(cL|vN4-|xDhpoO6aM2}@sGc3?tfSOewDKP0eGBBoh~YaasU7T M07*qoM6N<$f&j}tZU6uP 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 537d07a1e619f41ae4099d500caf47e394e715a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1324 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