From: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Date: Sat, 29 Apr 2023 05:38:09 +0000 (+0100)
Subject: Adds Bananium (#14663)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=2fba2b18abd4a78ae84930fccd76531dd75daca5;p=space-station-14.git
Adds Bananium (#14663)
---
diff --git a/Content.Server/Disease/Effects/DiseaseHonk.cs b/Content.Server/Disease/Effects/DiseaseHonk.cs
new file mode 100644
index 0000000000..9ff4bd4aa3
--- /dev/null
+++ b/Content.Server/Disease/Effects/DiseaseHonk.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Chat.Prototypes;
+using Content.Shared.Disease;
+using JetBrains.Annotations;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Disease
+{
+ ///
+ /// Makes the diseased honk.
+ /// or neither.
+ ///
+ [UsedImplicitly]
+ public sealed class DiseaseHonk : DiseaseEffect
+ {
+ ///
+ /// Message to play when honking.
+ ///
+ [DataField("honkMessage")]
+ public string HonkMessage = "disease-honk";
+
+ ///
+ /// Emote to play when honking.
+ ///
+ [DataField("emote", required: true, customTypeSerializer: typeof(PrototypeIdSerializer))]
+ public string EmoteId = String.Empty;
+
+ ///
+ /// Whether to spread the disease through the air.
+ ///
+ [DataField("airTransmit")]
+ public bool AirTransmit = false;
+
+ public override void Effect(DiseaseEffectArgs args)
+ {
+ EntitySystem.Get().SneezeCough(args.DiseasedEntity, args.Disease, EmoteId, AirTransmit);
+ }
+ }
+}
diff --git a/Resources/Locale/en-US/materials/materials.ftl b/Resources/Locale/en-US/materials/materials.ftl
index 336b7f1206..70fb991c24 100644
--- a/Resources/Locale/en-US/materials/materials.ftl
+++ b/Resources/Locale/en-US/materials/materials.ftl
@@ -18,6 +18,7 @@ materials-plasma = plasma
materials-plastic = plastic
materials-wood = wood
materials-uranium = uranium
+materials-bananium = bananium
# Material Reclaimer
-material-reclaimer-upgrade-process-rate = process rate
\ No newline at end of file
+material-reclaimer-upgrade-process-rate = process rate
diff --git a/Resources/Locale/en-US/reagents/meta/elements.ftl b/Resources/Locale/en-US/reagents/meta/elements.ftl
index 70cd57bc8f..94b005840c 100644
--- a/Resources/Locale/en-US/reagents/meta/elements.ftl
+++ b/Resources/Locale/en-US/reagents/meta/elements.ftl
@@ -60,3 +60,6 @@ reagent-desc-sodium = A silvery-white alkali metal. Highly reactive in its pure
reagent-name-uranium = uranium
reagent-desc-uranium = A grey metallic chemical element in the actinide series, weakly radioactive.
+
+reagent-name-bananium = bananium
+reagent-desc-bananium = A yellow radioactive organic solid.
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index 1fea06f6b6..523620cd40 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -54,3 +54,6 @@ reagent-desc-allicin = An organosulfur compound found in alliums like garlic, on
reagent-name-pax = pax
reagent-desc-pax = A psychiatric drug which prevents the patient from directly harming anyone.
+
+reagent-name-honk = honk
+reagent-desc-honk = A toxin found in bananium. Causes severe honking and internal bleeding, may also cause the patient to mutate.
diff --git a/Resources/Prototypes/Diseases/honk.yml b/Resources/Prototypes/Diseases/honk.yml
new file mode 100644
index 0000000000..203fadd669
--- /dev/null
+++ b/Resources/Prototypes/Diseases/honk.yml
@@ -0,0 +1,60 @@
+- type: disease
+ id: ActiveHonkVirus
+ name: disease-proto-honk
+ infectious: false
+ cureResist: 0.2
+ stages:
+ - 0
+ - 120
+ - 780
+ effects:
+ # toxin
+ - !type:DiseaseAdjustReagent
+ probability: 0.07
+ reagent: Toxin
+ amount: 1
+ stages:
+ - 0
+ - 1
+ - 2
+ # honks
+ - !type:DiseaseHonk
+ probability: 0.03
+ emote: Honk
+ stages:
+ - 0
+ - !type:DiseaseHonk
+ probability: 0.04
+ emote: Honk
+ stages:
+ - 1
+ - !type:DiseaseHonk
+ probability: 0.06
+ emote: Honk
+ stages:
+ - 2
+ # stuttering accent chance when speaking
+ - !type:DiseaseGenericStatusEffect
+ probability: 0.3
+ key: Stutter
+ component: StutteringAccent
+ stages:
+ - 1
+ - !type:DiseaseGenericStatusEffect
+ probability: 0.6
+ key: Stutter
+ component: StutteringAccent
+ stages:
+ - 2
+ # possible cluwnification if ignored too long
+ - !type:DiseaseAddComponent
+ comp: Cluwne
+ probability: 0.0007
+ stages:
+ - 2
+ cures:
+ - !type:DiseaseReagentCure
+ reagent: BananaHonk
+ min: 5
+ - !type:DiseaseJustWaitCure
+ maxLength: 900
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index f04be36954..2c4524a288 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -866,6 +866,7 @@
- type: DiseaseCarrier #The other class lab animal and disease vector
naturalImmunities:
- AMIV
+ - ActiveHonkVirus
- type: CanEscapeInventory
- type: MobPrice
price: 50
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
index bde8dd9081..1d0d50d60d 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -117,6 +117,8 @@
- id: ClothingHeadHatFancyCrown #how did that get there?
amount: 1
- type: DiseaseCarrier
+ naturalImmunities:
+ - ActiveHonkVirus
carrierDiseases:
- VentCough
- AMIV
@@ -267,6 +269,8 @@
- id: FoodMeatRat
amount: 1
- type: DiseaseCarrier
+ naturalImmunities:
+ - ActiveHonkVirus
carrierDiseases:
- VentCough
- AMIV
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
index c700f1a201..745c0226c0 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -216,6 +216,21 @@
grindableSolutionName: food
- type: SpaceGarbage
+- type: entity
+ name: bananium peel
+ parent: TrashBananaPeel
+ id: TrashBananiumPeel
+ components:
+ - type: Sprite
+ sprite: Objects/Materials/materials.rsi
+ state: peel
+ - type: Item
+ sprite: Objects/Materials/materials.rsi
+ heldPrefix: peel
+ - type: Slippery
+ paralyzeTime: 4
+ launchForwardsMultiplier: 5
+
- type: entity
name: banana peel
suffix: Explosive
diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 480fc1905f..ae12b37d03 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -85,7 +85,7 @@
parent: BikeHorn
id: GoldenBikeHorn
name: golden honker
- suffix: not to be mapped.
+ suffix: No mapping
description: A happy honk prize, pray to the gods for your reward.
components:
- type: Sprite
@@ -100,3 +100,28 @@
- type: Prayable
- type: StaticPrice
price: 1000
+
+- type: entity
+ parent: BikeHorn
+ id: BananiumHorn
+ name: bananium horn
+ description: An air horn made from bananium.
+ components:
+ - type: Sprite
+ sprite: Objects/Fun/bananiumhorn.rsi
+ state: icon
+ - type: Item
+ sprite: Objects/Fun/bananiumhorn.rsi
+ size: 5
+ - type: Clothing
+ sprite: Objects/Fun/bananiumhorn.rsi
+ slots: [Belt]
+ quickEquip: false
+ - type: EmitSoundOnUse
+ sound:
+ collection: BananiumHorn
+ params:
+ variation: 0.246
+ - type: Construction
+ graph: BananiumHorn
+ node: bananiumHorn
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
index 0fd9e479b6..f348279243 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -276,3 +276,59 @@
state: cotton
- type: Stack
count: 1
+
+- type: entity
+ parent: MaterialBase
+ id: MaterialBananium
+ name: bananium
+ suffix: Full
+ components:
+ - type: Material
+ materials:
+ Bananium: 150
+ - type: Sprite
+ state: bananium_1
+ - type: Stack
+ stackType: Bananium
+ count: 10
+ - type: RadiationSource
+ intensity: 0.3
+ - type: FlavorProfile
+ flavors:
+ - banana
+ - type: Food
+ trash: TrashBananiumPeel
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ maxVol: 11
+ reagents:
+ - ReagentId: Nutriment
+ Quantity: 4
+ - ReagentId: Vitamin
+ Quantity: 2
+ - ReagentId: Honk
+ Quantity: 5
+ - type: Extractable
+ juiceSolution:
+ reagents:
+ - ReagentId: JuiceBanana
+ Quantity: 5
+ - ReagentId: Honk
+ Quantity: 5
+ - type: Appearance
+ visuals:
+ - type: StackVisualizer
+ stackLayers:
+ - bananium
+ - bananium_1
+
+- type: entity
+ parent: MaterialBananium
+ id: MaterialBananium1
+ suffix: Single
+ components:
+ - type: Sprite
+ state: bananium
+ - type: Stack
+ count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Materials/ore.yml b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
index 76287c044e..1a98afe222 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/ore.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/ore.yml
@@ -172,3 +172,26 @@
components:
- type: Stack
count: 1
+
+
+- type: entity
+ parent: OreBase
+ id: BananiumOre
+ name: bananium ore
+ suffix: Full
+ components:
+ - type: Stack
+ stackType: BananiumOre
+ - type: Sprite
+ state: bananium
+ - type: Material
+ materials:
+ Bananium: 500
+
+- type: entity
+ parent: BananiumOre
+ id: BananiumOre1
+ suffix: Single
+ components:
+ - type: Stack
+ count: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
index 8c5dece0f9..b47ea13a14 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml
@@ -67,3 +67,12 @@
- type: HealthAnalyzer
fake: true
disease: ActiveZombieVirus
+
+- type: entity
+ parent: HandheldHealthAnalyzer
+ id: HandheldHealthAnalyzerHonk
+ suffix: Honk Infector
+ components:
+ - type: HealthAnalyzer
+ fake: true
+ disease: ActiveHonkVirus
diff --git a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
index 7cae407769..acb1a875fb 100644
--- a/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
+++ b/Resources/Prototypes/Entities/Structures/Decoration/statues.yml
@@ -23,3 +23,19 @@
state: venus_blue
drawdepth: Mobs
offset: "0.0,0.5"
+
+- type: entity
+ id: StatueBananiumClown
+ parent: BaseStructure
+ name: bananium savior statue
+ description: A bananium statue. It portrays the return of the savior who will rise up and lead the clowns to the great honk.
+ components:
+ - type: Sprite
+ netsync: false
+ sprite: Structures/Decoration/statues.rsi
+ state: bananium_clown
+ drawdepth: Mobs
+ offset: "0.0,0.5"
+ - type: Construction
+ graph: BananiumStatueClown
+ node: bananiumStatue
diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
index 09bca7ec0a..e6062f1479 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
@@ -187,3 +187,24 @@
graph: DoorGraph
node: silverDoor
+- type: entity
+ id: BananiumDoor
+ name: bananium door
+ parent: BaseMaterialDoor
+ description: A door, where will it lead?
+ components:
+ - type: Sprite
+ netsync: false
+ sprite: Structures/Doors/MineralDoors/bananium_door.rsi
+ layers:
+ - state: closed
+ map: ["enum.DoorVisualLayers.Base"]
+ - type: Construction
+ graph: DoorGraph
+ node: bananiumDoor
+ - type: Door
+ openSound:
+ path: /Audio/Items/bikehorn.ogg
+ closeSound:
+ path: /Audio/Items/bikehorn.ogg
+
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
index 58db42610f..1b5d6dbf7d 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml
@@ -403,3 +403,17 @@
sprite: Structures/Furniture/Altars/Cults/fangs.rsi
- type: Icon
sprite: Structures/Furniture/Altars/Cults/fangs.rsi
+
+
+- type: entity
+ id: AltarBananium
+ parent: AltarBase
+ name: honkmother altar
+ description: A bananium altar dedicated to the honkmother.
+ components:
+ - type: Sprite
+ sprite: Structures/Furniture/Altars/Cults/bananium.rsi
+ state: full
+ - type: Construction
+ graph: BananiumAltarGraph
+ node: bananiumAltar
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index d403bfe4e6..6a2046dd2d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -656,3 +656,4 @@
- SheetUranium1
- IngotGold1
- IngotSilver1
+ - MaterialBananium1
diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
index 6a871e8e8c..1e6832351a 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
@@ -113,7 +113,7 @@
- type: entity
id: WallRockGold
parent: WallRock
- description: An ore vein rich with gold
+ description: An ore vein rich with gold.
suffix: Gold
components:
- type: OreVein
@@ -135,7 +135,7 @@
- type: entity
id: WallRockPlasma
parent: WallRock
- description: An ore vein rich with plasma
+ description: An ore vein rich with plasma.
suffix: Plasma
components:
- type: OreVein
@@ -157,7 +157,7 @@
- type: entity
id: WallRockQuartz
parent: WallRock
- description: An ore vein rich with quartz
+ description: An ore vein rich with quartz.
suffix: Quartz
components:
- type: OreVein
@@ -179,7 +179,7 @@
- type: entity
id: WallRockSilver
parent: WallRock
- description: An ore vein rich with silver
+ description: An ore vein rich with silver.
suffix: Silver
components:
- type: OreVein
@@ -202,7 +202,7 @@
- type: entity
id: WallRockTin
parent: WallRock
- description: An ore vein rich with steel
+ description: An ore vein rich with steel.
suffix: Steel
components:
- type: OreVein
@@ -224,7 +224,7 @@
- type: entity
id: WallRockUranium
parent: WallRock
- description: An ore vein rich with uranium
+ description: An ore vein rich with uranium.
suffix: Uranium
components:
- type: OreVein
@@ -242,3 +242,26 @@
- map: [ "enum.EdgeLayer.West" ]
state: rock_west
- state: rock_uranium
+
+
+- type: entity
+ id: WallRockBananium
+ parent: WallRock
+ description: An ore vein rich with bananium.
+ suffix: Bananium
+ components:
+ - type: OreVein
+ oreChance: 1.0
+ currentOre: OreBananium
+ - type: Sprite
+ layers:
+ - state: rock
+ - map: [ "enum.EdgeLayer.South" ]
+ state: rock_south
+ - map: [ "enum.EdgeLayer.East" ]
+ state: rock_east
+ - map: [ "enum.EdgeLayer.North" ]
+ state: rock_north
+ - map: [ "enum.EdgeLayer.West" ]
+ state: rock_west
+ - state: rock_bananium
diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
index 4e42419fb5..7270c80e5b 100644
--- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml
@@ -114,7 +114,7 @@
- type: entity
parent: BaseWall
id: WallClown
- name: clown wall
+ name: bananium wall
components:
- type: Tag
tags:
@@ -124,6 +124,9 @@
sprite: Structures/Walls/clown.rsi
- type: Icon
sprite: Structures/Walls/clown.rsi
+ - type: Construction
+ graph: Girder
+ node: bananiumWall
- type: Destructible
thresholds:
- trigger:
diff --git a/Resources/Prototypes/Entities/Tiles/bananium.yml b/Resources/Prototypes/Entities/Tiles/bananium.yml
new file mode 100644
index 0000000000..b7eaeef16b
--- /dev/null
+++ b/Resources/Prototypes/Entities/Tiles/bananium.yml
@@ -0,0 +1,68 @@
+- type: entity
+ id: FloorBananiumEntity
+ name: bananium floor
+ placement:
+ mode: SnapgridCenter
+ components:
+ - type: Clickable
+ - type: Sprite
+ netsync: false
+ sprite: Tiles/Misc/bananium.rsi
+ drawdepth: FloorTiles
+ layers:
+ - state: bananium
+ - type: Transform
+ anchored: true
+ - type: FootstepModifier
+ footstepSoundCollection:
+ collection: FootstepClown
+ - type: Tag
+ tags:
+ - Catwalk
+ - type: Construction
+ graph: FloorBananium
+ node: BananiumFloor
+ - type: Damageable
+ damageContainer: Inorganic
+ damageModifierSet: Metallic
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 500
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - trigger:
+ !type:DamageTrigger
+ damage: 200
+ behaviors:
+ - !type:SpawnEntitiesBehavior
+ spawn:
+ MaterialBananium:
+ min: 0
+ max: 1
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - type: Slippery
+ paralyzeTime: 2
+ launchForwardsMultiplier: 1.5
+ - type: StepTrigger
+ intersectRatio: 0.2
+ - type: Physics
+ bodyType: Static
+ - type: Fixtures
+ fixtures:
+ - shape:
+ !type:PhysShapeAabb
+ bounds: "-0.4,-0.3,0.4,0.3"
+ id: "slips"
+ hard: false
+ layer:
+ - SlipLayer
+ - shape:
+ !type:PhysShapeAabb
+ bounds: "-0.4,-0.3,0.4,0.3"
+ density: 1000
+ mask:
+ - ItemMask
diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml
index 15af26eb47..1b8181082b 100644
--- a/Resources/Prototypes/Reagents/Materials/materials.yml
+++ b/Resources/Prototypes/Reagents/Materials/materials.yml
@@ -61,3 +61,11 @@
icon: { sprite: Objects/Materials/Sheets/other.rsi, state: uranium }
color: "#32a852"
price: 0.2
+
+- type: material
+ id: Bananium
+ stackEntity: MaterialBananium1
+ name: materials-bananium
+ icon: { sprite: Objects/Materials/materials.rsi, state: bananium }
+ color: "#32a852"
+ price: 0.2
diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 2455f20f2b..b475dea77b 100644
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -1,4 +1,4 @@
-- type: reagent
+- type: reagent
id: Toxin
name: reagent-name-toxin
group: Toxins
@@ -45,7 +45,6 @@
messages: [ "generic-reagent-effect-burning-insides" ]
probability: 0.33
-
- type: reagent
id: ChloralHydrate
name: reagent-name-chloral-hydrate
@@ -474,3 +473,27 @@
component: Pacified
refresh: false
type: Add
+
+- type: reagent
+ id: Honk
+ name: reagent-name-honk
+ desc: reagent-desc-honk
+ physicalDesc: reagent-physical-desc-pungent
+ flavor: bitter
+ color: "#F2E9D2"
+ metabolisms:
+ Poison:
+ metabolismRate: 0.05
+ effects:
+ - !type:HealthChange
+ conditions:
+ - !type:ReagentThreshold
+ min: 1
+ - !type:OrganType
+ type: Animal
+ damage:
+ types:
+ Poison: 0.06
+ - !type:ChemCauseDisease
+ causeChance: 1
+ disease: ActiveHonkVirus ##makes target honk and potential chance to be cluwned.
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml b/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
new file mode 100644
index 0000000000..a4d0edc46a
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/fun/bananium_horn.yml
@@ -0,0 +1,25 @@
+- type: constructionGraph
+ id: BananiumHorn
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: bananiumHorn
+ steps:
+ - tag: Pipe
+ name: Pipe
+ icon:
+ sprite: Structures/Piping/Atmospherics/pipe.rsi
+ state: pipeStraight
+ doAfter: 2
+ - material: Bananium
+ amount: 4
+ doAfter: 1
+ - tag: BikeHorn
+ name: Bike Horn
+ icon:
+ sprite: Objects/Fun/bikehorn.rsi
+ state: icon
+ doAfter: 1
+ - node: bananiumHorn
+ entity: BananiumHorn
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml
new file mode 100644
index 0000000000..0612642bf3
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/altars.yml
@@ -0,0 +1,27 @@
+- type: constructionGraph
+ id: BananiumAltarGraph
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: bananiumAltar
+ completed:
+ - !type:SnapToGrid
+ southRotation: true
+ steps:
+ - material: Bananium
+ amount: 6
+ doAfter: 5
+
+ - node: bananiumAltar
+ entity: AltarBananium
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialBananium1
+ amount: 6
+ - !type:DeleteEntity {}
+ steps:
+ - tool: Welding
+ doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/bananiumfloor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/bananiumfloor.yml
new file mode 100644
index 0000000000..490e300d66
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/bananiumfloor.yml
@@ -0,0 +1,29 @@
+- type: constructionGraph
+ id: FloorBananium
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: BananiumFloor
+ completed:
+ - !type:SnapToGrid
+ southRotation: true
+ steps:
+ - material: Bananium
+ amount: 2
+ doAfter: 5
+
+ - node: BananiumFloor
+ entity: FloorBananiumEntity
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialBananium1
+ amount: 2
+ - !type:DeleteEntity {}
+ steps:
+ - tool: Screwing
+ doAfter: 5
+ - tool: Welding
+ doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
new file mode 100644
index 0000000000..5c67d3936e
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/decoration.yml
@@ -0,0 +1,29 @@
+- type: constructionGraph
+ id: BananiumStatueClown
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: bananiumStatue
+ completed:
+ - !type:SnapToGrid
+ southRotation: true
+ steps:
+ - material: Bananium
+ amount: 8
+ doAfter: 10
+
+ - node: bananiumStatue
+ entity: StatueBananiumClown
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialBananium1
+ amount: 8
+ - !type:DeleteEntity {}
+ steps:
+ - tool: Anchoring
+ doAfter: 5
+ - tool: Welding
+ doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
index 74bf319274..e15f4a644a 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/doors.yml
@@ -41,6 +41,13 @@
- material: Silver
amount: 20
doAfter: 15
+ - to: bananiumDoor
+ completed:
+ - !type:SnapToGrid { }
+ steps:
+ - material: Bananium
+ amount: 5
+ doAfter: 15
- to: paperDoor
completed:
- !type:SnapToGrid { }
@@ -114,3 +121,14 @@
steps:
- tool: Anchoring
doAfter: 15
+ - node: bananiumDoor
+ entity: BananiumDoor
+ edges:
+ - to: start
+ completed:
+ - !type:SpawnPrototype
+ prototype: MaterialBananium1
+ amount: 5
+ steps:
+ - tool: Anchoring
+ doAfter: 15
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
index 7a74fe9a3f..20cf9cf15c 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/girder.yml
@@ -126,6 +126,19 @@
- tool: Welding
doAfter: 20
+ - to: bananiumWall
+ completed:
+ - !type:SnapToGrid
+ southRotation: true
+ conditions:
+ - !type:EntityAnchored {}
+ steps:
+ - material: Bananium
+ amount: 2
+ doAfter: 2
+ - tool: Welding
+ doAfter: 20
+
- node: wall
entity: WallSolid
edges:
@@ -218,6 +231,20 @@
- tool: Prying
doAfter: 10
+ - node: bananiumWall
+ entity: WallClown
+ edges:
+ - to: girder
+ completed:
+ - !type:GivePrototype
+ prototype: MaterialBananium1
+ amount: 2
+ steps:
+ - tool: Welding
+ doAfter: 20
+ - tool: Prying
+ doAfter: 10
+
- node: reinforcedGirder
entity: ReinforcedGirder
edges:
diff --git a/Resources/Prototypes/Recipes/Construction/fun.yml b/Resources/Prototypes/Recipes/Construction/fun.yml
new file mode 100644
index 0000000000..46d43e7372
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Construction/fun.yml
@@ -0,0 +1,10 @@
+- type: construction
+ name: bananium horn
+ id: HornBananium
+ graph: BananiumHorn
+ startNode: start
+ targetNode: bananiumHorn
+ category: construction-category-weapons
+ description: An air horn made from bananium.
+ icon: { sprite: Objects/Fun/bananiumhorn.rsi, state: icon }
+ objectType: Item
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index 165d978420..a14ed93bea 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -178,6 +178,24 @@
conditions:
- !type:TileNotBlocked
+- type: construction
+ name: bananium wall
+ id: ClownWall
+ graph: Girder
+ startNode: start
+ targetNode: bananiumWall
+ category: construction-category-structures
+ description: Keeps the air in and the greytide out.
+ icon:
+ sprite: Structures/Walls/clown.rsi
+ state: full
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canRotate: false
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
+
- type: construction
name: grille
id: Grille
@@ -435,6 +453,28 @@
placementMode: SnapgridCenter
canBuildInImpassable: false
+- type: construction
+ name: bananium floor
+ id: FloorBananium
+ graph: FloorBananium
+ startNode: start
+ targetNode: BananiumFloor
+ category: construction-category-structures
+ description: A slippery floor of bright yellow bananium.
+ conditions:
+ - !type:TileNotBlocked
+ failIfSpace: false
+ - !type:TileType
+ targets:
+ - Plating
+ - UnderPlating
+ icon:
+ sprite: Tiles/Misc/bananium.rsi
+ state: bananium
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+
- type: construction
name: wooden barricade
id: Barricade
@@ -782,3 +822,55 @@
state: plasticflaps
conditions:
- !type:TileNotBlocked
+
+- type: construction
+ name: bananium clown statue
+ id: BananiumClownStatue
+ graph: BananiumStatueClown
+ startNode: start
+ targetNode: bananiumStatue
+ category: construction-category-structures
+ placementMode: SnapgridCenter
+ description: A clown statue made from bananium.
+ objectType: Structure
+ canBuildInImpassable: false
+ icon:
+ sprite: Structures/Decoration/statues.rsi
+ state: bananium_clown
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ name: bananium door
+ id: BananiumDoor
+ graph: DoorGraph
+ startNode: start
+ targetNode: bananiumDoor
+ category: construction-category-structures
+ description: A primitive door made from bananium, it honks.
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canBuildInImpassable: false
+ icon:
+ sprite: Structures/Doors/MineralDoors/bananium_door.rsi
+ state: closed
+ conditions:
+ - !type:TileNotBlocked
+
+- type: construction
+ name: bananium altar
+ id: BananiumAltar
+ graph: BananiumAltarGraph
+ startNode: start
+ targetNode: bananiumAltar
+ category: construction-category-structures
+ description: An altar to worship the honkmother with.
+ icon:
+ sprite: Structures/Furniture/Altars/Cults/bananium.rsi
+ state: full
+ objectType: Structure
+ placementMode: SnapgridCenter
+ canRotate: false
+ canBuildInImpassable: false
+ conditions:
+ - !type:TileNotBlocked
diff --git a/Resources/Prototypes/Recipes/Lathes/sheet.yml b/Resources/Prototypes/Recipes/Lathes/sheet.yml
index 7b86500676..7dbbb12aa4 100644
--- a/Resources/Prototypes/Recipes/Lathes/sheet.yml
+++ b/Resources/Prototypes/Recipes/Lathes/sheet.yml
@@ -97,3 +97,10 @@
completetime: 2
materials:
Plastic: 100
+
+- type: latheRecipe
+ id: MaterialBananium1
+ result: MaterialBananium1
+ completetime: 2
+ materials:
+ Bananium: 500
diff --git a/Resources/Prototypes/SoundCollections/bike_horn.yml b/Resources/Prototypes/SoundCollections/bike_horn.yml
index 00c9eb585d..02c2b13678 100644
--- a/Resources/Prototypes/SoundCollections/bike_horn.yml
+++ b/Resources/Prototypes/SoundCollections/bike_horn.yml
@@ -8,6 +8,11 @@
files:
- /Audio/Items/brokenbikehorn.ogg
+- type: soundCollection
+ id: BananiumHorn
+ files:
+ - /Audio/Items/airhorn.ogg
+
- type: soundCollection
id: DeskBell
files:
diff --git a/Resources/Prototypes/SoundCollections/disease.yml b/Resources/Prototypes/SoundCollections/disease.yml
index a9e6c4694a..f748945008 100644
--- a/Resources/Prototypes/SoundCollections/disease.yml
+++ b/Resources/Prototypes/SoundCollections/disease.yml
@@ -57,3 +57,8 @@
- /Audio/Voice/Human/snore1.ogg
- /Audio/Voice/Human/snore2.ogg
- /Audio/Voice/Human/snore3.ogg
+
+- type: soundCollection
+ id: Honks
+ files:
+ - /Audio/Items/bikehorn.ogg
diff --git a/Resources/Prototypes/Stacks/Materials/materials.yml b/Resources/Prototypes/Stacks/Materials/materials.yml
index 253c61b4f5..ad22391a72 100644
--- a/Resources/Prototypes/Stacks/Materials/materials.yml
+++ b/Resources/Prototypes/Stacks/Materials/materials.yml
@@ -46,3 +46,10 @@
icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: cotton }
spawn: MaterialCotton1
maxCount: 30
+
+- type: stack
+ id: Bananium
+ name: bananium
+ icon: { sprite: /Textures/Objects/Materials/materials.rsi, state: bananium }
+ spawn: MaterialBananium1
+ maxCount: 10
diff --git a/Resources/Prototypes/Stacks/Materials/ore.yml b/Resources/Prototypes/Stacks/Materials/ore.yml
index 2926ee671c..ec4036fe26 100644
--- a/Resources/Prototypes/Stacks/Materials/ore.yml
+++ b/Resources/Prototypes/Stacks/Materials/ore.yml
@@ -39,3 +39,11 @@
icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: uranium }
spawn: UraniumOre1
maxCount: 30
+
+
+- type: stack
+ id: BananiumOre
+ name: bananium ore
+ icon: { sprite: /Textures/Objects/Materials/ore.rsi, state: bananium }
+ spawn: BananiumOre1
+ maxCount: 30
diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml
index af93025cae..fa5f1cd610 100644
--- a/Resources/Prototypes/Voice/disease_emotes.yml
+++ b/Resources/Prototypes/Voice/disease_emotes.yml
@@ -43,3 +43,8 @@
id: Snore
category: Vocal
chatMessages: [snores]
+
+- type: emote
+ id: Honk
+ category: Vocal
+ chatMessages: [honks]
diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml
index 67b3c23e05..ac0e63c193 100644
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -24,6 +24,8 @@
collection: MaleYawn
Snore:
collection: Snores
+ Honk:
+ collection: BikeHorn
- type: emoteSounds
id: FemaleHuman
@@ -50,6 +52,8 @@
collection: FemaleYawn
Snore:
collection: Snores
+ Honk:
+ collection: CluwneHorn
- type: emoteSounds
id: UnisexReptilian
@@ -60,6 +64,8 @@
path: /Audio/Voice/Reptilian/reptilian_scream.ogg
Laugh:
path: /Audio/Animals/lizard_happy.ogg
+ Honk:
+ collection: BikeHorn
- type: emoteSounds
id: UnisexVox
@@ -75,9 +81,12 @@
path: /Audio/Voice/Diona/diona_scream.ogg
Laugh:
collection: DionaLaugh
+ Honk:
+ collection: BikeHorn
params:
variation: 0.125
+
- type: emoteSounds
id: UnisexDwarf
sounds:
@@ -85,6 +94,8 @@
collection: MaleScreams
Laugh:
collection: MaleLaugh
+ Honk:
+ collection: BikeHorn
params:
variation: 0.125
pitchscale: 0.75
diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml
index 2ad43b037f..8e6d90bfb4 100644
--- a/Resources/Prototypes/ore.yml
+++ b/Resources/Prototypes/ore.yml
@@ -37,6 +37,12 @@
minOreYield: 1
maxOreYield: 3
+- type: ore
+ id: OreBananium
+ oreEntity: BananiumOre1
+ minOreYield: 1
+ maxOreYield: 2
+
- type: weightedRandom
id: RandomOreDistributionStandard
weights:
@@ -46,3 +52,4 @@
OrePlasma: 4
OreSilver: 1
OreUranium: 1
+ OreBananium: 0.5
diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png
new file mode 100644
index 0000000000..79fb8baed5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/equipped-BELT.png differ
diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png
new file mode 100644
index 0000000000..d204501bd5
Binary files /dev/null and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png
new file mode 100644
index 0000000000..8f625dd67e
Binary files /dev/null and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png
new file mode 100644
index 0000000000..7402fe46d3
Binary files /dev/null and b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json
new file mode 100644
index 0000000000..25e7e61d32
--- /dev/null
+++ b/Resources/Textures/Objects/Fun/bananiumhorn.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-BELT",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium.png
index 8429b587ea..3f2236c203 100644
Binary files a/Resources/Textures/Objects/Materials/materials.rsi/bananium.png and b/Resources/Textures/Objects/Materials/materials.rsi/bananium.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png b/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png
new file mode 100644
index 0000000000..311911157f
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/bananium_1.png differ
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/meta.json b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
index 66174d0924..a1db317d4b 100644
--- a/Resources/Textures/Objects/Materials/materials.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/materials.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky for SS14",
+ "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 , bear pelt remade by Alekshhh, wood sprite modified by MisterMecky, wood_2 and wood_3 made by MisterMecky based on wood sprite, cardboard sprites made by MisterMecky, bananium, bananium_1 and peel made by brainfood1183 (github) for ss14",
"size": {
"x": 32,
"y": 32
@@ -16,6 +16,9 @@
{
"name": "bananium"
},
+ {
+ "name": "bananium_1"
+ },
{
"name": "bearpelt"
},
@@ -116,6 +119,9 @@
{
"name": "phoron_gem"
},
+ {
+ "name": "peel"
+ },
{
"name": "phoron_gem_spent"
},
diff --git a/Resources/Textures/Objects/Materials/materials.rsi/peel.png b/Resources/Textures/Objects/Materials/materials.rsi/peel.png
new file mode 100644
index 0000000000..6d4619a5d9
Binary files /dev/null and b/Resources/Textures/Objects/Materials/materials.rsi/peel.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/bananium.png b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png
new file mode 100644
index 0000000000..72cbecad8a
Binary files /dev/null and b/Resources/Textures/Objects/Materials/ore.rsi/bananium.png differ
diff --git a/Resources/Textures/Objects/Materials/ore.rsi/meta.json b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
index 90269cd3dd..f4e2b74617 100644
--- a/Resources/Textures/Objects/Materials/ore.rsi/meta.json
+++ b/Resources/Textures/Objects/Materials/ore.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
- "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/210/commits/d188de4d110a4f433ce3d30211be30d8257dc4c3 modified by HoofedEar",
+ "copyright": "Taken from goonstation at commit https://github.com/goonstation/goonstation/pull/210/commits/d188de4d110a4f433ce3d30211be30d8257dc4c3 modified by HoofedEar, bananium made by brainfood1183 (github) for ss14",
"size": {
"x": 32,
"y": 32
@@ -13,6 +13,9 @@
{
"name": "ammonia"
},
+ {
+ "name": "bananium"
+ },
{
"name": "gold"
},
diff --git a/Resources/Textures/Structures/Decoration/statues.rsi/bananium_clown.png b/Resources/Textures/Structures/Decoration/statues.rsi/bananium_clown.png
new file mode 100644
index 0000000000..d0c89280f1
Binary files /dev/null and b/Resources/Textures/Structures/Decoration/statues.rsi/bananium_clown.png differ
diff --git a/Resources/Textures/Structures/Decoration/statues.rsi/meta.json b/Resources/Textures/Structures/Decoration/statues.rsi/meta.json
index b8159cfb47..280da9df8b 100644
--- a/Resources/Textures/Structures/Decoration/statues.rsi/meta.json
+++ b/Resources/Textures/Structures/Decoration/statues.rsi/meta.json
@@ -1,12 +1,15 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/tgstation/tgstation/commit/2bb568bf2beddeee5f1f28cbc1e15bdcfb2e2cb0",
+ "copyright": "https://github.com/tgstation/tgstation/commit/2bb568bf2beddeee5f1f28cbc1e15bdcfb2e2cb0, bananium_clown made by brainfood1183 (github) for ss14",
"size": {
"x": 32,
"y": 64
},
"states": [
+ {
+ "name": "bananium_clown"
+ },
{
"name": "venus_blue"
},
@@ -14,4 +17,4 @@
"name": "venus_red"
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/closed.png b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/closed.png
new file mode 100644
index 0000000000..c436225a68
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/closing.png b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/closing.png
new file mode 100644
index 0000000000..f9af31cbea
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/meta.json b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/meta.json
new file mode 100644
index 0000000000..9659db663f
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "closed",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
+ {
+ "name": "closing",
+ "directions": 1,
+ "delays": [
+ [
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
+ ]
+ ]
+ },
+ {
+ "name": "open",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
+ {
+ "name": "opening",
+ "directions": 1,
+ "delays": [
+ [
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/open.png b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/open.png
new file mode 100644
index 0000000000..c9947c909f
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/opening.png b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/opening.png
new file mode 100644
index 0000000000..9764a52714
Binary files /dev/null and b/Resources/Textures/Structures/Doors/MineralDoors/bananium_door.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Furniture/Altars/Cults/bananium.rsi/full.png b/Resources/Textures/Structures/Furniture/Altars/Cults/bananium.rsi/full.png
new file mode 100644
index 0000000000..2974d3f679
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/Altars/Cults/bananium.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Furniture/Altars/Cults/bananium.rsi/meta.json b/Resources/Textures/Structures/Furniture/Altars/Cults/bananium.rsi/meta.json
new file mode 100644
index 0000000000..d1b9d3df6b
--- /dev/null
+++ b/Resources/Textures/Structures/Furniture/Altars/Cults/bananium.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by brainfood1183 (github) for ss14",
+ "states": [
+ {
+ "name": "full"
+ }
+ ]
+}
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown0.png b/Resources/Textures/Structures/Walls/clown.rsi/clown0.png
index cb3cbaad7d..9e1dbd5ca7 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown0.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown0.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown1.png b/Resources/Textures/Structures/Walls/clown.rsi/clown1.png
index 8d88aba2dc..85858c2366 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown1.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown1.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown2.png b/Resources/Textures/Structures/Walls/clown.rsi/clown2.png
index cb3cbaad7d..e52ad3c43c 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown2.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown2.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown3.png b/Resources/Textures/Structures/Walls/clown.rsi/clown3.png
index 8d88aba2dc..f587368b75 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown3.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown3.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown4.png b/Resources/Textures/Structures/Walls/clown.rsi/clown4.png
index fd1fd83df6..2ae93e9c3e 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown4.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown4.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown5.png b/Resources/Textures/Structures/Walls/clown.rsi/clown5.png
index a92f1576cf..de5883eac6 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown5.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown5.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown6.png b/Resources/Textures/Structures/Walls/clown.rsi/clown6.png
index fd1fd83df6..2dfddc449d 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown6.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown6.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/clown7.png b/Resources/Textures/Structures/Walls/clown.rsi/clown7.png
index a92f1576cf..267bb89fe6 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/clown7.png and b/Resources/Textures/Structures/Walls/clown.rsi/clown7.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/full.png b/Resources/Textures/Structures/Walls/clown.rsi/full.png
index 8ac7c2f578..a3f4760a51 100644
Binary files a/Resources/Textures/Structures/Walls/clown.rsi/full.png and b/Resources/Textures/Structures/Walls/clown.rsi/full.png differ
diff --git a/Resources/Textures/Structures/Walls/clown.rsi/meta.json b/Resources/Textures/Structures/Walls/clown.rsi/meta.json
index 3d2f08b718..76ecabce74 100644
--- a/Resources/Textures/Structures/Walls/clown.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/clown.rsi/meta.json
@@ -1 +1,46 @@
-{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "clown0", "directions": 4}, {"name": "clown1", "directions": 4}, {"name": "clown2", "directions": 4}, {"name": "clown3", "directions": 4}, {"name": "clown4", "directions": 4}, {"name": "clown5", "directions": 4}, {"name": "clown6", "directions": 4}, {"name": "clown7", "directions": 4}, {"name": "full"}]}
\ No newline at end of file
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi, modified by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "clown0",
+ "directions": 4
+ },
+ {
+ "name": "clown1",
+ "directions": 4
+ },
+ {
+ "name": "clown2",
+ "directions": 4
+ },
+ {
+ "name": "clown3",
+ "directions": 4
+ },
+ {
+ "name": "clown4",
+ "directions": 4
+ },
+ {
+ "name": "clown5",
+ "directions": 4
+ },
+ {
+ "name": "clown6",
+ "directions": 4
+ },
+ {
+ "name": "clown7",
+ "directions": 4
+ },
+ {
+ "name": "full"
+ }
+ ]
+}
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/meta.json b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
index ce053d2a8f..bc48361fe1 100644
--- a/Resources/Textures/Structures/Walls/rock.rsi/meta.json
+++ b/Resources/Textures/Structures/Walls/rock.rsi/meta.json
@@ -1,80 +1,83 @@
{
- "version": 1,
- "license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmi",
- "size": {
- "x": 32,
- "y": 32
- },
- "states": [
- {
- "name": "rock"
- },
- {
- "name": "rock_south"
- },
- {
- "name": "rock_east"
- },
- {
- "name": "rock_north"
- },
- {
- "name": "rock_west"
- },
- {
- "name": "rock_bauxite"
- },
- {
- "name": "rock_carbon"
- },
- {
- "name": "rock_copper"
- },
- {
- "name": "rock_diamond"
- },
- {
- "name": "rock_gold"
- },
- {
- "name": "rock_hematite"
- },
- {
- "name": "rock_lead"
- },
- {
- "name": "rock_marble"
- },
- {
- "name": "rock_painite"
- },
- {
- "name": "rock_phoron"
- },
- {
- "name": "rock_platinum"
- },
- {
- "name": "rock_quartz"
- },
- {
- "name": "rock_rutile"
- },
- {
- "name": "rock_silver"
- },
- {
- "name": "rock_tin"
- },
- {
- "name": "rock_uranium"
- },
- {
- "name": "rock_verdantium"
- },
- {
- "name": "rock_void_opal"
- }
- ]
-}
\ No newline at end of file
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/turf/walls.dmiMade, rock_bananium made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "rock"
+ },
+ {
+ "name": "rock_south"
+ },
+ {
+ "name": "rock_east"
+ },
+ {
+ "name": "rock_north"
+ },
+ {
+ "name": "rock_west"
+ },
+ {
+ "name": "rock_bauxite"
+ },
+ {
+ "name": "rock_carbon"
+ },
+ {
+ "name": "rock_copper"
+ },
+ {
+ "name": "rock_diamond"
+ },
+ {
+ "name": "rock_gold"
+ },
+ {
+ "name": "rock_hematite"
+ },
+ {
+ "name": "rock_lead"
+ },
+ {
+ "name": "rock_marble"
+ },
+ {
+ "name": "rock_painite"
+ },
+ {
+ "name": "rock_phoron"
+ },
+ {
+ "name": "rock_platinum"
+ },
+ {
+ "name": "rock_quartz"
+ },
+ {
+ "name": "rock_rutile"
+ },
+ {
+ "name": "rock_silver"
+ },
+ {
+ "name": "rock_tin"
+ },
+ {
+ "name": "rock_uranium"
+ },
+ {
+ "name": "rock_verdantium"
+ },
+ {
+ "name": "rock_void_opal"
+ },
+ {
+ "name": "rock_bananium"
+ }
+ ]
+}
diff --git a/Resources/Textures/Structures/Walls/rock.rsi/rock_bananium.png b/Resources/Textures/Structures/Walls/rock.rsi/rock_bananium.png
new file mode 100644
index 0000000000..1eb0eff489
Binary files /dev/null and b/Resources/Textures/Structures/Walls/rock.rsi/rock_bananium.png differ
diff --git a/Resources/Textures/Tiles/Misc/bananium.rsi/bananium.png b/Resources/Textures/Tiles/Misc/bananium.rsi/bananium.png
new file mode 100644
index 0000000000..4632c6dab4
Binary files /dev/null and b/Resources/Textures/Tiles/Misc/bananium.rsi/bananium.png differ
diff --git a/Resources/Textures/Tiles/Misc/bananium.rsi/meta.json b/Resources/Textures/Tiles/Misc/bananium.rsi/meta.json
new file mode 100644
index 0000000000..1cfb11ed79
--- /dev/null
+++ b/Resources/Textures/Tiles/Misc/bananium.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by brainfood1183 (github) for ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "bananium"
+ }
+ ]
+}