Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1871 from SweptWasTaken/goodbyebarsigns

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-09-02 23:10:39 +02:00
committed by GitHub
parent 40f967a03a b9f6178b5b
commit 0a1d41d53a
25 changed files with 625 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Resources/Prototypes/Entities/Constructible/Walls/bar_sign.yml
View File

@@ -15,11 +15,35 @@
- type: PowerReceiver
- type: BarSign
- type: entity
id: LargeBarSign
name: large bar sign
components:
- type: Clickable
- type: InteractionOutline
- type: Collidable
- type: Sprite
drawdepth: WallTops
sprite: Constructible/Misc/sylphs.rsi
state: sylph
- type: Icon
sprite: Constructible/Misc/sylphs.rsi
state: sylph
- type: PowerReceiver
- type: BarSign
- type: entity
id: BarSignMalteseFalcon
name: Maltese Falcon
id: BarSignEngineChange
name: The Engine Change
parent: BarSign
components:
- type: BarSign
current: MalteseFalcon
current: EngineChange
- type: entity
id: BarSignCyberSylph
name: Cyber Sylph
parent: LargeBarSign
components:
- type: BarSign
current: CyberSylph

127
Resources/Prototypes/bar_signs.yml
View File

@@ -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,30 +58,12 @@
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"
icon: "thealenath"
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."
- type: barSign
id: TheNet
name: "The Net"
@@ -154,6 +76,42 @@
icon: "maidcafe"
description: "Welcome back, master!"
- type: barSign
id: MalteseFalcon
name: "Maltese Falcon"
icon: "maltesefalcon"
description: "Play it again, sam."
- type: barSign
id: TheSun
name: "The Sun"
icon: "thesun"
description: "Ironically bright for such a shady bar."
- type: barSign
id: TheBirdCage
name: "The Birdcage"
icon: "birdcage"
description: "Caw caw!"
- type: barSign
id: Zocalo
name: "Zocalo"
icon: "zocalo"
description: "Anteriormente ubicado en Spessmerica."
- type: barSign
id: LV426
name: "LV-426"
icon: "lv426"
description: "Drinking with fancy facemasks is clearly more important than going to medbay."
- type: barSign
id: WiggleRoom
name: "The Wiggle Roomm"
icon: "thewiggleroom"
description: "MoMMIs got moves."
- type: barSign
id: TheLightbulb
name: "The Lightbulb"
@@ -172,6 +130,12 @@
icon: "enginechange"
description: "Still waiting."
- type: barSign
id: Emprah
name: "4 The Emprah"
icon: "emprah"
description: "Enjoyed by fanatics, heretics, and brain-damaged patrons alike."
# Hidden signs list below this point
- type: barSign
id: EmpBarSign
@@ -181,13 +145,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: ""

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/LV426.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/alohasnackbar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/birdcage.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/emprah.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/honkednloaded.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 730 B

530
Resources/Textures/Constructible/Misc/barsign.rsi/meta.json
View File

