From 69ca8c2153802211d462e1c129e4381458c6f9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <6766154+Zumorica@users.noreply.github.com> Date: Wed, 22 Apr 2020 17:50:55 +0200 Subject: [PATCH] Some YAML cleanup (#840) --- .../Components/InteractionOutlineComponent.cs | 4 +- .../Graphics/Overlays/CircleMaskOverlay.cs | 2 +- .../Graphics/Overlays/GradientCircleMask.cs | 2 +- Resources/Maps/stationstation.yml | 412 +++++++++--------- Resources/Prototypes/1_Temperature.yml | 22 - Resources/Prototypes/Cargo/products.yml | 20 +- .../Prototypes/Construction/machines.yml | 4 +- .../Prototypes/Construction/structures.yml | 16 +- .../Storage}/closet_base.yml | 5 +- .../Storage}/closet_types.yml | 36 +- .../Storage}/crate_base.yml | 8 +- .../Storage}/crate_types.yml | 86 ++-- .../{buildings => Buildings}/airlock_base.yml | 11 +- .../airlock_types.yml | 12 +- .../{buildings => Buildings}/asteroid.yml | 2 +- .../booze_dispenser.yml | 4 +- .../{buildings => Buildings}/catwalk.yml | 5 +- .../chem_dispenser.yml | 2 +- .../{buildings => Buildings}/computers.yml | 34 +- .../{buildings => Buildings}/fuel_tank.yml | 2 +- .../{buildings => Buildings}/furniture.yml | 8 +- .../{buildings => Buildings}/girder.yml | 2 +- .../{buildings => Buildings}/instruments.yml | 0 .../{buildings => Buildings}/lathe.yml | 4 +- .../{buildings => Buildings}/lighting.yml | 21 +- .../{buildings => Buildings}/low_wall.yml | 4 +- .../medical_scanner.yml | 2 +- .../{buildings => Buildings}/mirror.yml | 2 +- .../{buildings => Buildings}/power.yml | 2 +- .../reagent_dispenser_base.yml | 2 +- .../{buildings => Buildings}/shuttle.yml | 2 +- .../soda_dispenser.yml | 2 +- .../{buildings => Buildings}/table.yml | 4 +- .../{buildings => Buildings}/turret.yml | 0 .../vending_machines.yml | 60 +-- .../{buildings => Buildings}/walls.yml | 38 +- .../{buildings => Buildings}/windows.yml | 16 +- ...AnimationsTest.yml => animations_test.yml} | 0 .../Effects/{WeaponArc.yml => weapon_arc.yml} | 0 .../clothing => Items/Clothing}/IDs.yml | 0 .../Clothing}/OuterClothing.yml | 0 .../clothing => Items/Clothing}/backpacks.yml | 0 .../clothing => Items/Clothing}/belts.yml | 0 .../Clothing}/clothing_base.yml | 0 .../clothing => Items/Clothing}/ears.yml | 0 .../clothing => Items/Clothing}/eyes.yml | 0 .../clothing => Items/Clothing}/gloves.yml | 0 .../clothing => Items/Clothing}/hats.yml | 0 .../clothing => Items/Clothing}/masks.yml | 0 .../clothing => Items/Clothing}/shoes.yml | 0 .../Clothing}/shoes/clown.yml | 0 .../Clothing}/shoes/jackboots.yml | 0 .../clothing => Items/Clothing}/uniforms.yml | 0 .../{items => Items}/Consumables/drinks.yml | 0 .../Consumables/drinks_bottles.yml | 0 .../Consumables/drinks_cans.yml | 0 .../Consumables/drinks_cups.yml | 0 .../{items => Items}/Consumables/food.yml | 0 .../Consumables/food_containers.yml | 0 .../{items => Items}/Consumables/trash.yml | 0 .../Consumables/trash_drinks.yml | 0 .../Entities/{items => Items}/Instruments.yml | 0 .../weapons => Items/Weapons}/kitchen.yml | 0 .../weapons => Items/Weapons}/mining.yml | 0 .../weapons => Items/Weapons}/spear.yml | 0 .../Entities/{items => Items}/bike_horn.yml | 0 .../Entities/{items => Items}/chemistry.yml | 0 .../Entities/{items => Items}/dice.yml | 0 .../Entities/{items => Items}/explosives.yml | 0 .../{items => Items}/fire_extinguisher.yml | 2 +- .../Entities/{items => Items}/flashlight.yml | 0 .../Entities/{items => Items}/item_base.yml | 0 .../Entities/{items => Items}/light_bulb.yml | 0 .../Entities/{items => Items}/materials.yml | 0 .../Entities/{items => Items}/medical.yml | 0 .../Entities/{items => Items}/paper.yml | 0 .../Entities/{items => Items}/powercells.yml | 0 .../Entities/{items => Items}/skub.yml | 0 .../Entities/{items => Items}/table_parts.yml | 0 .../Entities/{items => Items}/teleporters.yml | 0 .../Entities/{items => Items}/tiles.yml | 0 .../Entities/{items => Items}/toolbox.yml | 0 .../Entities/{items => Items}/tools.yml | 0 .../construction_ghost.yml | 0 .../{markers => Markers}/spawn_points.yml | 0 .../adminghost.yml => Mobs/admin_ghost.yml} | 0 .../Entities/{mobs => Mobs}/human.yml | 26 +- .../Entities/{mobs => Mobs}/observer.yml | 0 .../Weapons/Ammunition/10mm/projectiles.yml | 12 +- .../Weapons/Ammunition/12g/projectiles.yml | 2 +- .../Weapons/Ammunition/20mm/projectiles.yml | 2 +- .../Weapons/Ammunition/24mm/projectiles.yml | 12 +- .../Weapons/Ammunition/45mm/projectiles.yml | 12 +- .../Weapons/Ammunition/5.56mm/projectiles.yml | 12 +- .../Weapons/Ammunition/6.5mm/projectiles.yml | 12 +- .../Weapons/Ammunition/7.62mm/projectiles.yml | 12 +- .../Weapons/Ammunition/9mm/projectiles.yml | 12 +- .../Ammunition/Point32/projectiles.yml | 12 +- .../Ammunition/Point357/projectiles.yml | 12 +- .../Ammunition/Point44/projectiles.yml | 12 +- .../Ammunition/Point50/projectiles.yml | 12 +- .../Weapons/Projectiles/projectiles.yml | 26 +- .../Entities/{Chemistry.yml => chemistry.yml} | 0 .../Prototypes/Entities/items/bartending.yml | 0 .../Entities/{Janitor.yml => janitor.yml} | 0 .../Entities/{Research.yml => research.yml} | 5 +- Resources/Prototypes/Entities/water_tank.yml | 10 +- Resources/Prototypes/Shaders/Stencils.yml | 10 +- Resources/Prototypes/Shaders/outline.yml | 4 +- Resources/Prototypes/Shaders/shaders.yml | 8 +- .../Prototypes/Technologies/technologies.yml | 24 +- .../{circlemask.swsl => circle_mask.swsl} | 0 ...clemask.swsl => gradient_circle_mask.swsl} | 0 .../{stencilclear.swsl => stencil_clear.swsl} | 0 .../{stencilmask.swsl => stencil_mask.swsl} | 0 115 files changed, 512 insertions(+), 597 deletions(-) delete mode 100644 Resources/Prototypes/1_Temperature.yml rename Resources/Prototypes/Entities/{buildings/storage => Buildings/Storage}/closet_base.yml (97%) rename Resources/Prototypes/Entities/{buildings/storage => Buildings/Storage}/closet_types.yml (87%) rename Resources/Prototypes/Entities/{buildings/storage => Buildings/Storage}/crate_base.yml (97%) rename Resources/Prototypes/Entities/{buildings/storage => Buildings/Storage}/crate_types.yml (81%) rename Resources/Prototypes/Entities/{buildings => Buildings}/airlock_base.yml (96%) rename Resources/Prototypes/Entities/{buildings => Buildings}/airlock_types.yml (93%) rename Resources/Prototypes/Entities/{buildings => Buildings}/asteroid.yml (96%) rename Resources/Prototypes/Entities/{buildings => Buildings}/booze_dispenser.yml (90%) rename Resources/Prototypes/Entities/{buildings => Buildings}/catwalk.yml (95%) rename Resources/Prototypes/Entities/{buildings => Buildings}/chem_dispenser.yml (95%) rename Resources/Prototypes/Entities/{buildings => Buildings}/computers.yml (89%) rename Resources/Prototypes/Entities/{buildings => Buildings}/fuel_tank.yml (96%) rename Resources/Prototypes/Entities/{buildings => Buildings}/furniture.yml (94%) rename Resources/Prototypes/Entities/{buildings => Buildings}/girder.yml (97%) rename Resources/Prototypes/Entities/{buildings => Buildings}/instruments.yml (100%) rename Resources/Prototypes/Entities/{buildings => Buildings}/lathe.yml (98%) rename Resources/Prototypes/Entities/{buildings => Buildings}/lighting.yml (91%) rename Resources/Prototypes/Entities/{buildings => Buildings}/low_wall.yml (95%) rename Resources/Prototypes/Entities/{buildings => Buildings}/medical_scanner.yml (97%) rename Resources/Prototypes/Entities/{buildings => Buildings}/mirror.yml (97%) rename Resources/Prototypes/Entities/{buildings => Buildings}/power.yml (99%) rename Resources/Prototypes/Entities/{buildings => Buildings}/reagent_dispenser_base.yml (94%) rename Resources/Prototypes/Entities/{buildings => Buildings}/shuttle.yml (96%) rename Resources/Prototypes/Entities/{buildings => Buildings}/soda_dispenser.yml (94%) rename Resources/Prototypes/Entities/{buildings => Buildings}/table.yml (94%) rename Resources/Prototypes/Entities/{buildings => Buildings}/turret.yml (100%) rename Resources/Prototypes/Entities/{buildings => Buildings}/vending_machines.yml (88%) rename Resources/Prototypes/Entities/{buildings => Buildings}/walls.yml (92%) rename Resources/Prototypes/Entities/{buildings => Buildings}/windows.yml (89%) rename Resources/Prototypes/Entities/Effects/{AnimationsTest.yml => animations_test.yml} (100%) rename Resources/Prototypes/Entities/Effects/{WeaponArc.yml => weapon_arc.yml} (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/IDs.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/OuterClothing.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/backpacks.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/belts.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/clothing_base.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/ears.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/eyes.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/gloves.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/hats.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/masks.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/shoes.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/shoes/clown.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/shoes/jackboots.yml (100%) rename Resources/Prototypes/Entities/{items/clothing => Items/Clothing}/uniforms.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/drinks.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/drinks_bottles.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/drinks_cans.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/drinks_cups.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/food.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/food_containers.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/trash.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Consumables/trash_drinks.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/Instruments.yml (100%) rename Resources/Prototypes/Entities/{items/weapons => Items/Weapons}/kitchen.yml (100%) rename Resources/Prototypes/Entities/{items/weapons => Items/Weapons}/mining.yml (100%) rename Resources/Prototypes/Entities/{items/weapons => Items/Weapons}/spear.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/bike_horn.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/chemistry.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/dice.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/explosives.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/fire_extinguisher.yml (91%) rename Resources/Prototypes/Entities/{items => Items}/flashlight.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/item_base.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/light_bulb.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/materials.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/medical.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/paper.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/powercells.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/skub.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/table_parts.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/teleporters.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/tiles.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/toolbox.yml (100%) rename Resources/Prototypes/Entities/{items => Items}/tools.yml (100%) rename Resources/Prototypes/Entities/{markers => Markers}/construction_ghost.yml (100%) rename Resources/Prototypes/Entities/{markers => Markers}/spawn_points.yml (100%) rename Resources/Prototypes/Entities/{mobs/adminghost.yml => Mobs/admin_ghost.yml} (100%) rename Resources/Prototypes/Entities/{mobs => Mobs}/human.yml (97%) rename Resources/Prototypes/Entities/{mobs => Mobs}/observer.yml (100%) rename Resources/Prototypes/Entities/{Chemistry.yml => chemistry.yml} (100%) delete mode 100644 Resources/Prototypes/Entities/items/bartending.yml rename Resources/Prototypes/Entities/{Janitor.yml => janitor.yml} (100%) rename Resources/Prototypes/Entities/{Research.yml => research.yml} (88%) rename Resources/Shaders/{circlemask.swsl => circle_mask.swsl} (100%) rename Resources/Shaders/{gradientcirclemask.swsl => gradient_circle_mask.swsl} (100%) rename Resources/Shaders/{stencilclear.swsl => stencil_clear.swsl} (100%) rename Resources/Shaders/{stencilmask.swsl => stencil_mask.swsl} (100%) diff --git a/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs b/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs index 6852824e30..5529642be9 100644 --- a/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs +++ b/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs @@ -9,8 +9,8 @@ namespace Content.Client.GameObjects.Components [RegisterComponent] public class InteractionOutlineComponent : Component { - private const string ShaderInRange = "selection_outline_inrange"; - private const string ShaderOutOfRange = "selection_outline"; + private const string ShaderInRange = "SelectionOutlineInrange"; + private const string ShaderOutOfRange = "SelectionOutline"; public override string Name => "InteractionOutline"; diff --git a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs index 6ebf290452..3b0a1358ce 100644 --- a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs +++ b/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs @@ -20,7 +20,7 @@ namespace Content.Client.Graphics.Overlays public CircleMaskOverlay() : base(nameof(CircleMaskOverlay)) { IoCManager.InjectDependencies(this); - Shader = _prototypeManager.Index("circlemask").Instance(); + Shader = _prototypeManager.Index("CircleMask").Instance(); } protected override void Draw(DrawingHandleBase handle) diff --git a/Content.Client/Graphics/Overlays/GradientCircleMask.cs b/Content.Client/Graphics/Overlays/GradientCircleMask.cs index 45c4d7c45a..72b1a7e3c3 100644 --- a/Content.Client/Graphics/Overlays/GradientCircleMask.cs +++ b/Content.Client/Graphics/Overlays/GradientCircleMask.cs @@ -19,7 +19,7 @@ namespace Content.Client.Graphics.Overlays public GradientCircleMask() : base(nameof(GradientCircleMask)) { IoCManager.InjectDependencies(this); - Shader = _prototypeManager.Index("gradientcirclemask").Instance(); + Shader = _prototypeManager.Index("GradientCircleMask").Instance(); } protected override void Draw(DrawingHandleBase handle) diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 980e40102d..e7402cdbde 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -281,7 +281,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 26 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: -4.5,-5 @@ -312,7 +312,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 29 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: 0.5,-5 @@ -607,14 +607,14 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 70 - type: catwalk + type: Catwalk components: - parent: 0 pos: -6.5,-6.5 rot: -1.5707963267949 rad type: Transform - uid: 71 - type: catwalk + type: Catwalk components: - parent: 0 pos: -8.5,-6.5 @@ -649,7 +649,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 76 - type: catwalk + type: Catwalk components: - parent: 0 pos: 4.5,-8.5 @@ -719,28 +719,28 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 86 - type: table + type: Table components: - parent: 0 pos: -3.5,-5.5 rot: -1.5707963267949 rad type: Transform - uid: 87 - type: table + type: Table components: - parent: 0 pos: -2.5,-5.5 rot: -1.5707963267949 rad type: Transform - uid: 88 - type: table + type: Table components: - parent: 0 pos: -1.5,-5.5 rot: -1.5707963267949 rad type: Transform - uid: 89 - type: table + type: Table components: - parent: 0 pos: -0.5,-5.5 @@ -754,7 +754,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 91 - type: crate_generic + type: CrateGeneric components: - parent: 0 pos: 5.5,-6.5 @@ -902,14 +902,14 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 111 - type: catwalk + type: Catwalk components: - parent: 0 pos: 2.5,-11.5 rot: -1.5707963267949 rad type: Transform - uid: 112 - type: catwalk + type: Catwalk components: - parent: 0 pos: -4.5,-11.5 @@ -1049,7 +1049,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 132 - type: smes_dry + type: SmesDry components: - parent: 0 pos: -1.5,-13.5 @@ -1058,7 +1058,7 @@ entities: - charge: 3000 type: PowerStorage - uid: 133 - type: smes_dry + type: SmesDry components: - parent: 0 pos: -2.5,-13.5 @@ -1067,7 +1067,7 @@ entities: - charge: 3000 type: PowerStorage - uid: 134 - type: smes_dry + type: SmesDry components: - parent: 0 pos: -3.5,-13.5 @@ -1083,14 +1083,14 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 136 - type: catwalk + type: Catwalk components: - parent: 0 pos: -2.5,-12.5 rot: -1.5707963267949 rad type: Transform - uid: 137 - type: catwalk + type: Catwalk components: - parent: 0 pos: 1.5,-12.5 @@ -1111,28 +1111,28 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 140 - type: table + type: Table components: - parent: 0 pos: -3.5,-10.5 rot: -1.5707963267949 rad type: Transform - uid: 141 - type: table + type: Table components: - parent: 0 pos: -2.5,-10.5 rot: -1.5707963267949 rad type: Transform - uid: 142 - type: table + type: Table components: - parent: 0 pos: -1.5,-10.5 rot: -1.5707963267949 rad type: Transform - uid: 143 - type: table + type: Table components: - parent: 0 pos: -0.5,-10.5 @@ -1160,7 +1160,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 147 - type: locker_generic + type: LockerGeneric components: - parent: 0 pos: 1.5,-10.5 @@ -1202,7 +1202,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 150 - type: locker_generic + type: LockerGeneric components: - parent: 0 pos: 0.5,-10.5 @@ -1220,7 +1220,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 151 - type: fire_extinguisher + type: FireExtinguisher components: - parent: 0 pos: -1.297692,-5.396082 @@ -1241,7 +1241,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 154 - type: computerSupplyRequest + type: ComputerSupplyRequest components: - parent: 0 pos: 0.5,-5.5 @@ -1253,7 +1253,7 @@ entities: - cargo.Medkit type: GalacticMarket - uid: 155 - type: computerSupplyOrdering + type: ComputerSupplyOrdering components: - parent: 0 pos: 0.5,0.5 @@ -1265,28 +1265,28 @@ entities: - cargo.Medkit type: GalacticMarket - uid: 156 - type: table + type: Table components: - parent: 0 pos: -4.5,-1.5 rot: -1.5707963267949 rad type: Transform - uid: 157 - type: table + type: Table components: - parent: 0 pos: -1.5,-1.5 rot: -1.5707963267949 rad type: Transform - uid: 158 - type: table + type: Table components: - parent: 0 pos: -2.5,-1.5 rot: -1.5707963267949 rad type: Transform - uid: 159 - type: table + type: Table components: - parent: 0 pos: -3.5,-1.5 @@ -1300,14 +1300,14 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 161 - type: catwalk + type: Catwalk components: - parent: 0 pos: 4.5,-13.5 rot: -1.5707963267949 rad type: Transform - uid: 162 - type: catwalk + type: Catwalk components: - parent: 0 pos: -5.5,-13.5 @@ -1368,7 +1368,7 @@ entities: - parent: 29 type: Transform - uid: 171 - type: wall_light + type: WallLight components: - parent: 0 pos: -0.5,-14 @@ -1410,42 +1410,42 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 177 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,0.5 rot: -1.5707963267949 rad type: Transform - uid: 178 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,1.5 rot: -1.5707963267949 rad type: Transform - uid: 179 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,2.5 rot: -1.5707963267949 rad type: Transform - uid: 180 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,3.5 rot: -1.5707963267949 rad type: Transform - uid: 181 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,4.5 rot: -1.5707963267949 rad type: Transform - uid: 182 - type: vending_machine_youtool + type: VendingMachineYouTool components: - parent: 0 pos: -11.5,-0.5 @@ -1482,98 +1482,98 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 187 - type: table + type: Table components: - parent: 0 pos: -6.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 188 - type: table + type: Table components: - parent: 0 pos: -5.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 189 - type: table + type: Table components: - parent: 0 pos: -4.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 190 - type: table + type: Table components: - parent: 0 pos: -3.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 191 - type: table + type: Table components: - parent: 0 pos: -2.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 192 - type: table + type: Table components: - parent: 0 pos: -1.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 193 - type: table + type: Table components: - parent: 0 pos: -0.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 194 - type: table + type: Table components: - parent: 0 pos: 0.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 195 - type: table + type: Table components: - parent: 0 pos: 1.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 196 - type: table + type: Table components: - parent: 0 pos: -4.5,4.5 rot: -1.5707963267949 rad type: Transform - uid: 197 - type: table + type: Table components: - parent: 0 pos: -3.5,4.5 rot: -1.5707963267949 rad type: Transform - uid: 198 - type: table + type: Table components: - parent: 0 pos: -2.5,4.5 rot: -1.5707963267949 rad type: Transform - uid: 199 - type: table + type: Table components: - parent: 0 pos: -1.5,4.5 rot: -1.5707963267949 rad type: Transform - uid: 200 - type: table + type: Table components: - parent: 0 pos: -0.5,4.5 @@ -1594,7 +1594,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 203 - type: catwalk + type: Catwalk components: - parent: 0 pos: -9.5,0.5 @@ -1643,7 +1643,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 210 - type: airlock + type: Airlock components: - parent: 0 pos: -9.5,1.5 @@ -1655,7 +1655,7 @@ entities: - parent: 212 type: Transform - uid: 212 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 0.5,1 @@ -1672,21 +1672,21 @@ entities: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer - uid: 213 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: -3.5,-0.5 rot: -1.5707963267949 rad type: Transform - uid: 214 - type: chairOfficeDark + type: ChairOfficeDark components: - parent: 0 pos: 0.5,-6.5 rot: 1.5707963267949 rad type: Transform - uid: 215 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -6.5,1 @@ -1710,35 +1710,35 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 217 - type: stool + type: Stool components: - parent: 0 pos: -1.5,-9.5 rot: 1.5707963267949 rad type: Transform - uid: 218 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: -3.5,-2.5 rot: 1.5707963267949 rad type: Transform - uid: 219 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: -2.5,-2.5 rot: 1.5707963267949 rad type: Transform - uid: 220 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: -2.5,-0.5 rot: -1.5707963267949 rad type: Transform - uid: 221 - type: stool + type: Stool components: - parent: 0 pos: -2.5,-6.5 @@ -1848,91 +1848,91 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 237 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-0.5 rot: -1.5707963267949 rad type: Transform - uid: 238 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-1.5 rot: -1.5707963267949 rad type: Transform - uid: 239 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-2.5 rot: -1.5707963267949 rad type: Transform - uid: 240 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-3.5 rot: -1.5707963267949 rad type: Transform - uid: 241 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-4.5 rot: -1.5707963267949 rad type: Transform - uid: 242 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-5.5 rot: -1.5707963267949 rad type: Transform - uid: 243 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-6.5 rot: -1.5707963267949 rad type: Transform - uid: 244 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-7.5 rot: -1.5707963267949 rad type: Transform - uid: 245 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-8.5 rot: -1.5707963267949 rad type: Transform - uid: 246 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-9.5 rot: -1.5707963267949 rad type: Transform - uid: 247 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-10.5 rot: -1.5707963267949 rad type: Transform - uid: 248 - type: catwalk + type: Catwalk components: - parent: 0 pos: 9.5,-11.5 rot: -1.5707963267949 rad type: Transform - uid: 249 - type: catwalk + type: Catwalk components: - parent: 0 pos: 8.5,-8.5 @@ -1946,7 +1946,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 251 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: 5,-9.5 @@ -2494,7 +2494,7 @@ entities: - parent: 215 type: Transform - uid: 317 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -1.5,8 @@ -2516,7 +2516,7 @@ entities: - parent: 317 type: Transform - uid: 319 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 4,3.5 @@ -2538,13 +2538,13 @@ entities: - parent: 319 type: Transform - uid: 321 - type: wall_light + type: WallLight components: - parent: 0 pos: -7,-10.5 type: Transform - uid: 322 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: -10,-5.5 @@ -2783,14 +2783,14 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 355 - type: table + type: Table components: - parent: 0 pos: -15.5,-5.5 rot: -1.5707963267949 rad type: Transform - uid: 356 - type: table + type: Table components: - parent: 0 pos: -15.5,-1.5 @@ -2818,35 +2818,35 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 360 - type: table + type: Table components: - parent: 0 pos: -15.5,-0.5 rot: -1.5707963267949 rad type: Transform - uid: 361 - type: catwalk + type: Catwalk components: - parent: 0 pos: -14.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 362 - type: catwalk + type: Catwalk components: - parent: 0 pos: -13.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 363 - type: catwalk + type: Catwalk components: - parent: 0 pos: -12.5,7.5 rot: -1.5707963267949 rad type: Transform - uid: 364 - type: locker_tool_filled + type: LockerToolFilled components: - parent: 0 pos: -11.5,-5.5 @@ -2858,7 +2858,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 365 - type: locker_tool_filled + type: LockerToolFilled components: - parent: 0 pos: -11.5,-4.5 @@ -2870,7 +2870,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 366 - type: locker_tool_filled + type: LockerToolFilled components: - parent: 0 pos: -11.5,-3.5 @@ -2882,7 +2882,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 367 - type: locker_tool_filled + type: LockerToolFilled components: - parent: 0 pos: -11.5,-2.5 @@ -2894,7 +2894,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 368 - type: locker_tool_filled + type: LockerToolFilled components: - parent: 0 pos: -11.5,-1.5 @@ -2920,7 +2920,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 371 - type: autolathe + type: Autolathe components: - parent: 0 pos: -14.5,-7.5 @@ -2942,7 +2942,7 @@ entities: - Multitool type: LatheDatabase - uid: 372 - type: autolathe + type: Autolathe components: - parent: 0 pos: -13.5,-7.5 @@ -2964,7 +2964,7 @@ entities: - Multitool type: LatheDatabase - uid: 373 - type: autolathe + type: Autolathe components: - parent: 0 pos: -12.5,-7.5 @@ -2986,7 +2986,7 @@ entities: - Multitool type: LatheDatabase - uid: 374 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -11,-5.5 @@ -3008,7 +3008,7 @@ entities: - parent: 374 type: Transform - uid: 376 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -11,-0.5 @@ -3030,7 +3030,7 @@ entities: - parent: 376 type: Transform - uid: 378 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -16,-0.5 @@ -3051,7 +3051,7 @@ entities: - parent: 378 type: Transform - uid: 380 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -16,-5.5 @@ -3072,7 +3072,7 @@ entities: - parent: 380 type: Transform - uid: 382 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -15,3.5 @@ -3093,7 +3093,7 @@ entities: - parent: 382 type: Transform - uid: 384 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: -14.5,7 @@ -3143,21 +3143,21 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 390 - type: catwalk + type: Catwalk components: - parent: 0 pos: -11.5,-6.5 rot: -1.5707963267949 rad type: Transform - uid: 391 - type: catwalk + type: Catwalk components: - parent: 0 pos: -9.5,-6.5 rot: -1.5707963267949 rad type: Transform - uid: 392 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: -10.5,4 @@ -3291,21 +3291,21 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 410 - type: table + type: Table components: - parent: 0 pos: -15.5,-4.5 rot: -1.5707963267949 rad type: Transform - uid: 411 - type: table + type: Table components: - parent: 0 pos: -15.5,-3.5 rot: -1.5707963267949 rad type: Transform - uid: 412 - type: table + type: Table components: - parent: 0 pos: -15.5,0.5 @@ -3347,7 +3347,7 @@ entities: rot: -1.5707963267949 rad type: Transform - uid: 418 - type: vending_machine_engivend + type: VendingMachineEngivend components: - parent: 0 pos: -11.5,0.5 @@ -3356,103 +3356,103 @@ entities: - sprite: Buildings/VendingMachines/engivend.rsi type: Sprite - uid: 419 - type: table + type: Table components: - parent: 0 pos: 18.5,4.5 rot: -1.5707963267948966 rad type: Transform - uid: 420 - type: table + type: Table components: - parent: 0 pos: 21.5,6.5 rot: -1.5707963267948966 rad type: Transform - uid: 421 - type: table + type: Table components: - parent: 0 pos: 20.5,6.5 rot: -1.5707963267948966 rad type: Transform - uid: 422 - type: table + type: Table components: - parent: 0 pos: 18.5,6.5 rot: -1.5707963267948966 rad type: Transform - uid: 423 - type: table + type: Table components: - parent: 0 pos: 19.5,6.5 rot: -1.5707963267948966 rad type: Transform - uid: 424 - type: table + type: Table components: - parent: 0 pos: 18.5,5.5 rot: -1.5707963267948966 rad type: Transform - uid: 425 - type: table + type: Table components: - parent: 0 pos: 22.5,8.5 rot: -1.5707963267948966 rad type: Transform - uid: 426 - type: table + type: Table components: - parent: 0 pos: 24.5,4.5 rot: -1.5707963267948966 rad type: Transform - uid: 427 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: 19.5,4.5 rot: 3.141592653589793 rad type: Transform - uid: 428 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: 20.5,5.5 rot: 1.5707963267948966 rad type: Transform - uid: 429 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: 23.5,8.5 rot: 3.141592653589793 rad type: Transform - uid: 430 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: 24.5,5.5 rot: -1.5707963267948966 rad type: Transform - uid: 431 - type: chair + type: Chair components: - parent: 0 pos: 14.5,6.5 type: Transform - uid: 432 - type: chair + type: Chair components: - parent: 0 pos: 14.5,8.5 type: Transform - uid: 433 - type: chair + type: Chair components: - parent: 0 pos: 14.5,7.5 @@ -3469,63 +3469,63 @@ entities: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer - uid: 435 - type: table + type: Table components: - parent: 0 pos: 23.5,7.5 rot: -1.5707963267948966 rad type: Transform - uid: 436 - type: catwalk + type: Catwalk components: - parent: 0 pos: 0.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 437 - type: table + type: Table components: - parent: 0 pos: 25.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 438 - type: table + type: Table components: - parent: 0 pos: 23.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 439 - type: table + type: Table components: - parent: 0 pos: 24.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 440 - type: table + type: Table components: - parent: 0 pos: 26.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 441 - type: table + type: Table components: - parent: 0 pos: 27.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 442 - type: computerMedicalRecords + type: ComputerMedicalRecords components: - parent: 0 pos: 21.5,5.5 rot: 3.141592653589793 rad type: Transform - uid: 443 - type: medical_scanner + type: MedicalScanner components: - parent: 0 pos: 18.5,-1.5 @@ -3537,7 +3537,7 @@ entities: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer - uid: 444 - type: medical_scanner + type: MedicalScanner components: - parent: 0 pos: 18.5,-5.5 @@ -3549,21 +3549,21 @@ entities: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer - uid: 445 - type: table + type: Table components: - parent: 0 pos: 13.5,2.5 rot: -1.5707963267948966 rad type: Transform - uid: 446 - type: table + type: Table components: - parent: 0 pos: 13.5,0.5 rot: -1.5707963267948966 rad type: Transform - uid: 447 - type: table + type: Table components: - parent: 0 pos: 13.5,1.5 @@ -4515,28 +4515,28 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 583 - type: catwalk + type: Catwalk components: - parent: 0 pos: 5.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 584 - type: catwalk + type: Catwalk components: - parent: 0 pos: 12.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 585 - type: table + type: Table components: - parent: 0 pos: 23.5,6.5 rot: -1.5707963267948966 rad type: Transform - uid: 586 - type: table + type: Table components: - parent: 0 pos: 23.5,5.5 @@ -4872,21 +4872,21 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 634 - type: airlock + type: Airlock components: - parent: 0 pos: 1.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 635 - type: airlock + type: Airlock components: - parent: 0 pos: 4.5,10.5 rot: -1.5707963267948966 rad type: Transform - uid: 636 - type: airlock + type: Airlock components: - parent: 0 pos: 13.5,10.5 @@ -4917,7 +4917,7 @@ entities: pos: 25.5,4.5 type: Transform - uid: 641 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 17.5,4 @@ -4939,7 +4939,7 @@ entities: - parent: 641 type: Transform - uid: 643 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 22.5,3 @@ -4961,7 +4961,7 @@ entities: - parent: 643 type: Transform - uid: 645 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 13.5,3 @@ -5082,7 +5082,7 @@ entities: pos: 25.5,3.5 type: Transform - uid: 663 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 14,9.5 @@ -5103,7 +5103,7 @@ entities: - parent: 663 type: Transform - uid: 665 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 22,9.5 @@ -5139,7 +5139,7 @@ entities: rot: 3.141592653589793 rad type: Transform - uid: 669 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 16.5,-6 @@ -5161,14 +5161,14 @@ entities: - parent: 669 type: Transform - uid: 671 - type: table + type: Table components: - parent: 0 pos: 23.5,-5.5 rot: -1.5707963267948966 rad type: Transform - uid: 672 - type: table + type: Table components: - parent: 0 pos: 24.5,-5.5 @@ -5371,7 +5371,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 701 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 31.5,-6 @@ -5393,7 +5393,7 @@ entities: - parent: 701 type: Transform - uid: 703 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 30,1.5 @@ -5471,7 +5471,7 @@ entities: rot: 3.141592653589793 rad type: Transform - uid: 713 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 28,7.5 @@ -5493,7 +5493,7 @@ entities: - parent: 713 type: Transform - uid: 715 - type: vending_machine_medical + type: VendingMachineMedical components: - parent: 0 pos: 29.5,3.5 @@ -5502,7 +5502,7 @@ entities: - sprite: Buildings/VendingMachines/medical.rsi type: Sprite - uid: 716 - type: vending_machine_medical + type: VendingMachineMedical components: - parent: 0 pos: 27.5,-5.5 @@ -5511,7 +5511,7 @@ entities: - sprite: Buildings/VendingMachines/medical.rsi type: Sprite - uid: 717 - type: vending_machine_medical + type: VendingMachineMedical components: - parent: 0 pos: 25.5,-5.5 @@ -5520,7 +5520,7 @@ entities: - sprite: Buildings/VendingMachines/medical.rsi type: Sprite - uid: 718 - type: vending_machine_wallmed + type: VendingMachineWallMedical components: - parent: 0 pos: 1.5,-3.5 @@ -5553,14 +5553,14 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 721 - type: computerMedicalRecords + type: ComputerMedicalRecords components: - parent: 0 pos: 22.5,-5.5 rot: 1.5707963267948966 rad type: Transform - uid: 722 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 23.5,-6 @@ -5624,35 +5624,35 @@ entities: rot: 1.5707963267948966 rad type: Transform - uid: 730 - type: table + type: Table components: - parent: 0 pos: 33.5,-1.5 rot: -1.5707963267948966 rad type: Transform - uid: 731 - type: table + type: Table components: - parent: 0 pos: 33.5,-2.5 rot: -1.5707963267948966 rad type: Transform - uid: 732 - type: table + type: Table components: - parent: 0 pos: 33.5,-3.5 rot: -1.5707963267948966 rad type: Transform - uid: 733 - type: table + type: Table components: - parent: 0 pos: 33.5,-4.5 rot: -1.5707963267948966 rad type: Transform - uid: 734 - type: table + type: Table components: - parent: 0 pos: 33.5,-5.5 @@ -5715,7 +5715,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 743 - type: crate_medical + type: CrateMedical components: - parent: 0 pos: 32.5,-1.5 @@ -5727,7 +5727,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 744 - type: crate_medical + type: CrateMedical components: - parent: 0 pos: 31.5,-1.5 @@ -5739,7 +5739,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 745 - type: locker_medical + type: LockerMedical components: - parent: 0 pos: 30.5,-1.5 @@ -5751,7 +5751,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 746 - type: locker_medical + type: LockerMedical components: - parent: 0 pos: 29.5,-1.5 @@ -5763,7 +5763,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 747 - type: locker_medical + type: LockerMedical components: - parent: 0 pos: 27.5,5.5 @@ -5775,7 +5775,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 748 - type: locker_chemistry + type: LockerChemistry components: - parent: 0 pos: 27.5,6.5 @@ -6382,21 +6382,21 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 834 - type: catwalk + type: Catwalk components: - parent: 0 pos: 5.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 835 - type: catwalk + type: Catwalk components: - parent: 0 pos: 6.5,24.5 rot: -1.5707963267948966 rad type: Transform - uid: 836 - type: catwalk + type: Catwalk components: - parent: 0 pos: 6.5,20.5 @@ -6648,28 +6648,28 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 872 - type: airlock + type: Airlock components: - parent: 0 pos: 5.5,15.5 rot: -1.5707963267948966 rad type: Transform - uid: 873 - type: airlock + type: Airlock components: - parent: 0 pos: 7.5,20.5 rot: -1.5707963267948966 rad type: Transform - uid: 874 - type: table + type: Table components: - parent: 0 pos: 9.5,15.5 rot: -1.5707963267948966 rad type: Transform - uid: 875 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 6.5,12 @@ -6691,7 +6691,7 @@ entities: - parent: 875 type: Transform - uid: 877 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 12.5,12 @@ -6718,7 +6718,7 @@ entities: - parent: 880 type: Transform - uid: 880 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 14,18.5 @@ -6749,7 +6749,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 883 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 18,22.5 @@ -6771,7 +6771,7 @@ entities: - parent: 883 type: Transform - uid: 885 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 18,27.5 @@ -6793,7 +6793,7 @@ entities: - parent: 885 type: Transform - uid: 887 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: 18,17.5 @@ -6814,7 +6814,7 @@ entities: - parent: 887 type: Transform - uid: 889 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 2,17.5 @@ -6840,7 +6840,7 @@ entities: - parent: 892 type: Transform - uid: 892 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 2,23.5 @@ -6856,7 +6856,7 @@ entities: type: Content.Server.GameObjects.ContainerSlot type: ContainerContainer - uid: 893 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: 11,24.5 @@ -6878,14 +6878,14 @@ entities: - parent: 893 type: Transform - uid: 895 - type: catwalk + type: Catwalk components: - parent: 0 pos: 13.5,24.5 rot: 3.141592653589793 rad type: Transform - uid: 896 - type: poweredsmalllight + type: PoweredSmallLight components: - parent: 0 pos: 7.5,26 @@ -6907,7 +6907,7 @@ entities: - parent: 896 type: Transform - uid: 898 - type: researchAndDevelopmentServer + type: ResearchAndDevelopmentServer components: - parent: 0 pos: 11.5,24.5 @@ -6918,7 +6918,7 @@ entities: - technologies: [] type: TechnologyDatabase - uid: 899 - type: computerResearchAndDevelopment + type: ComputerResearchAndDevelopment components: - parent: 0 pos: 8.5,18.5 @@ -6926,13 +6926,13 @@ entities: - technologies: [] type: TechnologyDatabase - uid: 900 - type: baseResearchAndDevelopmentPointSource + type: BaseResearchAndDevelopmentPointSource components: - parent: 0 pos: 13.5,16.5 type: Transform - uid: 901 - type: protolathe + type: Protolathe components: - parent: 0 pos: 8.5,17.5 @@ -6956,7 +6956,7 @@ entities: - technologies: [] type: TechnologyDatabase - uid: 902 - type: autolathe + type: Autolathe components: - parent: 0 pos: 13.5,18.5 @@ -6977,7 +6977,7 @@ entities: - Multitool type: LatheDatabase - uid: 903 - type: autolathe + type: Autolathe components: - parent: 0 pos: -4.5,-5.5 @@ -6998,35 +6998,35 @@ entities: - Multitool type: LatheDatabase - uid: 904 - type: table + type: Table components: - parent: 0 pos: 8.5,21.5 rot: -1.5707963267948966 rad type: Transform - uid: 905 - type: table + type: Table components: - parent: 0 pos: 9.5,21.5 rot: -1.5707963267948966 rad type: Transform - uid: 906 - type: table + type: Table components: - parent: 0 pos: 10.5,21.5 rot: -1.5707963267948966 rad type: Transform - uid: 907 - type: table + type: Table components: - parent: 0 pos: 11.5,21.5 rot: -1.5707963267948966 rad type: Transform - uid: 908 - type: table + type: Table components: - parent: 0 pos: 13.5,17.5 @@ -7243,7 +7243,7 @@ entities: rot: -1.5707963267948966 rad type: Transform - uid: 939 - type: poweredlight + type: Poweredlight components: - parent: 0 pos: 8,16.5 @@ -7312,27 +7312,27 @@ entities: pos: 10.577456,21.424059 type: Transform - uid: 949 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: 9.5,18.5 rot: 3.141592653589793 rad type: Transform - uid: 950 - type: chairOfficeLight + type: ChairOfficeLight components: - parent: 0 pos: 9.5,16.5 rot: -1.5707963267948966 rad type: Transform - uid: 951 - type: chair + type: Chair components: - parent: 0 pos: 12.5,17.5 type: Transform - uid: 952 - type: locker_science + type: LockerScience components: - parent: 0 pos: 12.5,21.5 @@ -7344,7 +7344,7 @@ entities: type: Robust.Server.GameObjects.Components.Container.Container type: ContainerContainer - uid: 953 - type: locker_science + type: LockerScience components: - parent: 0 pos: 13.5,21.5 diff --git a/Resources/Prototypes/1_Temperature.yml b/Resources/Prototypes/1_Temperature.yml deleted file mode 100644 index 41cb3cfaa6..0000000000 --- a/Resources/Prototypes/1_Temperature.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - id: thing_that_heats_up_on_its_own_and_dies - name: Thing that heats up on its own and dies - components: - - type: Clickable - - type: InteractionOutline - - type: Sprite - texture: Objects/Misc/shoes.png - - - type: Icon - texture: Objects/Misc/shoes.png - - - type: Damageable - resistanceset: Standard - - - type: Destructible - thresholdtype: Total - thresholdvalue: 100 - - - type: Temperature - firedamagethreshold: 200 - firedamagecoefficient: 20 diff --git a/Resources/Prototypes/Cargo/products.yml b/Resources/Prototypes/Cargo/products.yml index 8871008d50..334a84db40 100644 --- a/Resources/Prototypes/Cargo/products.yml +++ b/Resources/Prototypes/Cargo/products.yml @@ -27,7 +27,7 @@ icon: sprite: Objects/Tools/flashlight.rsi state: lantern_off - product: crate_flashlight + product: CrateFlashlights cost: 3000 category: Engineering group: market @@ -39,7 +39,7 @@ icon: sprite: Objects/Lighting/light_tube.rsi state: normal - product: crate_light_bulb + product: CrateLightBulb cost: 200 category: Engineering group: market @@ -49,7 +49,7 @@ id: cargo.fireextinguisher description: Puts out fires. Or propels you in space. icon: Objects/Misc/fire_extinguisher.png - product: crate_fire_extinguisher + product: CrateFireExtinguisher cost: 300 category: Other group: market @@ -61,7 +61,7 @@ icon: sprite: Objects/Misc/bureaucracy.rsi state: pen - product: crate_pen + product: CratePen cost: 10 category: Other group: market @@ -73,7 +73,7 @@ icon: sprite: Objects/Fun/bikehorn.rsi state: icon - product: crate_bikehorn + product: CrateBikeHorn cost: 300 category: Other group: market @@ -85,7 +85,7 @@ icon: sprite: Objects/Melee/cleaver.rsi state: butch - product: crate_cleaver + product: CrateCleaver cost: 300 category: Other group: blackmarket @@ -95,7 +95,7 @@ id: cargo.fueltank description: Movable fuel tank for welders. No boom boom. icon: Buildings/weldtank.png - product: crate_fueltank + product: CrateFuelTank cost: 200 category: Engineering group: market @@ -107,7 +107,7 @@ icon: sprite: Buildings/medical_scanner.rsi state: scanner_open - product: crate_medscanner + product: CrateMedicalScanner cost: 400 category: Medical group: market @@ -117,7 +117,7 @@ id: cargo.glass description: 50 sheets of glass. icon: Objects/Materials/sheet_glass.png - product: crate_glass + product: CrateGlass cost: 50 category: Engineering group: market @@ -127,7 +127,7 @@ id: cargo.cable description: 50 coils of cable. icon: Objects/Tools/cable_coil.png - product: crate_cable + product: CrateCable cost: 50 category: Engineering group: market diff --git a/Resources/Prototypes/Construction/machines.yml b/Resources/Prototypes/Construction/machines.yml index 03a3a34b8d..1c4af0d1b0 100644 --- a/Resources/Prototypes/Construction/machines.yml +++ b/Resources/Prototypes/Construction/machines.yml @@ -1,6 +1,6 @@ - type: construction name: Wall Light - id: wall_light + id: WallLight keywords: [fixture, lamp] category: Machines description: A simple wall-mounted light fixture. @@ -10,7 +10,7 @@ sprite: Objects/Lighting/lighting.rsi state: on - result: poweredlight + result: Poweredlight steps: - material: Metal amount: 1 diff --git a/Resources/Prototypes/Construction/structures.yml b/Resources/Prototypes/Construction/structures.yml index 459fb5f2f7..2e7ac1c8af 100644 --- a/Resources/Prototypes/Construction/structures.yml +++ b/Resources/Prototypes/Construction/structures.yml @@ -23,12 +23,12 @@ - type: construction name: Table - id: table + id: Table category: Structures icon: sprite: Buildings/table_solid.rsi state: plain_preview - result: table + result: Table placementmode: SnapgridCenter steps: - material: Metal @@ -36,14 +36,14 @@ - type: construction name: Window - id: window + id: Window category: Structures description: Clear. icon: sprite: Buildings/window.rsi state: full objecttype: Structure - result: window + result: Window placementmode: SnapgridCenter steps: - material: Glass @@ -51,14 +51,14 @@ - type: construction name: Low Wall - id: low_wall + id: LowWall category: Structures description: A low wall used for mounting windows. icon: sprite: Buildings/low_wall.rsi state: metal objecttype: Structure - result: low_wall + result: LowWall placementmode: SnapgridCenter steps: - material: Metal @@ -74,14 +74,14 @@ - type: construction name: Rein Window - id: rwindow + id: ReinforcedWindow category: Structures description: Clear but tough. icon: sprite: Buildings/rwindow.rsi state: full objecttype: Structure - result: rwindow + result: ReinforcedWindow placementmode: SnapgridCenter steps: - material: Glass diff --git a/Resources/Prototypes/Entities/buildings/storage/closet_base.yml b/Resources/Prototypes/Entities/Buildings/Storage/closet_base.yml similarity index 97% rename from Resources/Prototypes/Entities/buildings/storage/closet_base.yml rename to Resources/Prototypes/Entities/Buildings/Storage/closet_base.yml index 50da94b9db..672ea0d2f8 100644 --- a/Resources/Prototypes/Entities/buildings/storage/closet_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/closet_base.yml @@ -1,5 +1,5 @@ - type: entity - id: locker_generic + id: LockerGeneric name: Locker description: A standard-issue Nanotrasen storage unit. components: @@ -10,11 +10,9 @@ - state: generic - state: generic_door map: ["enum.StorageVisualLayers.Door"] - - type: Icon sprite: Buildings/closet.rsi state: generic_door - - type: Clickable - type: InteractionOutline - type: Collidable @@ -38,7 +36,6 @@ state_open: generic_open state_closed: generic_door - type: Sound - placement: snap: - Wall diff --git a/Resources/Prototypes/Entities/buildings/storage/closet_types.yml b/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml similarity index 87% rename from Resources/Prototypes/Entities/buildings/storage/closet_types.yml rename to Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml index bb62090a7e..01c5dec55b 100644 --- a/Resources/Prototypes/Entities/buildings/storage/closet_types.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/closet_types.yml @@ -1,7 +1,7 @@ - type: entity - id: locker_tool + id: LockerTool name: Tool Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi @@ -9,27 +9,25 @@ - state: eng - state: eng_tool_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: eng_open state_closed: eng_tool_door - - type: Icon state: eng_tool_door - type: entity - id: locker_tool_filled + id: LockerToolFilled name: Tool Locker (Filled) - parent: locker_tool + parent: LockerTool components: - type: ToolLockerFill - type: entity - id: locker_electrical_supplies + id: LockerElectricalSupplies name: Electrical Supplies Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi @@ -37,20 +35,18 @@ - state: eng - state: eng_elec_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: eng_open state_closed: eng_elec_door - - type: Icon state: eng_elec_door - type: entity - id: locker_welding_supplies + id: LockerWeldingSupplies name: Welding Supplies Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi @@ -69,9 +65,9 @@ state: eng_weld_door - type: entity - id: locker_radiation_suit + id: LockerRadiationSuit name: Radiation Suit Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi @@ -90,9 +86,9 @@ state: eng_rad_door - type: entity - id: locker_medical + id: LockerMedical name: Medical Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi @@ -111,9 +107,9 @@ state: med_door - type: entity - id: locker_chemistry + id: LockerChemistry name: Chemistry Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi @@ -132,9 +128,9 @@ state: chemical_door - type: entity - id: locker_science + id: LockerScience name: Science Locker - parent: locker_generic + parent: LockerGeneric components: - type: Sprite sprite: Buildings/closet.rsi diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_base.yml b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml similarity index 97% rename from Resources/Prototypes/Entities/buildings/storage/crate_base.yml rename to Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml index ec7144491a..bdf48c1229 100644 --- a/Resources/Prototypes/Entities/buildings/storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml @@ -1,5 +1,5 @@ - type: entity - id: crate_generic + id: CrateGeneric name: Crate description: A large container for items. components: @@ -10,11 +10,9 @@ - state: crate - state: crate_door map: ["enum.StorageVisualLayers.Door"] - - type: Icon sprite: Buildings/crate.rsi state: crate - - type: Clickable - type: InteractionOutline - type: Collidable @@ -27,19 +25,15 @@ - type: Physics mass: 25 Anchored: false - - type: EntityStorage Capacity: 60 - type: PlaceableSurface - - type: Damageable - type: Destructible thresholdvalue: 100 - - type: Appearance visuals: - type: StorageVisualizer2D state_open: crate_open state_closed: crate_door - - type: Sound diff --git a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml b/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml similarity index 81% rename from Resources/Prototypes/Entities/buildings/storage/crate_types.yml rename to Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml index 737e723379..41e15b0823 100644 --- a/Resources/Prototypes/Entities/buildings/storage/crate_types.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/crate_types.yml @@ -1,128 +1,116 @@ - type: entity - id: crate_plastic + id: CratePlastic name: Plastic Crate - parent: crate_generic + parent: CrateGeneric components: - type: Sprite layers: - state: plasticcrate - state: plasticcrate_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: plasticcrate_open state_closed: plasticcrate_door - - type: Icon state: plasticcrate - type: entity - id: crate_freezer + id: CrateFreezer name: Freezer - parent: crate_generic + parent: CrateGeneric components: - type: Sprite layers: - state: freezer - state: freezer_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: freezer_open state_closed: freezer_door - - type: Icon state: freezer - type: entity - id: crate_hydroponics + id: CrateHydroponics name: Hydroponics Crate - parent: crate_generic + parent: CrateGeneric components: - type: Sprite layers: - state: hydrocrate - state: hydrocrate_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: hydrocrate_open state_closed: hydrocrate_door - - type: Icon state: hydrocrate - type: entity - id: crate_medical + id: CrateMedical name: Medical Crate - parent: crate_generic + parent: CrateGeneric components: - type: Sprite layers: - state: medicalcrate - state: medicalcrate_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: medicalcrate_open state_closed: medicalcrate_door - - type: Icon state: medicalcrate - type: entity - id: crate_radiation + id: CrateRadiation name: Radiation Gear Crate description: Is not actually lead lined. Do not store your plutonium in this. - parent: crate_generic + parent: CrateGeneric components: - type: Sprite layers: - state: radiationcrate - state: radiationcrate_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: radiationcrate_open state_closed: radiationcrate_door - - type: Icon state: radiationcrate - type: entity - id: crate_internals + id: CrateInternals name: Internals Crate - parent: crate_generic + parent: CrateGeneric components: - type: Sprite layers: - state: o2crate - state: o2crate_door map: ["enum.StorageVisualLayers.Door"] - - type: Appearance visuals: - type: StorageVisualizer2D state_open: o2crate_open state_closed: o2crate_door - - type: Icon state: o2crate - type: entity - id: crate_flashlight + id: CrateFlashlights name: Flashlight Crate (x5) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: @@ -133,9 +121,9 @@ - FlashlightLantern - type: entity - id: crate_light_bulb + id: CrateLightBulb name: Light Bulb Crate (x10) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: @@ -151,20 +139,20 @@ - LightBulb - type: entity - id: crate_fire_extinguisher + id: CrateFireExtinguisher name: Fire Extinguisher Crate (x3) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: - - fire_extinguisher - - fire_extinguisher - - fire_extinguisher + - FireExtinguisher + - FireExtinguisher + - FireExtinguisher - type: entity - id: crate_pen + id: CratePen name: Pen Crate (x10) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: @@ -180,9 +168,9 @@ - Pen - type: entity - id: crate_bikehorn + id: CrateBikeHorn name: Bike Horn Crate (x5) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: @@ -193,9 +181,9 @@ - BikeHorn - type: entity - id: crate_cleaver + id: CrateCleaver name: Cleaver Crate (x5) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: @@ -206,36 +194,36 @@ - ButchCleaver - type: entity - id: crate_fueltank + id: CrateFuelTank name: Fuel Tank - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: - - weldtank + - WeldingFuelTank - type: entity - id: crate_medscanner + id: CrateMedicalScanner name: Medical Scanner - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: - - medical_scanner + - MedicalScanner - type: entity - id: crate_glass + id: CrateGlass name: Glass Sheet Crate (x50) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: - GlassStack - type: entity - id: crate_cable + id: CrateCable name: Cable Coil Crate (x50) - parent: crate_generic + parent: CrateGeneric components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/buildings/airlock_base.yml b/Resources/Prototypes/Entities/Buildings/airlock_base.yml similarity index 96% rename from Resources/Prototypes/Entities/buildings/airlock_base.yml rename to Resources/Prototypes/Entities/Buildings/airlock_base.yml index 5f6753de72..126978f4be 100644 --- a/Resources/Prototypes/Entities/buildings/airlock_base.yml +++ b/Resources/Prototypes/Entities/Buildings/airlock_base.yml @@ -1,5 +1,5 @@ - type: entity - id: airlock + id: Airlock name: Airlock description: It opens, it closes, and maybe crushes you. components: @@ -7,7 +7,6 @@ - type: InteractionOutline - type: Sprite netsync: false - drawdepth: Mobs # They're on the same layer as mobs, perspective. sprite: Buildings/airlock_basic.rsi layers: @@ -18,11 +17,9 @@ map: ["enum.DoorVisualLayers.BaseUnlit"] - state: panel_open map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Icon sprite: Buildings/airlock_basic.rsi state: closed - - type: Collidable shapes: - !type:PhysShapeAabb @@ -43,17 +40,15 @@ interfaces: - key: enum.WiresUiKey.Key type: WiresBoundUserInterface - - type: Occluder - type: SnapGrid offset: Center - placement: mode: SnapgridCenter - type: entity - id: airlock_glass - parent: airlock + id: AirlockGlass + parent: Airlock components: - type: Airlock occludes: false diff --git a/Resources/Prototypes/Entities/buildings/airlock_types.yml b/Resources/Prototypes/Entities/Buildings/airlock_types.yml similarity index 93% rename from Resources/Prototypes/Entities/buildings/airlock_types.yml rename to Resources/Prototypes/Entities/Buildings/airlock_types.yml index a30bdd6495..541dbfd969 100644 --- a/Resources/Prototypes/Entities/buildings/airlock_types.yml +++ b/Resources/Prototypes/Entities/Buildings/airlock_types.yml @@ -1,5 +1,5 @@ - type: entity - parent: airlock + parent: Airlock id: airlock_external name: External Airlock components: @@ -18,7 +18,7 @@ - type: WiresVisualizer2D - type: entity - parent: airlock + parent: Airlock id: airlock_engineering name: Engineering Airlock components: @@ -38,7 +38,7 @@ - type: entity - parent: airlock + parent: Airlock id: airlock_medical name: Medical Airlock components: @@ -49,7 +49,7 @@ sprite: Buildings/airlock_medical.rsi - type: entity - parent: airlock_glass + parent: AirlockGlass id: airlock_medical_glass name: Glass Medical Airlock components: @@ -61,7 +61,7 @@ - type: entity - parent: airlock + parent: Airlock id: airlock_science name: Science Airlock components: @@ -72,7 +72,7 @@ sprite: Buildings/airlock_science.rsi - type: entity - parent: airlock_glass + parent: AirlockGlass id: airlock_science_glass name: Glass Science Airlock components: diff --git a/Resources/Prototypes/Entities/buildings/asteroid.yml b/Resources/Prototypes/Entities/Buildings/asteroid.yml similarity index 96% rename from Resources/Prototypes/Entities/buildings/asteroid.yml rename to Resources/Prototypes/Entities/Buildings/asteroid.yml index 6d4f69edc3..ed5d834d8a 100644 --- a/Resources/Prototypes/Entities/buildings/asteroid.yml +++ b/Resources/Prototypes/Entities/Buildings/asteroid.yml @@ -1,5 +1,5 @@ - type: entity - id: asteroid_rock + id: AsteroidRock name: Asteroid Rock components: - type: AsteroidRock diff --git a/Resources/Prototypes/Entities/buildings/booze_dispenser.yml b/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml similarity index 90% rename from Resources/Prototypes/Entities/buildings/booze_dispenser.yml rename to Resources/Prototypes/Entities/Buildings/booze_dispenser.yml index 8e7f3ae2e8..fc55ba17dd 100644 --- a/Resources/Prototypes/Entities/buildings/booze_dispenser.yml +++ b/Resources/Prototypes/Entities/Buildings/booze_dispenser.yml @@ -1,8 +1,8 @@ - type: entity - id: booze_dispenser + id: BoozeDispenser name: Booze Dispenser description: A booze dispenser with a single slot for a container to be filled. - parent: reagent_dispenser_base + parent: ReagentDispenserBase components: - type: Sprite texture: Buildings/chemicals.rsi/booze_dispenser.png diff --git a/Resources/Prototypes/Entities/buildings/catwalk.yml b/Resources/Prototypes/Entities/Buildings/catwalk.yml similarity index 95% rename from Resources/Prototypes/Entities/buildings/catwalk.yml rename to Resources/Prototypes/Entities/Buildings/catwalk.yml index b8394c43f7..b63a68633c 100644 --- a/Resources/Prototypes/Entities/buildings/catwalk.yml +++ b/Resources/Prototypes/Entities/Buildings/catwalk.yml @@ -1,5 +1,5 @@ - type: entity - id: catwalk + id: Catwalk name: Catwalk components: - type: Clickable @@ -12,12 +12,9 @@ - type: Icon sprite: Buildings/catwalk.rsi state: catwalk_preview - - type: SnapGrid offset: Center - - type: IconSmooth key: catwalk base: catwalk_ - - type: Catwalk diff --git a/Resources/Prototypes/Entities/buildings/chem_dispenser.yml b/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml similarity index 95% rename from Resources/Prototypes/Entities/buildings/chem_dispenser.yml rename to Resources/Prototypes/Entities/Buildings/chem_dispenser.yml index 21ba174a64..5971c9400d 100644 --- a/Resources/Prototypes/Entities/buildings/chem_dispenser.yml +++ b/Resources/Prototypes/Entities/Buildings/chem_dispenser.yml @@ -1,7 +1,7 @@ - type: entity id: chem_dispenser name: Chemical Dispenser - parent: reagent_dispenser_base + parent: ReagentDispenserBase description: An industrial grade chemical dispenser with a sizeable chemical supply. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/buildings/computers.yml b/Resources/Prototypes/Entities/Buildings/computers.yml similarity index 89% rename from Resources/Prototypes/Entities/buildings/computers.yml rename to Resources/Prototypes/Entities/Buildings/computers.yml index bc8dbf9fe4..3771493ff0 100644 --- a/Resources/Prototypes/Entities/buildings/computers.yml +++ b/Resources/Prototypes/Entities/Buildings/computers.yml @@ -1,5 +1,5 @@ - type: entity - id: computerBase + id: ComputerBase name: Computer abstract: true components: @@ -44,8 +44,8 @@ - type: entity - id: computerAlert - parent: computerBase + id: ComputerAlert + parent: ComputerBase name: Alerts Computer components: - type: Appearance @@ -56,8 +56,8 @@ - type: entity - id: computerPowerMonitoring - parent: computerBase + id: ComputerPowerMonitoring + parent: ComputerBase name: Power Monitoring Computer components: - type: Appearance @@ -68,8 +68,8 @@ - type: entity - id: computerSupplyOrdering - parent: computerBase + id: ComputerSupplyOrdering + parent: ComputerBase name: Cargo Ordering Computer components: - type: Appearance @@ -100,8 +100,8 @@ type: CargoConsoleBoundUserInterface - type: entity - id: computerSupplyRequest - parent: computerSupplyOrdering + id: ComputerSupplyRequest + parent: ComputerSupplyOrdering name: Cargo Request Computer components: - type: Appearance @@ -113,8 +113,8 @@ requestOnly: true - type: entity - id: computerMedicalRecords - parent: computerBase + id: ComputerMedicalRecords + parent: ComputerBase name: Medical Records Computer components: - type: Appearance @@ -125,8 +125,8 @@ - type: entity - id: computerResearchAndDevelopment - parent: computerBase + id: ComputerResearchAndDevelopment + parent: ComputerBase name: R&D Computer components: - type: Appearance @@ -149,8 +149,8 @@ priority: Low - type: entity - id: computerId - parent: computerBase + id: ComputerId + parent: ComputerBase name: ID Card Computer components: - type: AccessReader @@ -167,8 +167,8 @@ screen: id - type: entity - id: computerComms - parent: computerBase + id: ComputerComms + parent: ComputerBase name: Communications Computer components: - type: Appearance diff --git a/Resources/Prototypes/Entities/buildings/fuel_tank.yml b/Resources/Prototypes/Entities/Buildings/fuel_tank.yml similarity index 96% rename from Resources/Prototypes/Entities/buildings/fuel_tank.yml rename to Resources/Prototypes/Entities/Buildings/fuel_tank.yml index 061d411b79..2ecf599ebe 100644 --- a/Resources/Prototypes/Entities/buildings/fuel_tank.yml +++ b/Resources/Prototypes/Entities/Buildings/fuel_tank.yml @@ -1,5 +1,5 @@ - type: entity - id: weldtank + id: WeldingFuelTank name: Fueltank description: A storage tank containing welding fuel. components: diff --git a/Resources/Prototypes/Entities/buildings/furniture.yml b/Resources/Prototypes/Entities/Buildings/furniture.yml similarity index 94% rename from Resources/Prototypes/Entities/buildings/furniture.yml rename to Resources/Prototypes/Entities/Buildings/furniture.yml index 331350adbb..a45eacb2da 100644 --- a/Resources/Prototypes/Entities/buildings/furniture.yml +++ b/Resources/Prototypes/Entities/Buildings/furniture.yml @@ -1,6 +1,6 @@ - type: entity name: Stool - id: stool + id: Stool components: - type: Clickable - type: InteractionOutline @@ -15,7 +15,7 @@ - type: entity name: White Office Chair - id: chairOfficeLight + id: ChairOfficeLight components: - type: Rotatable - type: Clickable @@ -30,7 +30,7 @@ - type: entity name: Dark Office Chair - id: chairOfficeDark + id: ChairOfficeDark components: - type: Rotatable - type: Clickable @@ -45,7 +45,7 @@ - type: entity name: Chair - id: chair + id: Chair components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/buildings/girder.yml b/Resources/Prototypes/Entities/Buildings/girder.yml similarity index 97% rename from Resources/Prototypes/Entities/buildings/girder.yml rename to Resources/Prototypes/Entities/Buildings/girder.yml index 025f61f544..4bbe7e2da9 100644 --- a/Resources/Prototypes/Entities/buildings/girder.yml +++ b/Resources/Prototypes/Entities/Buildings/girder.yml @@ -1,5 +1,5 @@ - type: entity - id: girder + id: Girder name: Girder components: - type: Clickable diff --git a/Resources/Prototypes/Entities/buildings/instruments.yml b/Resources/Prototypes/Entities/Buildings/instruments.yml similarity index 100% rename from Resources/Prototypes/Entities/buildings/instruments.yml rename to Resources/Prototypes/Entities/Buildings/instruments.yml diff --git a/Resources/Prototypes/Entities/buildings/lathe.yml b/Resources/Prototypes/Entities/Buildings/lathe.yml similarity index 98% rename from Resources/Prototypes/Entities/buildings/lathe.yml rename to Resources/Prototypes/Entities/Buildings/lathe.yml index 67a52069f2..e95f7e1ece 100644 --- a/Resources/Prototypes/Entities/buildings/lathe.yml +++ b/Resources/Prototypes/Entities/Buildings/lathe.yml @@ -18,7 +18,7 @@ - type: entity parent: BaseLathe - id: autolathe + id: Autolathe name: "Autolathe" components: - type: Sprite @@ -61,7 +61,7 @@ - type: entity parent: BaseLathe - id: protolathe + id: Protolathe name: "Protolathe" components: - type: Sprite diff --git a/Resources/Prototypes/Entities/buildings/lighting.yml b/Resources/Prototypes/Entities/Buildings/lighting.yml similarity index 91% rename from Resources/Prototypes/Entities/buildings/lighting.yml rename to Resources/Prototypes/Entities/Buildings/lighting.yml index 5f2ab8bd04..fd7f22ef65 100644 --- a/Resources/Prototypes/Entities/buildings/lighting.yml +++ b/Resources/Prototypes/Entities/Buildings/lighting.yml @@ -1,5 +1,5 @@ - type: entity - id: wall_light + id: WallLight name: "Unpowered Light" components: - type: Clickable @@ -9,25 +9,22 @@ - type: Sprite sprite: Buildings/light_tube.rsi state: on - - type: Icon sprite: Buildings/light_tube.rsi state: on - - type: PointLight radius: 8 energy: 1.2 offset: "0.5, 0" color: "#DCDCC6" - placement: snap: - Wallmount - type: entity name: Light - id: poweredlight - parent: wall_light + id: Poweredlight + parent: WallLight components: - type: Clickable - type: InteractionOutline @@ -35,43 +32,35 @@ - type: Sprite sprite: Buildings/light_tube.rsi state: off - - type: Icon sprite: Buildings/light_tube.rsi state: off - - type: PointLight enabled: false - - type: PowerDevice priority: Low - - type: PoweredLight bulb: Tube - type: entity name: Small Light - id: poweredsmalllight - parent: wall_light + id: PoweredSmallLight + parent: WallLight components: - type: Clickable - type: InteractionOutline - type: Sprite sprite: Buildings/light_small.rsi state: off - - type: Icon sprite: Buildings/light_small.rsi state: off - - type: PointLight energy: 1.0 enabled: false offset: "-0.5, 0" - - type: PowerDevice priority: Low - - type: PoweredLight bulb: Bulb diff --git a/Resources/Prototypes/Entities/buildings/low_wall.yml b/Resources/Prototypes/Entities/Buildings/low_wall.yml similarity index 95% rename from Resources/Prototypes/Entities/buildings/low_wall.yml rename to Resources/Prototypes/Entities/Buildings/low_wall.yml index 9b89d767aa..570009dc01 100644 --- a/Resources/Prototypes/Entities/buildings/low_wall.yml +++ b/Resources/Prototypes/Entities/Buildings/low_wall.yml @@ -1,5 +1,5 @@ - type: entity - id: low_wall + id: LowWall name: Low Wall description: Goes up to about your waist. placement: @@ -35,7 +35,7 @@ base: metal_ - type: entity - id: low_wall_overlay + id: LowWallOverlay name: Low Wall Overlay abstract: true components: diff --git a/Resources/Prototypes/Entities/buildings/medical_scanner.yml b/Resources/Prototypes/Entities/Buildings/medical_scanner.yml similarity index 97% rename from Resources/Prototypes/Entities/buildings/medical_scanner.yml rename to Resources/Prototypes/Entities/Buildings/medical_scanner.yml index 9ad614ce7b..aae8cefd16 100644 --- a/Resources/Prototypes/Entities/buildings/medical_scanner.yml +++ b/Resources/Prototypes/Entities/Buildings/medical_scanner.yml @@ -1,5 +1,5 @@ - type: entity - id: medical_scanner + id: MedicalScanner name: Medical Scanner description: A bulky medical scanner. components: diff --git a/Resources/Prototypes/Entities/buildings/mirror.yml b/Resources/Prototypes/Entities/Buildings/mirror.yml similarity index 97% rename from Resources/Prototypes/Entities/buildings/mirror.yml rename to Resources/Prototypes/Entities/Buildings/mirror.yml index c0a09ea9be..893ef1d969 100644 --- a/Resources/Prototypes/Entities/buildings/mirror.yml +++ b/Resources/Prototypes/Entities/Buildings/mirror.yml @@ -1,5 +1,5 @@ - type: entity - id: mirror + id: Mirror name: Mirror components: - type: Sprite diff --git a/Resources/Prototypes/Entities/buildings/power.yml b/Resources/Prototypes/Entities/Buildings/power.yml similarity index 99% rename from Resources/Prototypes/Entities/buildings/power.yml rename to Resources/Prototypes/Entities/Buildings/power.yml index 1fbe57db4b..5191c4e1f0 100644 --- a/Resources/Prototypes/Entities/buildings/power.yml +++ b/Resources/Prototypes/Entities/Buildings/power.yml @@ -161,7 +161,7 @@ offset: Center - type: entity - id: smes_dry + id: SmesDry parent: SMES components: - type: PowerStorage diff --git a/Resources/Prototypes/Entities/buildings/reagent_dispenser_base.yml b/Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml similarity index 94% rename from Resources/Prototypes/Entities/buildings/reagent_dispenser_base.yml rename to Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml index 31e1ee5d2d..5cdf627462 100644 --- a/Resources/Prototypes/Entities/buildings/reagent_dispenser_base.yml +++ b/Resources/Prototypes/Entities/Buildings/reagent_dispenser_base.yml @@ -1,6 +1,6 @@ - type: entity abstract: true - id: reagent_dispenser_base + id: ReagentDispenserBase components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/buildings/shuttle.yml b/Resources/Prototypes/Entities/Buildings/shuttle.yml similarity index 96% rename from Resources/Prototypes/Entities/buildings/shuttle.yml rename to Resources/Prototypes/Entities/Buildings/shuttle.yml index 05561c64dc..9a51eb4e5a 100644 --- a/Resources/Prototypes/Entities/buildings/shuttle.yml +++ b/Resources/Prototypes/Entities/Buildings/shuttle.yml @@ -1,7 +1,7 @@ - type: entity name: Pilot Chair description: The driver seat of a prestigious battle cruiser. - id: pilotseat_chair + id: PilotSeatChair components: - type: Sprite sprite: Buildings/furniture.rsi diff --git a/Resources/Prototypes/Entities/buildings/soda_dispenser.yml b/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml similarity index 94% rename from Resources/Prototypes/Entities/buildings/soda_dispenser.yml rename to Resources/Prototypes/Entities/Buildings/soda_dispenser.yml index ce0bcebb75..f9148f949e 100644 --- a/Resources/Prototypes/Entities/buildings/soda_dispenser.yml +++ b/Resources/Prototypes/Entities/Buildings/soda_dispenser.yml @@ -1,7 +1,7 @@ - type: entity id: soda_dispenser name: Soda Dispenser - parent: reagent_dispenser_base + parent: ReagentDispenserBase description: A beverage dispenser with a selection of soda and several other common beverages. Has a single fill slot for containers. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/buildings/table.yml b/Resources/Prototypes/Entities/Buildings/table.yml similarity index 94% rename from Resources/Prototypes/Entities/buildings/table.yml rename to Resources/Prototypes/Entities/Buildings/table.yml index 5c52b02115..12d8585e49 100644 --- a/Resources/Prototypes/Entities/buildings/table.yml +++ b/Resources/Prototypes/Entities/Buildings/table.yml @@ -1,6 +1,6 @@ - type: entity - id: table - name: "table" + id: Table + name: "Table" components: - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/buildings/turret.yml b/Resources/Prototypes/Entities/Buildings/turret.yml similarity index 100% rename from Resources/Prototypes/Entities/buildings/turret.yml rename to Resources/Prototypes/Entities/Buildings/turret.yml diff --git a/Resources/Prototypes/Entities/buildings/vending_machines.yml b/Resources/Prototypes/Entities/Buildings/vending_machines.yml similarity index 88% rename from Resources/Prototypes/Entities/buildings/vending_machines.yml rename to Resources/Prototypes/Entities/Buildings/vending_machines.yml index 84af9207d1..19fb4399ac 100644 --- a/Resources/Prototypes/Entities/buildings/vending_machines.yml +++ b/Resources/Prototypes/Entities/Buildings/vending_machines.yml @@ -43,7 +43,7 @@ - type: entity parent: VendingMachine - id: vending_machine_ammo + id: VendingMachineAmmo name: AmmoVend components: - type: VendingMachine @@ -53,7 +53,7 @@ - type: entity parent: VendingMachine - id: vending_machine_booze + id: VendingMachineBooze name: Booze-O-Mat components: - type: VendingMachine @@ -63,7 +63,7 @@ - type: entity parent: VendingMachine - id: vending_machine_cart + id: VendingMachineCart name: PTech components: - type: VendingMachine @@ -73,7 +73,7 @@ - type: entity parent: VendingMachine - id: vending_machine_chapel + id: VendingMachineChapel name: PietyVend components: - type: VendingMachine @@ -83,7 +83,7 @@ - type: entity parent: VendingMachine - id: vending_machine_cigs + id: VendingMachineCigs name: Cigarette machine components: - type: VendingMachine @@ -93,7 +93,7 @@ - type: entity parent: VendingMachine - id: vending_machine_coffee + id: VendingMachineCoffee name: Hot Drinks machine components: - type: VendingMachine @@ -113,7 +113,7 @@ - type: entity parent: VendingMachine - id: vending_machine_cola + id: VendingMachineCola name: Robust Softdrinks components: - type: VendingMachine @@ -123,7 +123,7 @@ - type: entity parent: VendingMachine - id: vending_machine_dinnerware + id: VendingMachineDinnerware name: Dinnerware components: - type: VendingMachine @@ -133,7 +133,7 @@ - type: entity parent: VendingMachine - id: vending_machine_discount + id: VendingMachineDiscount name: Discount Dan's components: - type: VendingMachine @@ -143,7 +143,7 @@ - type: entity parent: VendingMachine - id: vending_machine_engivend + id: VendingMachineEngivend name: Engi-Vend components: - type: VendingMachine @@ -153,7 +153,7 @@ - type: entity parent: VendingMachine - id: vending_machine_hats + id: VendingMachineHats name: Hatlord 9000 components: - type: VendingMachine @@ -163,7 +163,7 @@ - type: entity parent: VendingMachine - id: vending_machine_magivend + id: VendingMachineMagivend name: MagiVend components: - type: VendingMachine @@ -173,7 +173,7 @@ - type: entity parent: VendingMachine - id: vending_machine_medical + id: VendingMachineMedical name: NanoMed Plus components: - type: VendingMachine @@ -183,7 +183,7 @@ - type: entity parent: VendingMachine - id: vending_machine_mining + id: VendingMachineMining name: Dwarven Mining Equipment components: - type: VendingMachine @@ -193,7 +193,7 @@ - type: entity parent: VendingMachine - id: vending_machine_nutri + id: VendingMachineNutri name: NutriMax components: - type: VendingMachine @@ -203,7 +203,7 @@ - type: entity parent: VendingMachine - id: vending_machine_robotics + id: VendingMachineRobotics name: Robotech Deluxe components: - type: VendingMachine @@ -213,7 +213,7 @@ - type: entity parent: VendingMachine - id: vending_machine_sales + id: VendingMachineSales name: Sales components: - type: VendingMachine @@ -223,7 +223,7 @@ - type: entity parent: VendingMachine - id: vending_machine_sec + id: VendingMachineSec name: SecTech components: - type: VendingMachine @@ -233,7 +233,7 @@ - type: entity parent: VendingMachine - id: vending_machine_seeds + id: VendingMachineSeeds name: MegaSeed Servitor components: - type: VendingMachine @@ -243,7 +243,7 @@ - type: entity parent: VendingMachine - id: vending_machine_shoes + id: VendingMachineShoes name: Shoelord 9000 components: - type: VendingMachine @@ -253,7 +253,7 @@ - type: entity parent: VendingMachine - id: vending_machine_smartfridge + id: VendingMachineSmartFridge name: SmartFridge components: - type: VendingMachine @@ -263,7 +263,7 @@ - type: entity parent: VendingMachine - id: vending_machine_snack + id: VendingMachineSnack name: Getmore Chocolate Corp components: - type: VendingMachine @@ -273,7 +273,7 @@ - type: entity parent: VendingMachine - id: vending_machine_soviet + id: VendingMachineSoviet name: Товарищ-vend components: - type: VendingMachine @@ -283,7 +283,7 @@ - type: entity parent: VendingMachine - id: vending_machine_sovietsoda + id: VendingMachineSovietSoda name: BODA components: - type: VendingMachine @@ -293,7 +293,7 @@ - type: entity parent: VendingMachine - id: vending_machine_suits + id: VendingMachineSuits name: Suitlord 9000 components: - type: VendingMachine @@ -303,7 +303,7 @@ - type: entity parent: VendingMachine - id: vending_machine_theater + id: VendingMachineTheater name: AutoDrobe components: - type: VendingMachine @@ -313,7 +313,7 @@ - type: entity parent: VendingMachine - id: vending_machine_vendomat + id: VendingMachineVendomat name: Vendomat components: - type: VendingMachine @@ -323,7 +323,7 @@ - type: entity parent: VendingMachine - id: vending_machine_vox + id: VendingMachineVox name: Trader Supply components: - type: VendingMachine @@ -333,7 +333,7 @@ - type: entity parent: VendingMachine - id: vending_machine_wallmed + id: VendingMachineWallMedical name: NanoMed components: - type: VendingMachine @@ -343,7 +343,7 @@ - type: entity parent: VendingMachine - id: vending_machine_youtool + id: VendingMachineYouTool name: YouTool components: - type: VendingMachine diff --git a/Resources/Prototypes/Entities/buildings/walls.yml b/Resources/Prototypes/Entities/Buildings/walls.yml similarity index 92% rename from Resources/Prototypes/Entities/buildings/walls.yml rename to Resources/Prototypes/Entities/Buildings/walls.yml index 03c0b435fe..5a479212bb 100644 --- a/Resources/Prototypes/Entities/buildings/walls.yml +++ b/Resources/Prototypes/Entities/Buildings/walls.yml @@ -24,7 +24,7 @@ - type: Damageable - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: Occluder sizeX: 32 sizeY: 32 @@ -47,7 +47,7 @@ sprite: Buildings/Walls/brick.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: brick @@ -63,7 +63,7 @@ sprite: Buildings/Walls/clock.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: clock @@ -79,7 +79,7 @@ sprite: Buildings/Walls/clown.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: clown @@ -96,7 +96,7 @@ sprite: Buildings/Walls/cult.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: cult @@ -112,7 +112,7 @@ sprite: Buildings/Walls/debug.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: debug @@ -128,7 +128,7 @@ sprite: Buildings/Walls/diamond.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: diamond @@ -145,7 +145,7 @@ sprite: Buildings/Walls/gold.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: gold @@ -161,7 +161,7 @@ sprite: Buildings/Walls/ice.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: ice @@ -177,7 +177,7 @@ sprite: Buildings/Walls/metal.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: metal @@ -193,7 +193,7 @@ sprite: Buildings/Walls/plasma.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: plasma @@ -209,7 +209,7 @@ sprite: Buildings/Walls/plastic.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: plastic @@ -225,7 +225,7 @@ sprite: Buildings/Walls/reinforced.rsi - type: Destructible thresholdvalue: 300 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: reinforced @@ -242,7 +242,7 @@ sprite: Buildings/Walls/riveted.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: riveted @@ -258,7 +258,7 @@ sprite: Buildings/Walls/sandstone.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: sandstone @@ -274,7 +274,7 @@ sprite: Buildings/Walls/silver.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: silver @@ -291,7 +291,7 @@ sprite: Buildings/Walls/solid.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder destroysound: /Audio/effects/metalbreak.ogg - type: IconSmooth key: walls @@ -308,7 +308,7 @@ sprite: Buildings/Walls/uranium.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: uranium @@ -324,7 +324,7 @@ sprite: Buildings/Walls/wood.rsi - type: Destructible thresholdvalue: 100 - spawnondestroy: girder + spawnondestroy: Girder - type: IconSmooth key: walls base: wood diff --git a/Resources/Prototypes/Entities/buildings/windows.yml b/Resources/Prototypes/Entities/Buildings/windows.yml similarity index 89% rename from Resources/Prototypes/Entities/buildings/windows.yml rename to Resources/Prototypes/Entities/Buildings/windows.yml index fefb671a8b..0749a88121 100644 --- a/Resources/Prototypes/Entities/buildings/windows.yml +++ b/Resources/Prototypes/Entities/Buildings/windows.yml @@ -1,5 +1,5 @@ - type: entity - id: window + id: Window name: Window description: Don't smudge up the glass down there. placement: @@ -14,11 +14,9 @@ netsync: false drawdepth: WallTops sprite: Buildings/window.rsi - - type: Icon sprite: Buildings/window.rsi state: full - - type: Collidable shapes: - !type:PhysShapeAabb @@ -27,25 +25,21 @@ - type: Damageable - type: Destructible thresholdvalue: 100 - - type: SnapGrid offset: Center - - type: Window - base: window + base: Window - type: entity - id: rwindow + id: ReinforcedWindow name: Reinforced Window - parent: window + parent: Window components: - type: Sprite drawdepth: WallTops sprite: Buildings/rwindow.rsi - - type: Window - base: rwindow - + base: ReinforcedWindow - type: Icon sprite: Buildings/rwindow.rsi state: full diff --git a/Resources/Prototypes/Entities/Effects/AnimationsTest.yml b/Resources/Prototypes/Entities/Effects/animations_test.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/AnimationsTest.yml rename to Resources/Prototypes/Entities/Effects/animations_test.yml diff --git a/Resources/Prototypes/Entities/Effects/WeaponArc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml similarity index 100% rename from Resources/Prototypes/Entities/Effects/WeaponArc.yml rename to Resources/Prototypes/Entities/Effects/weapon_arc.yml diff --git a/Resources/Prototypes/Entities/items/clothing/IDs.yml b/Resources/Prototypes/Entities/Items/Clothing/IDs.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/IDs.yml rename to Resources/Prototypes/Entities/Items/Clothing/IDs.yml diff --git a/Resources/Prototypes/Entities/items/clothing/OuterClothing.yml b/Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/OuterClothing.yml rename to Resources/Prototypes/Entities/Items/Clothing/OuterClothing.yml diff --git a/Resources/Prototypes/Entities/items/clothing/backpacks.yml b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/backpacks.yml rename to Resources/Prototypes/Entities/Items/Clothing/backpacks.yml diff --git a/Resources/Prototypes/Entities/items/clothing/belts.yml b/Resources/Prototypes/Entities/Items/Clothing/belts.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/belts.yml rename to Resources/Prototypes/Entities/Items/Clothing/belts.yml diff --git a/Resources/Prototypes/Entities/items/clothing/clothing_base.yml b/Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/clothing_base.yml rename to Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml diff --git a/Resources/Prototypes/Entities/items/clothing/ears.yml b/Resources/Prototypes/Entities/Items/Clothing/ears.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/ears.yml rename to Resources/Prototypes/Entities/Items/Clothing/ears.yml diff --git a/Resources/Prototypes/Entities/items/clothing/eyes.yml b/Resources/Prototypes/Entities/Items/Clothing/eyes.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/eyes.yml rename to Resources/Prototypes/Entities/Items/Clothing/eyes.yml diff --git a/Resources/Prototypes/Entities/items/clothing/gloves.yml b/Resources/Prototypes/Entities/Items/Clothing/gloves.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/gloves.yml rename to Resources/Prototypes/Entities/Items/Clothing/gloves.yml diff --git a/Resources/Prototypes/Entities/items/clothing/hats.yml b/Resources/Prototypes/Entities/Items/Clothing/hats.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/hats.yml rename to Resources/Prototypes/Entities/Items/Clothing/hats.yml diff --git a/Resources/Prototypes/Entities/items/clothing/masks.yml b/Resources/Prototypes/Entities/Items/Clothing/masks.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/masks.yml rename to Resources/Prototypes/Entities/Items/Clothing/masks.yml diff --git a/Resources/Prototypes/Entities/items/clothing/shoes.yml b/Resources/Prototypes/Entities/Items/Clothing/shoes.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/shoes.yml rename to Resources/Prototypes/Entities/Items/Clothing/shoes.yml diff --git a/Resources/Prototypes/Entities/items/clothing/shoes/clown.yml b/Resources/Prototypes/Entities/Items/Clothing/shoes/clown.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/shoes/clown.yml rename to Resources/Prototypes/Entities/Items/Clothing/shoes/clown.yml diff --git a/Resources/Prototypes/Entities/items/clothing/shoes/jackboots.yml b/Resources/Prototypes/Entities/Items/Clothing/shoes/jackboots.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/shoes/jackboots.yml rename to Resources/Prototypes/Entities/Items/Clothing/shoes/jackboots.yml diff --git a/Resources/Prototypes/Entities/items/clothing/uniforms.yml b/Resources/Prototypes/Entities/Items/Clothing/uniforms.yml similarity index 100% rename from Resources/Prototypes/Entities/items/clothing/uniforms.yml rename to Resources/Prototypes/Entities/Items/Clothing/uniforms.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/drinks.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/drinks.yml rename to Resources/Prototypes/Entities/Items/Consumables/drinks.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/drinks_bottles.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/drinks_bottles.yml rename to Resources/Prototypes/Entities/Items/Consumables/drinks_bottles.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/drinks_cans.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/drinks_cans.yml rename to Resources/Prototypes/Entities/Items/Consumables/drinks_cans.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/drinks_cups.yml b/Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/drinks_cups.yml rename to Resources/Prototypes/Entities/Items/Consumables/drinks_cups.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/food.yml b/Resources/Prototypes/Entities/Items/Consumables/food.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/food.yml rename to Resources/Prototypes/Entities/Items/Consumables/food.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/food_containers.yml b/Resources/Prototypes/Entities/Items/Consumables/food_containers.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/food_containers.yml rename to Resources/Prototypes/Entities/Items/Consumables/food_containers.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/trash.yml b/Resources/Prototypes/Entities/Items/Consumables/trash.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/trash.yml rename to Resources/Prototypes/Entities/Items/Consumables/trash.yml diff --git a/Resources/Prototypes/Entities/items/Consumables/trash_drinks.yml b/Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Consumables/trash_drinks.yml rename to Resources/Prototypes/Entities/Items/Consumables/trash_drinks.yml diff --git a/Resources/Prototypes/Entities/items/Instruments.yml b/Resources/Prototypes/Entities/Items/Instruments.yml similarity index 100% rename from Resources/Prototypes/Entities/items/Instruments.yml rename to Resources/Prototypes/Entities/Items/Instruments.yml diff --git a/Resources/Prototypes/Entities/items/weapons/kitchen.yml b/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml similarity index 100% rename from Resources/Prototypes/Entities/items/weapons/kitchen.yml rename to Resources/Prototypes/Entities/Items/Weapons/kitchen.yml diff --git a/Resources/Prototypes/Entities/items/weapons/mining.yml b/Resources/Prototypes/Entities/Items/Weapons/mining.yml similarity index 100% rename from Resources/Prototypes/Entities/items/weapons/mining.yml rename to Resources/Prototypes/Entities/Items/Weapons/mining.yml diff --git a/Resources/Prototypes/Entities/items/weapons/spear.yml b/Resources/Prototypes/Entities/Items/Weapons/spear.yml similarity index 100% rename from Resources/Prototypes/Entities/items/weapons/spear.yml rename to Resources/Prototypes/Entities/Items/Weapons/spear.yml diff --git a/Resources/Prototypes/Entities/items/bike_horn.yml b/Resources/Prototypes/Entities/Items/bike_horn.yml similarity index 100% rename from Resources/Prototypes/Entities/items/bike_horn.yml rename to Resources/Prototypes/Entities/Items/bike_horn.yml diff --git a/Resources/Prototypes/Entities/items/chemistry.yml b/Resources/Prototypes/Entities/Items/chemistry.yml similarity index 100% rename from Resources/Prototypes/Entities/items/chemistry.yml rename to Resources/Prototypes/Entities/Items/chemistry.yml diff --git a/Resources/Prototypes/Entities/items/dice.yml b/Resources/Prototypes/Entities/Items/dice.yml similarity index 100% rename from Resources/Prototypes/Entities/items/dice.yml rename to Resources/Prototypes/Entities/Items/dice.yml diff --git a/Resources/Prototypes/Entities/items/explosives.yml b/Resources/Prototypes/Entities/Items/explosives.yml similarity index 100% rename from Resources/Prototypes/Entities/items/explosives.yml rename to Resources/Prototypes/Entities/Items/explosives.yml diff --git a/Resources/Prototypes/Entities/items/fire_extinguisher.yml b/Resources/Prototypes/Entities/Items/fire_extinguisher.yml similarity index 91% rename from Resources/Prototypes/Entities/items/fire_extinguisher.yml rename to Resources/Prototypes/Entities/Items/fire_extinguisher.yml index 44b619b6f6..71e5b68602 100644 --- a/Resources/Prototypes/Entities/items/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Items/fire_extinguisher.yml @@ -1,7 +1,7 @@ - type: entity name: Fire Extinguisher parent: BaseItem - id: fire_extinguisher + id: FireExtinguisher description: Extinguishes fires. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/items/flashlight.yml b/Resources/Prototypes/Entities/Items/flashlight.yml similarity index 100% rename from Resources/Prototypes/Entities/items/flashlight.yml rename to Resources/Prototypes/Entities/Items/flashlight.yml diff --git a/Resources/Prototypes/Entities/items/item_base.yml b/Resources/Prototypes/Entities/Items/item_base.yml similarity index 100% rename from Resources/Prototypes/Entities/items/item_base.yml rename to Resources/Prototypes/Entities/Items/item_base.yml diff --git a/Resources/Prototypes/Entities/items/light_bulb.yml b/Resources/Prototypes/Entities/Items/light_bulb.yml similarity index 100% rename from Resources/Prototypes/Entities/items/light_bulb.yml rename to Resources/Prototypes/Entities/Items/light_bulb.yml diff --git a/Resources/Prototypes/Entities/items/materials.yml b/Resources/Prototypes/Entities/Items/materials.yml similarity index 100% rename from Resources/Prototypes/Entities/items/materials.yml rename to Resources/Prototypes/Entities/Items/materials.yml diff --git a/Resources/Prototypes/Entities/items/medical.yml b/Resources/Prototypes/Entities/Items/medical.yml similarity index 100% rename from Resources/Prototypes/Entities/items/medical.yml rename to Resources/Prototypes/Entities/Items/medical.yml diff --git a/Resources/Prototypes/Entities/items/paper.yml b/Resources/Prototypes/Entities/Items/paper.yml similarity index 100% rename from Resources/Prototypes/Entities/items/paper.yml rename to Resources/Prototypes/Entities/Items/paper.yml diff --git a/Resources/Prototypes/Entities/items/powercells.yml b/Resources/Prototypes/Entities/Items/powercells.yml similarity index 100% rename from Resources/Prototypes/Entities/items/powercells.yml rename to Resources/Prototypes/Entities/Items/powercells.yml diff --git a/Resources/Prototypes/Entities/items/skub.yml b/Resources/Prototypes/Entities/Items/skub.yml similarity index 100% rename from Resources/Prototypes/Entities/items/skub.yml rename to Resources/Prototypes/Entities/Items/skub.yml diff --git a/Resources/Prototypes/Entities/items/table_parts.yml b/Resources/Prototypes/Entities/Items/table_parts.yml similarity index 100% rename from Resources/Prototypes/Entities/items/table_parts.yml rename to Resources/Prototypes/Entities/Items/table_parts.yml diff --git a/Resources/Prototypes/Entities/items/teleporters.yml b/Resources/Prototypes/Entities/Items/teleporters.yml similarity index 100% rename from Resources/Prototypes/Entities/items/teleporters.yml rename to Resources/Prototypes/Entities/Items/teleporters.yml diff --git a/Resources/Prototypes/Entities/items/tiles.yml b/Resources/Prototypes/Entities/Items/tiles.yml similarity index 100% rename from Resources/Prototypes/Entities/items/tiles.yml rename to Resources/Prototypes/Entities/Items/tiles.yml diff --git a/Resources/Prototypes/Entities/items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml similarity index 100% rename from Resources/Prototypes/Entities/items/toolbox.yml rename to Resources/Prototypes/Entities/Items/toolbox.yml diff --git a/Resources/Prototypes/Entities/items/tools.yml b/Resources/Prototypes/Entities/Items/tools.yml similarity index 100% rename from Resources/Prototypes/Entities/items/tools.yml rename to Resources/Prototypes/Entities/Items/tools.yml diff --git a/Resources/Prototypes/Entities/markers/construction_ghost.yml b/Resources/Prototypes/Entities/Markers/construction_ghost.yml similarity index 100% rename from Resources/Prototypes/Entities/markers/construction_ghost.yml rename to Resources/Prototypes/Entities/Markers/construction_ghost.yml diff --git a/Resources/Prototypes/Entities/markers/spawn_points.yml b/Resources/Prototypes/Entities/Markers/spawn_points.yml similarity index 100% rename from Resources/Prototypes/Entities/markers/spawn_points.yml rename to Resources/Prototypes/Entities/Markers/spawn_points.yml diff --git a/Resources/Prototypes/Entities/mobs/adminghost.yml b/Resources/Prototypes/Entities/Mobs/admin_ghost.yml similarity index 100% rename from Resources/Prototypes/Entities/mobs/adminghost.yml rename to Resources/Prototypes/Entities/Mobs/admin_ghost.yml diff --git a/Resources/Prototypes/Entities/mobs/human.yml b/Resources/Prototypes/Entities/Mobs/human.yml similarity index 97% rename from Resources/Prototypes/Entities/mobs/human.yml rename to Resources/Prototypes/Entities/Mobs/human.yml index 3fa58bea9b..88e23fd6c0 100644 --- a/Resources/Prototypes/Entities/mobs/human.yml +++ b/Resources/Prototypes/Entities/Mobs/human.yml @@ -23,8 +23,6 @@ - type: Stomach max_volume: 250 digestionDelay: 20 - - - type: Inventory - type: Constructor - type: Clickable @@ -60,19 +58,16 @@ color: "#e8b59b" sprite: Mob/human.rsi state: human_l_leg - - - shader: stencilClear + - shader: StencilClear sprite: Mob/human.rsi state: human_l_leg - - shader: stencilMask + - shader: StencilMask map: ["enum.HumanoidVisualLayers.StencilMask"] sprite: Mob/masking_helpers.rsi state: female_full visible: false - - map: ["enum.Slots.INNERCLOTHING"] - shader: stencilDraw - + shader: StencilDraw - map: ["enum.HumanoidVisualLayers.LHand"] color: "#e8b59b" sprite: Mob/human.rsi @@ -81,7 +76,6 @@ color: "#e8b59b" sprite: Mob/human.rsi state: human_r_hand - - map: ["enum.Slots.IDCARD"] - map: ["enum.Slots.GLOVES"] - map: ["enum.Slots.SHOES"] @@ -100,24 +94,19 @@ - map: ["enum.Slots.HEAD"] - map: ["hand-left"] - map: ["hand-right"] - - type: Icon sprite: Mob/human.rsi state: human_basic - - type: Physics mass: 85 - - type: Collidable shapes: - !type:PhysShapeAabb bounds: "-0.35,-0.35,0.35,0.35" mask: 30 layer: 4 - - type: Input context: "human" - - type: Species Template: Human HeatResistance: 323 @@ -125,15 +114,12 @@ - type: OverlayEffectsUI - type: HeatResistance - type: Damageable - - type: Eye zoom: 0.5, 0.5 - - type: CameraRecoil - type: Appearance visuals: - type: SpeciesVisualizer2D - - type: CombatMode - type: Teleportable - type: Examiner @@ -187,15 +173,15 @@ sprite: Mob/human.rsi state: human_l_leg - - shader: stencilClear - - shader: stencilMask + - shader: StencilClear + - shader: StencilMask map: ["enum.HumanoidVisualLayers.StencilMask"] sprite: Mob/masking_helpers.rsi state: female_full visible: false - map: ["enum.Slots.INNERCLOTHING"] - shader: stencilDraw + shader: StencilDraw - map: ["enum.HumanoidVisualLayers.LHand"] color: "#e8b59b" diff --git a/Resources/Prototypes/Entities/mobs/observer.yml b/Resources/Prototypes/Entities/Mobs/observer.yml similarity index 100% rename from Resources/Prototypes/Entities/mobs/observer.yml rename to Resources/Prototypes/Entities/Mobs/observer.yml diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml index da62a0d23c..52cced5db7 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/10mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_10mm name: 10mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_10mmf name: 10mm Bullet (Flash) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_10mmhv name: 10mm Bullet (High-Velocity) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_10mml name: 10mm Bullet (L) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_10mmp name: 10mm Bullet (Practice) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_10mmr name: 10mm Bullet (Rubber) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml index 1faf5bb8e7..ee03763788 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/12g/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: pellet_12g name: 12g Pellet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml index 4dd3e89acf..a03fd8a01b 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/20mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_20mm name: 20mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml index 56a78855b9..3eb0aa89b3 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/24mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_24mm name: 24mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_24mmf name: 24mm Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_24mmhv name: 24mm Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_24mml name: 24mm Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_24mmp name: 24mm Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_24mmr name: 24mm Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml index 063bc93049..71a9afb082 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/45mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_45mm name: .45mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_45mmf name: .45mm Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_45mmhv name: .45mm Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_45mml name: .45mm Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_45mmp name: .45mm Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_45mmr name: .45mm Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml index 40570dbb26..80af57e134 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/5.56mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_556mm name: 5.56mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_556mmf name: 5.56mm Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_556mmhv name: 5.56mm Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_556mml name: 5.56mm Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_556mmp name: 5.56mm Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_556mmr name: 5.56mm Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml index 2cf342d083..ca32de3765 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/6.5mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_65mm name: 6.5mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_65mmf name: 6.5mm Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_65mmhv name: 6.5mm Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_65mml name: 6.5mm Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_65mmp name: 6.5mm Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_65mmr name: 6.5mm Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml index ac9b8d6438..3fe9835a2b 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/7.62mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_762mm name: 7.62mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_762mmf name: 7.62mm Bullet (Flash) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_762mmhv name: 7.62mm Bullet (High-Velocity) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_762mml name: 7.62mm Bullet (L) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_762mmp name: 7.62mm Bullet (Practice) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_762mmr name: 7.62mm Bullet (Rubber) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml index 5e31b0c78c..85c60e0336 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/9mm/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_9mm name: 9mm Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_9mmf name: 9mm Bullet (Flash) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_9mmhv name: 9mm Bullet (High-Velocity) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_9mml name: 9mm Bullet (L) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_9mmp name: 9mm Bullet (Practice) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_9mmr name: 9mm Bullet (Rubber) - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml index a33b869e8f..21c7c6f794 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point32/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_32 name: .32 Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_32f name: .32 Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_32hv name: .32 Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_32l name: .32 Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_32p name: .32 Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_32r name: .32 Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml index 30b6b8cc51..cd2eca7be0 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point357/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_357 name: .357 Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_357f name: .357 Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_357hv name: .357 Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_357l name: .357 Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_357p name: .357 Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_357r name: .357 Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml index 8af1cc8f82..aeef9793a2 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point44/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_44 name: .44 Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_44f name: .44 Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_44hv name: .44 Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_44l name: .44 Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_44p name: .44 Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_44r name: .44 Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml index bb5b0fb55e..c1f8b69b92 100644 --- a/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Ammunition/Point50/projectiles.yml @@ -1,7 +1,7 @@ - type: entity id: bullet_50 name: .50 cal Bullet - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -12,7 +12,7 @@ - type: entity id: bullet_50f name: .50 cal Bullet (Flash) - parent: bullet_basef + parent: BulletBaseFlash abstract: true components: - type: Projectile @@ -23,7 +23,7 @@ - type: entity id: bullet_50hv name: .50 cal Bullet (High-Velocity) - parent: bullet_basehv + parent: BulletBaseHighVelocity abstract: true components: - type: Projectile @@ -34,7 +34,7 @@ - type: entity id: bullet_50l name: .50 cal Bullet (L) - parent: bullet_basel + parent: BulletBaseL abstract: true components: - type: Projectile @@ -45,7 +45,7 @@ - type: entity id: bullet_50p name: .50 cal Bullet (Practice) - parent: bullet_basep + parent: BulletBasePractice abstract: true components: - type: Projectile @@ -56,7 +56,7 @@ - type: entity id: bullet_50r name: .50 cal Bullet (Rubber) - parent: bullet_baser + parent: BulletBaseRubber abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml index 78e354f747..04ef03b990 100644 --- a/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Weapons/Projectiles/projectiles.yml @@ -1,7 +1,7 @@ # One bullet to bring them all into the darkness and bind them - type: entity - id: bullet_base - name: bullet_base + id: BulletBase + name: BulletBase description: If you can see this you're probably dead! abstract: true components: @@ -28,13 +28,13 @@ - type: entity id: ProjectileBullet name: ProjectileBullet - parent: bullet_base + parent: BulletBase abstract: true - type: entity - id: bullet_basef + id: BulletBaseFlash name: Base Bullet Flash - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -43,9 +43,9 @@ Brute: 10 - type: entity - id: bullet_basehv + id: BulletBaseHighVelocity name: Base Bullet High-Velocity - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -54,9 +54,9 @@ Brute: 12 - type: entity - id: bullet_basel + id: BulletBaseL name: Base Bullet L - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -65,9 +65,9 @@ Brute: 10 - type: entity - id: bullet_basep + id: BulletBasePractice name: Base Bullet Practice - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile @@ -76,9 +76,9 @@ Brute: 0 - type: entity - id: bullet_baser + id: BulletBaseRubber name: Base Bullet Rubber - parent: bullet_base + parent: BulletBase abstract: true components: - type: Projectile diff --git a/Resources/Prototypes/Entities/Chemistry.yml b/Resources/Prototypes/Entities/chemistry.yml similarity index 100% rename from Resources/Prototypes/Entities/Chemistry.yml rename to Resources/Prototypes/Entities/chemistry.yml diff --git a/Resources/Prototypes/Entities/items/bartending.yml b/Resources/Prototypes/Entities/items/bartending.yml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Resources/Prototypes/Entities/Janitor.yml b/Resources/Prototypes/Entities/janitor.yml similarity index 100% rename from Resources/Prototypes/Entities/Janitor.yml rename to Resources/Prototypes/Entities/janitor.yml diff --git a/Resources/Prototypes/Entities/Research.yml b/Resources/Prototypes/Entities/research.yml similarity index 88% rename from Resources/Prototypes/Entities/Research.yml rename to Resources/Prototypes/Entities/research.yml index 8ba78e7d90..31df64b4d8 100644 --- a/Resources/Prototypes/Entities/Research.yml +++ b/Resources/Prototypes/Entities/research.yml @@ -1,5 +1,5 @@ - type: entity - id: researchAndDevelopmentServer + id: ResearchAndDevelopmentServer name: "R&D Server" components: - type: Sprite @@ -21,8 +21,9 @@ priority: Low - type: entity - id: baseResearchAndDevelopmentPointSource + id: BaseResearchAndDevelopmentPointSource name: "Base R&D Point Source" + # We should make this abstract once there are actual point sources. components: - type: Sprite sprite: Buildings/research.rsi diff --git a/Resources/Prototypes/Entities/water_tank.yml b/Resources/Prototypes/Entities/water_tank.yml index 640aff0778..34be446a38 100644 --- a/Resources/Prototypes/Entities/water_tank.yml +++ b/Resources/Prototypes/Entities/water_tank.yml @@ -1,14 +1,14 @@ - type: entity parent: ReagentItem - id: watertank + id: WaterTank name: Water Tank description: "A water tank. It is used to store high amounts of water." components: - type: Sprite - texture: Buildings/watertank.png + texture: Buildings/WaterTank.png - type: Icon - texture: Buildings/watertank.png + texture: Buildings/WaterTank.png - type: Clickable - type: InteractionOutline @@ -35,8 +35,8 @@ - Wall - type: entity - parent: watertank - id: watertank_full + parent: WaterTank + id: WaterTankFull components: - type: Solution contents: diff --git a/Resources/Prototypes/Shaders/Stencils.yml b/Resources/Prototypes/Shaders/Stencils.yml index bf4efc200d..956f6032ed 100644 --- a/Resources/Prototypes/Shaders/Stencils.yml +++ b/Resources/Prototypes/Shaders/Stencils.yml @@ -1,23 +1,23 @@ - type: shader - id: stencilClear + id: StencilClear kind: source - path: "/Shaders/stencilclear.swsl" + path: "/Shaders/stencil_clear.swsl" stencil: ref: 0 op: Replace func: Always - type: shader - id: stencilMask + id: StencilMask kind: source - path: "/Shaders/stencilmask.swsl" + path: "/Shaders/stencil_mask.swsl" stencil: ref: 1 op: Replace func: Always - type: shader - id: stencilDraw + id: StencilDraw kind: canvas stencil: ref: 1 diff --git a/Resources/Prototypes/Shaders/outline.yml b/Resources/Prototypes/Shaders/outline.yml index 610e120f8b..0cb18fd8b7 100644 --- a/Resources/Prototypes/Shaders/outline.yml +++ b/Resources/Prototypes/Shaders/outline.yml @@ -1,5 +1,5 @@ - type: shader - id: selection_outline + id: SelectionOutline kind: source path: "/Shaders/outline.swsl" params: @@ -7,7 +7,7 @@ outline_color: "#FF000055" - type: shader - id: selection_outline_inrange + id: SelectionOutlineInrange kind: source path: "/Shaders/outline.swsl" params: diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml index 16b384fa30..e278d35c9a 100644 --- a/Resources/Prototypes/Shaders/shaders.yml +++ b/Resources/Prototypes/Shaders/shaders.yml @@ -1,9 +1,9 @@ - type: shader - id: circlemask + id: CircleMask kind: source - path: "/Shaders/circlemask.swsl" + path: "/Shaders/circle_mask.swsl" - type: shader - id: gradientcirclemask + id: GradientCircleMask kind: source - path: "/Shaders/gradientcirclemask.swsl" + path: "/Shaders/gradient_circle_mask.swsl" diff --git a/Resources/Prototypes/Technologies/technologies.yml b/Resources/Prototypes/Technologies/technologies.yml index 1385c1386e..b06368c7b0 100644 --- a/Resources/Prototypes/Technologies/technologies.yml +++ b/Resources/Prototypes/Technologies/technologies.yml @@ -5,7 +5,7 @@ - type: technology name: "Basic Research Technology" - id: Base_1 + id: BasicResearch description: Nanotransen basic research technologies. icon: Buildings/research.rsi/server-on.png requiredpoints: 250 @@ -14,34 +14,34 @@ - type: technology name: "Biological Technology" - id: Bio_Base_1 + id: BiologicalTechnology description: Investigations into the natural world. icon: Buildings/plants.rsi/plant_1.png requiredpoints: 1000 requiredtechnologies: - - Base_1 + - BasicResearch # Data Theory Technology Tree - type: technology name: "Data Theory" - id: Data_Base_1 + id: DataTheory description: Just like regular data, but in space! icon: Buildings/computer.rsi/computer-datatheory.png requiredpoints: 1000 requiredtechnologies: - - Base_1 + - BasicResearch # Industrial Engineering Technology Tree - type: technology name: "Industrial Engineering" - id: Industrial_Base_1 + id: IndustrialEngineering description: A refresher course on modern engineering technology. icon: Buildings/research.rsi/protolathe.png requiredpoints: 1000 requiredtechnologies: - - Base_1 + - BasicResearch - type: technology name: Material sheet printing @@ -50,7 +50,7 @@ icon: Objects/Materials/sheet_metal.png requiredpoints: 250 requiredtechnologies: - - Industrial_Base_1 + - IndustrialEngineering unlockedrecipes: - MetalStack - GlassStack @@ -59,20 +59,20 @@ - type: technology name: "Electromagnetic Theory" - id: Electro_Base_1 + id: ElectromagneticTheory description: Try not to fry yourself. icon: Buildings/apc.rsi/apcewires.png requiredpoints: 1000 requiredtechnologies: - - Base_1 + - BasicResearch # Bluespace Theory Technology Tree - type: technology name: "Basic Bluespace Theory" - id: Bluespace_Base_1 + id: BluespaceTheory description: An experimental course on the mysterious technology known as bluespace. icon: Objects/Misc/hand_tele.png requiredpoints: 1000 requiredtechnologies: - - Base_1 + - BasicResearch diff --git a/Resources/Shaders/circlemask.swsl b/Resources/Shaders/circle_mask.swsl similarity index 100% rename from Resources/Shaders/circlemask.swsl rename to Resources/Shaders/circle_mask.swsl diff --git a/Resources/Shaders/gradientcirclemask.swsl b/Resources/Shaders/gradient_circle_mask.swsl similarity index 100% rename from Resources/Shaders/gradientcirclemask.swsl rename to Resources/Shaders/gradient_circle_mask.swsl diff --git a/Resources/Shaders/stencilclear.swsl b/Resources/Shaders/stencil_clear.swsl similarity index 100% rename from Resources/Shaders/stencilclear.swsl rename to Resources/Shaders/stencil_clear.swsl diff --git a/Resources/Shaders/stencilmask.swsl b/Resources/Shaders/stencil_mask.swsl similarity index 100% rename from Resources/Shaders/stencilmask.swsl rename to Resources/Shaders/stencil_mask.swsl