Skip to content

Commit

Permalink
Gunmetal (DeltaV-Station#79)
Browse files Browse the repository at this point in the history
* Tweak Typewriter, add guns to cargo

Tweaks the Typewriter stats and sounds
Adds mobster entity
Adds guns to cargo and safes to mapping

* Change mafia starting gear location

* Add various drinks, clothes, poster

Added five new drinks, added sprites for moonshine jug and glass, added new uniform and jacket, added new poster.

* Fixed erroneous capitalisation

this happens every time I swear

* Fixed erroneous mistake

there it is again >.<

* Changed Daiquiri recipe because the mojito is a bitch

Title
  • Loading branch information
TadJohnson00 committed Jun 25, 2023
1 parent cfe2c0c commit 5e11dc8
Show file tree
Hide file tree
Showing 39 changed files with 517 additions and 1 deletion.
7 changes: 7 additions & 0 deletions Resources/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -214,3 +214,10 @@ flavor-complex-sapopicante = like tomatoes and spices
flavor-complex-graveyard = like a strong cold brew
flavor-complex-bubbletea = like creamy sweetness
flavor-complex-corncob = like a sick joke
## Velta o.o
flavor-complex-gunmetal = bittersweet and creamy
flavor-complex-lemondrop = refreshingly tart
flavor-complex-greengrass = like a holiday in the sun
flavor-complex-daiquiri = fashionable
flavor-complex-arsonistsbrew = like ash and flame
17 changes: 17 additions & 0 deletions Resources/Locale/en-US/reagents/meta/consumable/drink/alcohol.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -267,3 +267,20 @@ reagent-desc-sapopicante = Tastes nothing like a toad.
reagent-name-graveyard = graveyard
reagent-desc-graveyard = For those shifts that never seem to end.
## Velta o.o

reagent-name-gunmetal = gunmetal
reagent-desc-gunmetal = A controversial drink created by the infamous Solus Cream, the first bartender to serve welding fuel without losing their liquor license.
reagent-name-lemondrop = lemon drop
reagent-desc-lemondrop = A simple, tangy, and tasty drink consisting of lemon, vodka, and simple syrup. Refreshing!
reagent-name-greengrass = green grass
reagent-desc-greengrass = Green grass, or grüne wiese, is a peculiar green cocktail hailing from the now dissolved GDR. Popular amongst the disillusioned and ingenuous alike.
reagent-name-daiquiri = classic daiquiri
reagent-desc-daiquiri = A sweet rum and lime mix, a favourite of writers and politicians.
reagent-name-arsonistsbrew = arsonist's brew
reagent-desc-arsonistsbrew = Take a sip and laugh, while you watch your world burn.
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
ClothingUniformJumpsuitDameDane: 1
ClothingShoesDameDane: 1
ClothingOuterDameDane: 1
ClothingUniformJumpsuitSober: 1
ClothingOuterClownPriest: 1
ClothingUniformSkirtTurtle: 2
ClothingUniformSwimsuitBlue: 2
Expand All @@ -68,3 +69,4 @@
emaggedInventory:
ClothingShoesBling: 1
ClothingOuterDogi: 1
ClothingOuterCoatLeatherJacket: 1
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,21 @@
Slash: 0.9
Piercing: 0.6
Heat: 0.75

- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatLeatherJacket
name: leather jacket
description: A rugged leather jacket, for fashion or for utility.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi
- type: TemperatureProtection
coefficient: 0.1
- type: Armor
modifiers:
coefficients:
Slash: 0.9
Heat: 0.75
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,14 @@
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSober
name: sober sweater
description: For the more lucid moments.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
- type: entity
parent: DrinkGlassBase
id: DrinkGunmetalGlass
name: gunmetal glass
description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Gunmetal
Quantity: 30
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi

- type: entity
parent: DrinkGlassBase
id: DrinkLemonDropGlass
name: lemon drop
description: A martini glass filled with a translucent mix of refreshing lemony goodness.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: LemonDrop
Quantity: 30
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi

- type: entity
parent: DrinkGlassBase
id: DrinkGreenGrassGlass
name: green grass
description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: GreenGrass
Quantity: 30
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi

- type: entity
parent: DrinkGlassBase
id: DrinkDaiquiriGlass
name: classic daiquiri
description: Rum, lime, and simple syrup. Such class, such refinement.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: Daiquiri
Quantity: 30
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi

- type: entity
parent: DrinkGlassBase
id: DrinkArsonistsBrewGlass
name: arsonist's brew
description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all.
components:
- type: SolutionContainerManager
solutions:
drink:
maxVol: 30
reagents:
- ReagentId: ArsonistsBrew
Quantity: 30
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: entity
parent: PosterBase
id: PosterLegitFuckAround
name: Fuck Around...
description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch.
components:
- type: Sprite
sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi
state: fuckaround
24 changes: 24 additions & 0 deletions Resources/Prototypes/DeltaV/Flavors/flavors.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
- type: flavor
id: gunmetal
flavorType: Complex
description: flavor-complex-gunmetal

- type: flavor
id: lemondrop
flavorType: Complex
description: flavor-complex-lemondrop

- type: flavor
id: greengrass
flavorType: Complex
description: flavor-complex-greengrass

- type: flavor
id: daiquiri
flavorType: Complex
description: flavor-complex-daiquiri

- type: flavor
id: arsonistsbrew
flavorType: Complex
description: flavor-complex-arsonistsbrew
102 changes: 102 additions & 0 deletions Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
- type: reagent
id: Gunmetal #Credit to DinkusMcsplinkus for inspiring this drink. This could've also been called "Creamy Ignition"
name: reagent-name-gunmetal
parent: BaseDrink
desc: reagent-desc-gunmetal
physicalDesc: reagent-physical-desc-strong-smelling
flavor: gunmetal
color: "#994422"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
Poison:
effects:
- !type:HealthChange
damage:
types:
Poison: 0.5

- type: reagent
id: LemonDrop
name: reagent-name-lemondrop
parent: BaseDrink
desc: reagent-desc-lemondrop
physicalDesc: reagent-physical-desc-lemony-fresh
flavor: lemondrop
color: "#fff789"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2

- type: reagent
id: GreenGrass
name: reagent-name-greengrass
parent: BaseDrink
desc: reagent-desc-greengrass
physicalDesc: reagent-physical-desc-tangy
flavor: greengrass
color: "#66aa55"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2

- type: reagent
id: Daiquiri
name: reagent-name-daiquiri
parent: BaseDrink
desc: reagent-desc-daiquiri
physicalDesc: reagent-physical-desc-tart
flavor: daiquiri
color: "#ddffdd"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2

- type: reagent
id: ArsonistsBrew
name: reagent-name-arsonistsbrew
parent: BaseDrink
desc: reagent-desc-arsonistsbrew
physicalDesc: reagent-physical-desc-volatile
flavor: arsonistsbrew
color: "#fff789"
metamorphicSprite:
sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
state: icon
metabolisms:
Drink:
effects:
- !type:SatiateThirst
factor: 2
Poison:
effects:
- !type:HealthChange
damage:
types:
Heat: 2
- !type:FlammableReaction
multiplier: 0.5
- !type:Ignite
- !type:Emote
emote: Laugh
probability: 0.25
64 changes: 64 additions & 0 deletions Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
- type: reaction
id: Gunmetal
reactants:
Cream:
amount: 1
WeldingFuel:
amount: 1
Rum:
amount: 1
products:
Gunmetal: 3

- type: reaction
id: LemonDrop
reactants:
Vodka:
amount: 2
Sugar:
amount: 2
JuiceLemon:
amount: 1
products:
LemonDrop: 5

- type: reaction
id: GreenGrass
reactants:
BlueCuracao:
amount: 2
JuiceOrange:
amount: 3
Ice:
amount: 1
products:
GreenGrass: 6

- type: reaction
id: Daiquiri
reactants:
DeadRum:
amount: 5
JuiceLime:
amount: 3
Sugar:
amount: 2
products:
Daiquiri: 10

- type: reaction
id: ArsonistsBrew
minTemp: 373.15
reactants:
Thermite:
amount: 1
WeldingFuel:
amount: 1
CapsaicinOil:
amount: 1
Whiskey:
amount: 1
Phosphorus:
amount: 1
products:
ArsonistsBrew: 5
Original file line number Diff line number Diff line change
Expand Up @@ -1643,7 +1643,7 @@
Quantity: 30
- type: Drink
- type: Sprite
sprite: Objects/Consumable/Drinks/glass_clear.rsi
sprite: DeltaV/Objects/Consumable/Drinks/moonshine.rsi

- type: entity
parent: DrinkGlassBase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -524,3 +524,18 @@
Quantity: 100
- type: Sprite
sprite: Objects/Consumable/Drinks/flaskholywater.rsi

- type: entity
parent: DrinkBottleBaseFull
id: DrinkMoonshineFull
name: jug of moonshine
description: A jug, of the classic variety, containing copious amounts of moonshine.
components:
- type: SolutionContainerManager
solutions:
drink:
reagents:
- ReagentId: Moonshine
Quantity: 100
- type: Sprite
sprite: DeltaV/Objects/Consumable/Drinks/moonshinebottle.rsi
Loading

0 comments on commit 5e11dc8

Please sign in to comment.