@@ -1 +1,529 @@
{"version":1,"size":{"x":64,"y":32},"states":[{"name":"alohasnackbar","directions":1,"delays":[[1.0]]},{"name":"combocafe","directions":1,"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]]},{"name":"emergencyrumparty","directions":1,"delays":[[1.0,1.0,1.0,5.0,1.0,1.0,1.0,1.0]]},{"name":"empbarsign","directions":1,"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]]},{"name":"empty","directions":1,"delays":[[1.0]]},{"name":"goose","directions":1,"delays":[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]]},{"name":"honkednloaded","directions":1,"delays":[[0.4,1.0]]},{"name":"maidcafe","directions":1,"delays":[[1.0,0.03,0.03,0.03,0.03,0.6,0.03,0.03,2.0,0.03,0.03,0.03,0.03,2.0,0.03,0.03]]},{"name":"maltesefalcon","directions":1,"delays":[[3.8,0.4,1.6,0.1,5.6,0.1,0.4,0.1]]},{"name":"officerbeersky","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"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":"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":"scotchservinwill","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"slipperyshots","directions":1,"delays":[[0.4,1.0]]},{"name":"syndibarsign","directions":1,"delays":[[0.1,0.9,2.5,1.0,2.5,0.1,0.05,0.2,0.1,0.05,2.5,1.0,2.5,0.1,0.05,0.2,0.1,0.05,2.5,1.0]]},{"name":"the_lightbulb","directions":1,"delays":[[0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,1.6,0.1,1.3,0.2,2.0,0.3]]},{"name":"theadminbus","directions":1,"delays":[[2.5,1.5]]},{"name":"thealenath","directions":1,"delays":[[1.8,0.1,0.1,0.1,0.1,1.6,0.1,0.1,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.3,0.1,0.1]]},{"name":"thebark","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"thecavern","directions":1,"delays":[[1.0,4.5,0.2,1.5]]},{"name":"thecoderbus","directions":1,"delays":[[2.5,1.5]]},{"name":"thedrunkcarp","directions":1,"delays":[[0.5,0.1,0.4,1.0,0.5,0.3,0.1,1.0]]},{"name":"thegreytide","directions":1,"delays":[[0.4,1.0]]},{"name":"theharmbaton","directions":1,"delays":[[3.0,0.4,1.6,0.1,3.4,0.1,0.4,0.1,0.8]]},{"name":"thenest","directions":1,"delays":[[0.6,0.6,0.6,0.6,0.6,0.2,0.2,0.6,0.6,0.4,0.1,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.1,0.4,0.1,0.4,0.4]]},{"name":"thenet","directions":1,"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]]},{"name":"theouterspess","directions":1,"delays":[[1.0,1.0]]},{"name":"theshaken","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":"thesingulo","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"thewretchedhive","directions":1,"delays":[[0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.4,0.1,0.1,0.1,0.4]]},{"name":"vladssaladbar","directions":1,"delays":[[1.0]]},{"name":"enginechange","directions":1,"delays":[[0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2,0.2]]}]}
{
"version": 1,
"size": {
"x": 64,
"y": 32
},
"license": "CC-BY-SA 3",
"copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715",
"copyright": "https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae",
"states": [
{
"name": "combocafe",
"directions": 1,
"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
]
]
},
{
"name": "thewiggleroom",
"directions": 1,
"delays": [
[
0.4,
0.8,
0.4,
0.8
]
]
},
{
"name": "thesun",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "lv426",
"directions": 1,
"delays": [
[
1,
1
]
]
},
{
"name": "birdcage",
"directions": 1,
"delays": [
[
0.4,
0.8
]
]
},
{
"name": "zocalo",
"directions": 1,
"delays": [
[
1,
1
]
]
},
{
"name": "emergencyrumparty",
"directions": 1,
"delays": [
[
1,
1,
1,
5,
1,
1,
1,
1
]
]
},
{
"name": "empbarsign",
"directions": 1,
"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
]
]
},
{
"name": "empty",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "goose",
"directions": 1,
"delays": [
[
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5,
0.5
]
]
},
{
"name": "maidcafe",
"directions": 1,
"delays": [
[
1,
0.03,
0.03,
0.03,
0.03,
0.6,
0.03,
0.03,
2,
0.03,
0.03,
0.03,
0.03,
2,
0.03,
0.03
]
]
},
{
"name": "officerbeersky",
"directions": 1,
"delays": [
[
3,
0.4,
1.6,
0.1,
3.4,
0.1,
0.4,
0.1,
0.8
]
]
},
{
"name": "the_lightbulb",
"directions": 1,
"delays": [
[
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
1.6,
0.1,
1.3,
0.2,
2,
0.3
]
]
},
{
"name": "thealenath",
"directions": 1,
"delays": [
[
1.8,
0.1,
0.1,
0.1,
0.1,
1.6,
0.1,
0.1,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.3,
0.1,
0.1
]
]
},
{
"name": "thecoderbus",
"directions": 1,
"delays": [
[
2.5,
1.5
]
]
},
{
"name": "thedrunkcarp",
"directions": 1,
"delays": [
[
0.5,
0.1,
0.4,
1,
0.5,
0.3,
0.1,
1
]
]
},
{
"name": "theharmbaton",
"directions": 1,
"delays": [
[
3,
0.4,
1.6,
0.1,
3.4,
0.1,
0.4,
0.1,
0.8
]
]
},
{
"name": "thenet",
"directions": 1,
"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
]
]
},
{
"name": "theouterspess",
"directions": 1,
"delays": [
[
1,
1
]
]
},
{
"name": "emprah",
"directions": 1,
"delays": [
[
1,
1
]
]
},
{
"name": "thesingulo",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"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": "maltesefalcon",
"directions": 1,
"delays": [
[
3.8,
0.4,
1.6,
0.1,
5.6,
0.1,
0.4,
0.1
]
]
},
{
"name": "thewretchedhive",
"directions": 1,
"delays": [
[
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.4,
0.1,
0.1,
0.1,
0.4
]
]
},
{
"name": "enginechange",
"directions": 1,
"delays": [
[
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
]
]
}
]
}

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/oldcockinn.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/scotchservinwill.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/slipperyshots.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 584 B

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/syndibarsign.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/theadminbus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 723 B

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/thebark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/thecavern.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/thegreytide.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 568 B

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/thenest.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/theshaken.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/thesun.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/thewiggleroom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/vladssaladbar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 766 B

BIN
Resources/Textures/Constructible/Misc/barsign.rsi/zocalo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

27
Resources/Textures/Constructible/Misc/sylphs.rsi/meta.json Normal file
View File

@@ -0,0 +1,27 @@
{
"version": 1,
"size": {
"x": 96,
"y": 96
},
"license": "CC-BY-SA 3",
"copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715",
"states": [
{
"name": "sylph",
"directions": 1,
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
}
]
}

BIN
Resources/Textures/Constructible/Misc/sylphs.rsi/sylph.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
Resources/Textures/Constructible/Misc/sylphs.rsi/sylphicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB