diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs index 8a5920f524..3db0ad0831 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs @@ -45,7 +45,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage private bool _storageInitialCalculated; private int _storageUsed; - private int _storageCapacityMax = 10000; + private int _storageCapacityMax; public readonly HashSet SubscribedSessions = new HashSet(); public IReadOnlyCollection? StoredEntities => _storage?.ContainedEntities; @@ -321,7 +321,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage { base.ExposeData(serializer); - serializer.DataField(ref _storageCapacityMax, "Capacity", 10000); + serializer.DataField(ref _storageCapacityMax, "capacity", 10000); //serializer.DataField(ref StorageUsed, "used", 0); } diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs index 284db4b709..17163dc08a 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs @@ -8,13 +8,13 @@ namespace Content.Server.GameObjects.Components.Items.Storage { public override string Name => "Storable"; - public int ObjectSize = 0; + public int ObjectSize; public override void ExposeData(ObjectSerializer serializer) { base.ExposeData(serializer); - serializer.DataField(ref ObjectSize, "Size", 1); + serializer.DataField(ref ObjectSize, "size", 1); } } diff --git a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml index cdf6ab7c9c..5427458170 100644 --- a/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml +++ b/Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml @@ -35,7 +35,7 @@ mass: 25 Anchored: false - type: EntityStorage - Capacity: 60 + capacity: 60 CanWeldShut: false - type: PlaceableSurface - type: Damageable diff --git a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml index 2396939f0d..8a4e97b64f 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/backpacks.yml @@ -11,14 +11,14 @@ sprite: Clothing/Back/Backpacks/backpack.rsi state: backpack - type: Clothing - Size: 9999 + size: 9999 QuickEquip: false Slots: - back sprite: Clothing/Back/Backpacks/backpack.rsi HeldPrefix: backpack - type: Storage - Capacity: 100 + capacity: 100 - type: entity parent: BackpackClothing @@ -131,7 +131,7 @@ sprite: Clothing/Back/Satchels/satchel.rsi ClothingPrefix: satchel - type: Storage - Capacity: 300 + capacity: 300 - type: entity parent: BackpackClothing diff --git a/Resources/Prototypes/Entities/Items/Clothing/belts.yml b/Resources/Prototypes/Entities/Items/Clothing/belts.yml index 3e372ca25d..a04cd843bf 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/belts.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/belts.yml @@ -19,11 +19,11 @@ sprite: Clothing/Belt/belt_utility.rsi state: utilitybelt - type: Clothing - Size: 50 + size: 50 QuickEquip: false sprite: Clothing/Belt/belt_utility.rsi - type: Storage - Capacity: 40 # Full tool loadout is 35, plus an extra + capacity: 40 # Full tool loadout is 35, plus an extra - type: entity id: UtilityBeltClothingFilled @@ -45,6 +45,6 @@ sprite: Clothing/Belt/suspenders.rsi state: icon - type: Clothing - Size: 50 + size: 50 QuickEquip: false sprite: Clothing/Belt/suspenders.rsi diff --git a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml index e6f9edd2b9..aa7cb82d06 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml @@ -6,7 +6,7 @@ description: components: - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck diff --git a/Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml b/Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml index ee7872d6e2..86ff44efcf 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml @@ -5,7 +5,7 @@ abstract: true components: - type: Clothing - Size: 5 + size: 5 diff --git a/Resources/Prototypes/Entities/Items/Clothing/neck.yml b/Resources/Prototypes/Entities/Items/Clothing/neck.yml index 1812e7ccb9..61941553d4 100644 --- a/Resources/Prototypes/Entities/Items/Clothing/neck.yml +++ b/Resources/Prototypes/Entities/Items/Clothing/neck.yml @@ -6,7 +6,7 @@ description: components: - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck diff --git a/Resources/Prototypes/Entities/Items/Consumables/trash.yml b/Resources/Prototypes/Entities/Items/Consumables/trash.yml index e028a15231..06cbdacf41 100644 --- a/Resources/Prototypes/Entities/Items/Consumables/trash.yml +++ b/Resources/Prototypes/Entities/Items/Consumables/trash.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: BaseItem id: TrashBase description: This is rubbish. @@ -180,7 +180,7 @@ - type: Icon sprite: Objects/Consumable/Trash/trashbag.rsi - type: Storage - Capacity: 125 + capacity: 125 - type: entity name: tray (trash) diff --git a/Resources/Prototypes/Entities/Items/Instruments.yml b/Resources/Prototypes/Entities/Items/Instruments.yml index 8ad1d2436f..58dd57b277 100644 --- a/Resources/Prototypes/Entities/Items/Instruments.yml +++ b/Resources/Prototypes/Entities/Items/Instruments.yml @@ -25,7 +25,7 @@ sprite: Objects/Fun/Instruments/h_synthesizer.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/h_synthesizer.rsi @@ -43,7 +43,7 @@ sprite: Objects/Fun/Instruments/guitar.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/guitar.rsi - type: entity @@ -60,7 +60,7 @@ sprite: Objects/Fun/Instruments/violin.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/violin.rsi - type: entity @@ -89,7 +89,7 @@ sprite: Objects/Fun/Instruments/eguitar.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/eguitar.rsi - type: entity @@ -106,7 +106,7 @@ sprite: Objects/Fun/Instruments/accordion.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/accordion.rsi - type: entity @@ -123,7 +123,7 @@ sprite: Objects/Fun/Instruments/harmonica.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/harmonica.rsi - type: entity @@ -140,7 +140,7 @@ sprite: Objects/Fun/Instruments/recorder.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/recorder.rsi - type: entity @@ -157,7 +157,7 @@ sprite: Objects/Fun/Instruments/trombone.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/trombone.rsi - type: entity @@ -174,7 +174,7 @@ sprite: Objects/Fun/Instruments/saxophone.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/saxophone.rsi - type: entity @@ -191,7 +191,7 @@ sprite: Objects/Fun/Instruments/glockenspiel.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/glockenspiel.rsi - type: entity @@ -208,7 +208,7 @@ sprite: Objects/Fun/Instruments/banjo.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/banjo.rsi - type: entity @@ -227,5 +227,5 @@ sprite: Objects/Fun/Instruments/bike_horn.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/Instruments/bike_horn.rsi diff --git a/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml b/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml index 71daa6ef6c..576b2b544c 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/kitchen.yml @@ -16,6 +16,6 @@ - type: ItemCooldown - type: MeleeWeapon - type: Item - Size: 10 + size: 10 sprite: Objects/Weapons/Melee/cleaver.rsi prefix: inhand diff --git a/Resources/Prototypes/Entities/Items/Weapons/mining.yml b/Resources/Prototypes/Entities/Items/Weapons/mining.yml index 76b7bed799..f83f00ede2 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/mining.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/mining.yml @@ -15,7 +15,7 @@ - type: MeleeWeapon damage: 25 - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Melee/pickaxe.rsi prefix: inhand - type: LoopingSound diff --git a/Resources/Prototypes/Entities/Items/Weapons/security.yml b/Resources/Prototypes/Entities/Items/Weapons/security.yml index b38f80b5d7..eef88d5d8f 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/security.yml @@ -18,7 +18,7 @@ arc: default - type: Item - Size: 10 + size: 10 sprite: Objects/Weapons/Melee/stunbaton.rsi HeldPrefix: off @@ -44,7 +44,7 @@ hitSound: /Audio/Weapons/flash.ogg - type: Item - Size: 2 + size: 2 sprite: Objects/Weapons/Melee/flash.rsi - type: ItemCooldown diff --git a/Resources/Prototypes/Entities/Items/Weapons/spear.yml b/Resources/Prototypes/Entities/Items/Weapons/spear.yml index 369a0ad061..5842d9b1e9 100644 --- a/Resources/Prototypes/Entities/Items/Weapons/spear.yml +++ b/Resources/Prototypes/Entities/Items/Weapons/spear.yml @@ -17,7 +17,7 @@ arc: spear - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Melee/spear.rsi prefix: inhand diff --git a/Resources/Prototypes/Entities/Items/bedsheets.yml b/Resources/Prototypes/Entities/Items/bedsheets.yml index fcc8a7b31b..ab6ec92159 100644 --- a/Resources/Prototypes/Entities/Items/bedsheets.yml +++ b/Resources/Prototypes/Entities/Items/bedsheets.yml @@ -13,7 +13,7 @@ - type: Icon sprite: Objects/Misc/bedsheets.rsi - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - back @@ -30,7 +30,7 @@ - type: Icon state: sheetblack - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -47,7 +47,7 @@ - type: Icon state: sheetblue - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -64,7 +64,7 @@ - type: Icon state: sheetbrown - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -81,7 +81,7 @@ - type: Icon state: sheetcaptain - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -98,7 +98,7 @@ - type: Icon state: sheetce - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -115,7 +115,7 @@ - type: Icon state: sheetcentcom - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -132,7 +132,7 @@ - type: Icon state: sheetclown - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -149,7 +149,7 @@ - type: Icon state: sheetcmo - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -166,7 +166,7 @@ - type: Icon state: sheetcosmos - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -183,7 +183,7 @@ - type: Icon state: sheetcult - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -200,7 +200,7 @@ - type: Icon state: sheetgreen - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -217,7 +217,7 @@ - type: Icon state: sheetgrey - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -234,7 +234,7 @@ - type: Icon state: sheethop - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -251,7 +251,7 @@ - type: Icon state: sheethos - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -268,7 +268,7 @@ - type: Icon state: sheetian - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -285,7 +285,7 @@ - type: Icon state: sheetmedical - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -302,7 +302,7 @@ - type: Icon state: sheetmime - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -319,7 +319,7 @@ - type: Icon state: sheetNT - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -336,7 +336,7 @@ - type: Icon state: sheetorange - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -353,7 +353,7 @@ - type: Icon state: sheetpurple - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -370,7 +370,7 @@ - type: Icon state: sheetqm - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -387,7 +387,7 @@ - type: Icon state: sheetrainbow - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -404,7 +404,7 @@ - type: Icon state: sheetrd - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -421,7 +421,7 @@ - type: Icon state: sheetred - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -438,7 +438,7 @@ - type: Icon state: sheetsyndie - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -455,7 +455,7 @@ - type: Icon state: sheetUSA - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -472,7 +472,7 @@ - type: Icon state: sheetwhite - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -489,7 +489,7 @@ - type: Icon state: sheetwiz - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck @@ -506,7 +506,7 @@ - type: Icon state: sheetyellow - type: Clothing - Size: 10 + size: 10 QuickEquip: true Slots: - neck diff --git a/Resources/Prototypes/Entities/Items/bike_horn.yml b/Resources/Prototypes/Entities/Items/bike_horn.yml index 110ea694ec..a0ccdbfd84 100644 --- a/Resources/Prototypes/Entities/Items/bike_horn.yml +++ b/Resources/Prototypes/Entities/Items/bike_horn.yml @@ -13,7 +13,7 @@ state: icon - type: Item - Size: 5 + size: 5 sprite: Objects/Fun/bikehorn.rsi - type: ItemCooldown diff --git a/Resources/Prototypes/Entities/Items/fire_extinguisher.yml b/Resources/Prototypes/Entities/Items/fire_extinguisher.yml index aa344d7af6..a6c264b1d7 100644 --- a/Resources/Prototypes/Entities/Items/fire_extinguisher.yml +++ b/Resources/Prototypes/Entities/Items/fire_extinguisher.yml @@ -9,4 +9,4 @@ - type: Icon texture: Objects/Misc/fire_extinguisher.png - type: Item - Size: 10 + size: 10 diff --git a/Resources/Prototypes/Entities/Items/item_base.yml b/Resources/Prototypes/Entities/Items/item_base.yml index b3a9d04858..2ec229b93f 100644 --- a/Resources/Prototypes/Entities/Items/item_base.yml +++ b/Resources/Prototypes/Entities/Items/item_base.yml @@ -4,7 +4,7 @@ abstract: true components: - type: Item - Size: 5 + size: 5 - type: Clickable - type: InteractionOutline - type: Collidable diff --git a/Resources/Prototypes/Entities/Items/medical.yml b/Resources/Prototypes/Entities/Items/medical.yml index fd242ea5e7..f004518590 100644 --- a/Resources/Prototypes/Entities/Items/medical.yml +++ b/Resources/Prototypes/Entities/Items/medical.yml @@ -9,9 +9,9 @@ - type: Icon texture: Objects/Specific/Medical/medkit_r.png - type: Storage - Capacity: 60 + capacity: 60 - type: Item - Size: 9999 + size: 9999 - type: entity id: MedkitFilled diff --git a/Resources/Prototypes/Entities/Items/teleporters.yml b/Resources/Prototypes/Entities/Items/teleporters.yml index fec02f082e..38d9540283 100644 --- a/Resources/Prototypes/Entities/Items/teleporters.yml +++ b/Resources/Prototypes/Entities/Items/teleporters.yml @@ -14,7 +14,7 @@ - type: ItemTeleporter teleporter_type: Random - type: Item - Size: 12 + size: 12 sprite: Objects/Misc/hand_tele.rsi - type: LoopingSound - type: Appearance diff --git a/Resources/Prototypes/Entities/Items/toolbox.yml b/Resources/Prototypes/Entities/Items/toolbox.yml index 316029604b..47d3a433ca 100644 --- a/Resources/Prototypes/Entities/Items/toolbox.yml +++ b/Resources/Prototypes/Entities/Items/toolbox.yml @@ -4,9 +4,9 @@ abstract: true components: - type: Storage - Capacity: 60 + capacity: 60 - type: Item - Size: 9999 + size: 9999 - type: ItemCooldown - type: MeleeWeapon hitSound: "/Audio/Weapons/smash.ogg" diff --git a/Resources/Prototypes/Entities/Items/tools.yml b/Resources/Prototypes/Entities/Items/tools.yml index 01cad99583..3b16a16071 100644 --- a/Resources/Prototypes/Entities/Items/tools.yml +++ b/Resources/Prototypes/Entities/Items/tools.yml @@ -83,7 +83,7 @@ sprite: Objects/Tools/welder.rsi state: welder - type: Item - Size: 10 + size: 10 sprite: Objects/Tools/welder.rsi HeldPrefix: off - type: ItemCooldown diff --git a/Resources/Prototypes/Entities/Items/toys.yml b/Resources/Prototypes/Entities/Items/toys.yml index d1cebccd4e..1e62e4ee44 100644 --- a/Resources/Prototypes/Entities/Items/toys.yml +++ b/Resources/Prototypes/Entities/Items/toys.yml @@ -556,7 +556,7 @@ sprite: Objects/Fun/toys.rsi state: foamcrossbow - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/toys.rsi HeldPrefix: foamcrossbow - type: RangedWeapon @@ -599,7 +599,7 @@ sprite: Objects/Fun/toys.rsi state: base - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/toys.rsi state: base - type: RangedWeapon @@ -634,7 +634,7 @@ arcwidth: 0 arc: spear - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/toys.rsi HeldPrefix: foamblade - type: ItemCooldown @@ -654,7 +654,7 @@ sprite: Objects/Fun/toys.rsi state: basketball - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/toys.rsi HeldPrefix: bask @@ -671,7 +671,7 @@ sprite: Objects/Fun/toys.rsi state: synb - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/toys.rsi HeldPrefix: synb @@ -688,6 +688,6 @@ sprite: Objects/Fun/toys.rsi state: corgib - type: Item - Size: 24 + size: 24 sprite: Objects/Fun/toys.rsi HeldPrefix: corgib diff --git a/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml index 7a57cfed3f..aea65340a6 100644 --- a/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml @@ -17,7 +17,7 @@ sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi - type: RangedWeapon - type: BatteryBarrel @@ -58,7 +58,7 @@ sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi - type: RangedWeapon - type: BatteryBarrel @@ -99,7 +99,7 @@ sprite: Objects/Weapons/Guns/Battery/xray.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Battery/xray.rsi - type: RangedWeapon - type: BatteryBarrel @@ -141,7 +141,7 @@ sprite: Objects/Weapons/Guns/Battery/taser.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Battery/taser.rsi prefix: icon - type: RangedWeapon diff --git a/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml b/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml index b4858dc871..390279932e 100644 --- a/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml +++ b/Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml @@ -13,7 +13,7 @@ sprite: Objects/Weapons/Grenades/grenade.rsi state: icon - type: Item - Size: 5 + size: 5 - type: OnUseTimerTrigger delay: 3.5 - type: Explosive @@ -44,7 +44,7 @@ sprite: Objects/Weapons/Grenades/flashbang.rsi state: icon - type: Item - Size: 5 + size: 5 - type: OnUseTimerTrigger delay: 3.5 - type: FlashExplosive @@ -71,7 +71,7 @@ sprite: Objects/Weapons/Grenades/syndgrenade.rsi state: icon - type: Item - Size: 5 + size: 5 - type: OnUseTimerTrigger delay: 5 - type: Explosive diff --git a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml index c1359f68a4..ef0c01d369 100644 --- a/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml @@ -52,7 +52,7 @@ - type: Icon sprite: Objects/Weapons/Guns/LMGs/l6.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/LMGs/l6.rsi - type: RangedWeapon - type: MagazineBarrel @@ -88,7 +88,7 @@ - type: Icon sprite: Objects/Weapons/Guns/LMGs/pk.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/LMGs/pk.rsi - type: RangedWeapon - type: MagazineBarrel diff --git a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml index 394b3be76b..754b238fea 100644 --- a/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml @@ -29,7 +29,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - type: RangedWeapon - type: BoltActionBarrel @@ -63,7 +63,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Launchers/rocket.rsi - type: RangedWeapon - type: RevolverBarrel diff --git a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml index 5b8ca703a6..09d093628e 100644 --- a/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml @@ -58,7 +58,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi - type: RangedWeapon - type: MagazineBarrel @@ -88,7 +88,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/colt.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/colt.rsi - type: RangedWeapon - type: MagazineBarrel @@ -115,7 +115,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/giskard.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/giskard.rsi - type: RangedWeapon - type: MagazineBarrel @@ -146,7 +146,7 @@ sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi state: icon - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi - type: RangedWeapon - type: BoltActionBarrel @@ -187,7 +187,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi - type: RangedWeapon - type: MagazineBarrel @@ -231,7 +231,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/mandella.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/mandella.rsi - type: RangedWeapon - type: MagazineBarrel @@ -263,7 +263,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/mk58.rsi - type: RangedWeapon - type: MagazineBarrel @@ -295,7 +295,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi - type: RangedWeapon - type: MagazineBarrel @@ -322,7 +322,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/molly.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/molly.rsi - type: RangedWeapon - type: MagazineBarrel @@ -357,7 +357,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi - type: RangedWeapon - type: MagazineBarrel @@ -385,7 +385,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Pistols/paco.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Pistols/paco.rsi - type: RangedWeapon - type: MagazineBarrel diff --git a/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml index 39bebd9785..effd1d1b64 100644 --- a/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml @@ -30,7 +30,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi - type: RangedWeapon - type: BoltActionBarrel @@ -63,7 +63,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi - type: RangedWeapon - type: RevolverBarrel @@ -89,7 +89,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi - type: RangedWeapon - type: RevolverBarrel diff --git a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml index 9b2ef63afd..2c06db575c 100644 --- a/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml @@ -46,7 +46,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/ak.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/ak.rsi - type: RangedWeapon - type: MagazineBarrel @@ -85,7 +85,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi - type: RangedWeapon - type: MagazineBarrel @@ -126,7 +126,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/carbine.rsi - type: RangedWeapon - type: MagazineBarrel @@ -167,7 +167,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/dallas.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/dallas.rsi - type: RangedWeapon - type: MagazineBarrel @@ -209,7 +209,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/sts.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/sts.rsi - type: RangedWeapon - type: MagazineBarrel @@ -251,7 +251,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi - type: RangedWeapon - type: MagazineBarrel @@ -290,7 +290,7 @@ - type: Icon sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi - type: RangedWeapon - type: MagazineBarrel diff --git a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml index 25195f84a8..452320cdcd 100644 --- a/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml @@ -52,7 +52,7 @@ - type: Icon sprite: Objects/Weapons/Guns/SMGs/atreides.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/SMGs/atreides.rsi - type: RangedWeapon - type: MagazineBarrel @@ -93,7 +93,7 @@ - type: Icon sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - type: RangedWeapon - type: MagazineBarrel @@ -136,7 +136,7 @@ - type: Icon sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - type: RangedWeapon - type: MagazineBarrel @@ -178,7 +178,7 @@ - type: Icon sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/SMGs/straylight.rsi - type: RangedWeapon - type: MagazineBarrel @@ -220,7 +220,7 @@ - type: Icon sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/SMGs/wt550.rsi - type: RangedWeapon - type: MagazineBarrel @@ -257,7 +257,7 @@ - type: Icon sprite: Objects/Weapons/Guns/SMGs/zoric.rsi - type: Item - Size: 24 + size: 24 sprite: Objects/Weapons/Guns/SMGs/zoric.rsi - type: RangedWeapon - type: MagazineBarrel diff --git a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml index b05c493337..5434f0735f 100644 --- a/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml @@ -11,7 +11,7 @@ - type: Icon state: icon - type: Item - Size: 24 + size: 24 - type: PumpBarrel currentSelector: Single allSelectors: diff --git a/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml b/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml index 62b23cca22..eacbbc9c58 100644 --- a/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml @@ -15,7 +15,7 @@ - type: Icon state: icon - type: Item - Size: 24 + size: 24 - type: BoltActionBarrel currentSelector: Single allSelectors: diff --git a/Resources/Prototypes/Entities/janitor.yml b/Resources/Prototypes/Entities/janitor.yml index cadc1a7bd1..cd5708707c 100644 --- a/Resources/Prototypes/Entities/janitor.yml +++ b/Resources/Prototypes/Entities/janitor.yml @@ -13,7 +13,7 @@ state: mop - type: Item - Size: 10 + size: 10 sprite: Objects/Specific/Janitorial/mop.rsi - type: Mop