tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ServerStorage and Storable Yaml casing (#1424)

Browse Source 
* Storable size yaml case fix

* ServerStorage yaml case fix

Co-authored-by: py01 <pyronetics01@gmail.com>
This commit is contained in:
ShadowCommander
2020-07-19 12:12:02 -07:00
committed by GitHub
parent 7f3fabd72a e33caaddea
commit e4fbc054cc
34 changed files with 119 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
private bool _storageInitialCalculated; private bool _storageInitialCalculated;
private int _storageUsed; private int _storageUsed;
private int _storageCapacityMax = 10000; private int _storageCapacityMax;
public readonly HashSet<IPlayerSession> SubscribedSessions = new HashSet<IPlayerSession>(); public readonly HashSet<IPlayerSession> SubscribedSessions = new HashSet<IPlayerSession>();
public IReadOnlyCollection<IEntity>? StoredEntities => _storage?.ContainedEntities; public IReadOnlyCollection<IEntity>? StoredEntities => _storage?.ContainedEntities;
@@ -321,7 +321,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
{ {
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref _storageCapacityMax, "Capacity", 10000); serializer.DataField(ref _storageCapacityMax, "capacity", 10000);
//serializer.DataField(ref StorageUsed, "used", 0); //serializer.DataField(ref StorageUsed, "used", 0);
} }

4
Content.Server/GameObjects/Components/Items/Storage/StorableComponent.cs
View File

@@ -8,13 +8,13 @@ namespace Content.Server.GameObjects.Components.Items.Storage
{ {
public override string Name => "Storable"; public override string Name => "Storable";
public int ObjectSize = 0; public int ObjectSize;
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref ObjectSize, "Size", 1); serializer.DataField(ref ObjectSize, "size", 1);
} }
} }

2
Resources/Prototypes/Entities/Buildings/Storage/crate_base.yml
View File

@@ -35,7 +35,7 @@
mass: 25 mass: 25
Anchored: false Anchored: false
- type: EntityStorage - type: EntityStorage
Capacity: 60 capacity: 60
CanWeldShut: false CanWeldShut: false
- type: PlaceableSurface - type: PlaceableSurface
- type: Damageable - type: Damageable

6
Resources/Prototypes/Entities/Items/Clothing/backpacks.yml
View File

@@ -11,14 +11,14 @@
sprite: Clothing/Back/Backpacks/backpack.rsi sprite: Clothing/Back/Backpacks/backpack.rsi
state: backpack state: backpack
- type: Clothing - type: Clothing
Size: 9999 size: 9999
QuickEquip: false QuickEquip: false
Slots: Slots:
- back - back
sprite: Clothing/Back/Backpacks/backpack.rsi sprite: Clothing/Back/Backpacks/backpack.rsi
HeldPrefix: backpack HeldPrefix: backpack
- type: Storage - type: Storage
Capacity: 100 capacity: 100
- type: entity - type: entity
parent: BackpackClothing parent: BackpackClothing
@@ -131,7 +131,7 @@
sprite: Clothing/Back/Satchels/satchel.rsi sprite: Clothing/Back/Satchels/satchel.rsi
ClothingPrefix: satchel ClothingPrefix: satchel
- type: Storage - type: Storage
Capacity: 300 capacity: 300
- type: entity - type: entity
parent: BackpackClothing parent: BackpackClothing

6
Resources/Prototypes/Entities/Items/Clothing/belts.yml
View File

@@ -19,11 +19,11 @@
sprite: Clothing/Belt/belt_utility.rsi sprite: Clothing/Belt/belt_utility.rsi
state: utilitybelt state: utilitybelt
- type: Clothing - type: Clothing
Size: 50 size: 50
QuickEquip: false QuickEquip: false
sprite: Clothing/Belt/belt_utility.rsi sprite: Clothing/Belt/belt_utility.rsi
- type: Storage - type: Storage
Capacity: 40 # Full tool loadout is 35, plus an extra capacity: 40 # Full tool loadout is 35, plus an extra
- type: entity - type: entity
id: UtilityBeltClothingFilled id: UtilityBeltClothingFilled
@@ -45,6 +45,6 @@
sprite: Clothing/Belt/suspenders.rsi sprite: Clothing/Belt/suspenders.rsi
state: icon state: icon
- type: Clothing - type: Clothing
Size: 50 size: 50
QuickEquip: false QuickEquip: false
sprite: Clothing/Belt/suspenders.rsi sprite: Clothing/Belt/suspenders.rsi

2
Resources/Prototypes/Entities/Items/Clothing/cloaks.yml
View File

@@ -6,7 +6,7 @@
description: description:
components: components:
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck

2
Resources/Prototypes/Entities/Items/Clothing/clothing_base.yml
View File

@@ -5,7 +5,7 @@
abstract: true abstract: true
components: components:
- type: Clothing - type: Clothing
Size: 5 size: 5

2
Resources/Prototypes/Entities/Items/Clothing/neck.yml
View File

@@ -6,7 +6,7 @@
description: description:
components: components:
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck

4
Resources/Prototypes/Entities/Items/Consumables/trash.yml
View File

@@ -1,4 +1,4 @@
- type: entity - type: entity
parent: BaseItem parent: BaseItem
id: TrashBase id: TrashBase
description: This is rubbish. description: This is rubbish.
@@ -180,7 +180,7 @@
- type: Icon - type: Icon
sprite: Objects/Consumable/Trash/trashbag.rsi sprite: Objects/Consumable/Trash/trashbag.rsi
- type: Storage - type: Storage
Capacity: 125 capacity: 125
- type: entity - type: entity
name: tray (trash) name: tray (trash)

24
Resources/Prototypes/Entities/Items/Instruments.yml
View File

@@ -25,7 +25,7 @@
sprite: Objects/Fun/Instruments/h_synthesizer.rsi sprite: Objects/Fun/Instruments/h_synthesizer.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/h_synthesizer.rsi sprite: Objects/Fun/Instruments/h_synthesizer.rsi
@@ -43,7 +43,7 @@
sprite: Objects/Fun/Instruments/guitar.rsi sprite: Objects/Fun/Instruments/guitar.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/guitar.rsi sprite: Objects/Fun/Instruments/guitar.rsi
- type: entity - type: entity
@@ -60,7 +60,7 @@
sprite: Objects/Fun/Instruments/violin.rsi sprite: Objects/Fun/Instruments/violin.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/violin.rsi sprite: Objects/Fun/Instruments/violin.rsi
- type: entity - type: entity
@@ -89,7 +89,7 @@
sprite: Objects/Fun/Instruments/eguitar.rsi sprite: Objects/Fun/Instruments/eguitar.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/eguitar.rsi sprite: Objects/Fun/Instruments/eguitar.rsi
- type: entity - type: entity
@@ -106,7 +106,7 @@
sprite: Objects/Fun/Instruments/accordion.rsi sprite: Objects/Fun/Instruments/accordion.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/accordion.rsi sprite: Objects/Fun/Instruments/accordion.rsi
- type: entity - type: entity
@@ -123,7 +123,7 @@
sprite: Objects/Fun/Instruments/harmonica.rsi sprite: Objects/Fun/Instruments/harmonica.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/harmonica.rsi sprite: Objects/Fun/Instruments/harmonica.rsi
- type: entity - type: entity
@@ -140,7 +140,7 @@
sprite: Objects/Fun/Instruments/recorder.rsi sprite: Objects/Fun/Instruments/recorder.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/recorder.rsi sprite: Objects/Fun/Instruments/recorder.rsi
- type: entity - type: entity
@@ -157,7 +157,7 @@
sprite: Objects/Fun/Instruments/trombone.rsi sprite: Objects/Fun/Instruments/trombone.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/trombone.rsi sprite: Objects/Fun/Instruments/trombone.rsi
- type: entity - type: entity
@@ -174,7 +174,7 @@
sprite: Objects/Fun/Instruments/saxophone.rsi sprite: Objects/Fun/Instruments/saxophone.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/saxophone.rsi sprite: Objects/Fun/Instruments/saxophone.rsi
- type: entity - type: entity
@@ -191,7 +191,7 @@
sprite: Objects/Fun/Instruments/glockenspiel.rsi sprite: Objects/Fun/Instruments/glockenspiel.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/glockenspiel.rsi sprite: Objects/Fun/Instruments/glockenspiel.rsi
- type: entity - type: entity
@@ -208,7 +208,7 @@
sprite: Objects/Fun/Instruments/banjo.rsi sprite: Objects/Fun/Instruments/banjo.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/banjo.rsi sprite: Objects/Fun/Instruments/banjo.rsi
- type: entity - type: entity
@@ -227,5 +227,5 @@
sprite: Objects/Fun/Instruments/bike_horn.rsi sprite: Objects/Fun/Instruments/bike_horn.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/Instruments/bike_horn.rsi sprite: Objects/Fun/Instruments/bike_horn.rsi

2
Resources/Prototypes/Entities/Items/Weapons/kitchen.yml
View File

@@ -16,6 +16,6 @@
- type: ItemCooldown - type: ItemCooldown
- type: MeleeWeapon - type: MeleeWeapon
- type: Item - type: Item
Size: 10 size: 10
sprite: Objects/Weapons/Melee/cleaver.rsi sprite: Objects/Weapons/Melee/cleaver.rsi
prefix: inhand prefix: inhand

2
Resources/Prototypes/Entities/Items/Weapons/mining.yml
View File

@@ -15,7 +15,7 @@
- type: MeleeWeapon - type: MeleeWeapon
damage: 25 damage: 25
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Melee/pickaxe.rsi sprite: Objects/Weapons/Melee/pickaxe.rsi
prefix: inhand prefix: inhand
- type: LoopingSound - type: LoopingSound

4
Resources/Prototypes/Entities/Items/Weapons/security.yml
View File

@@ -18,7 +18,7 @@
arc: default arc: default
- type: Item - type: Item
Size: 10 size: 10
sprite: Objects/Weapons/Melee/stunbaton.rsi sprite: Objects/Weapons/Melee/stunbaton.rsi
HeldPrefix: off HeldPrefix: off
@@ -44,7 +44,7 @@
hitSound: /Audio/Weapons/flash.ogg hitSound: /Audio/Weapons/flash.ogg
- type: Item - type: Item
Size: 2 size: 2
sprite: Objects/Weapons/Melee/flash.rsi sprite: Objects/Weapons/Melee/flash.rsi
- type: ItemCooldown - type: ItemCooldown

2
Resources/Prototypes/Entities/Items/Weapons/spear.yml
View File

@@ -17,7 +17,7 @@
arc: spear arc: spear
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Melee/spear.rsi sprite: Objects/Weapons/Melee/spear.rsi
prefix: inhand prefix: inhand

60
Resources/Prototypes/Entities/Items/bedsheets.yml
View File

@@ -13,7 +13,7 @@
- type: Icon - type: Icon
sprite: Objects/Misc/bedsheets.rsi sprite: Objects/Misc/bedsheets.rsi
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- back - back
@@ -30,7 +30,7 @@
- type: Icon - type: Icon
state: sheetblack state: sheetblack
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -47,7 +47,7 @@
- type: Icon - type: Icon
state: sheetblue state: sheetblue
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -64,7 +64,7 @@
- type: Icon - type: Icon
state: sheetbrown state: sheetbrown
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -81,7 +81,7 @@
- type: Icon - type: Icon
state: sheetcaptain state: sheetcaptain
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -98,7 +98,7 @@
- type: Icon - type: Icon
state: sheetce state: sheetce
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -115,7 +115,7 @@
- type: Icon - type: Icon
state: sheetcentcom state: sheetcentcom
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -132,7 +132,7 @@
- type: Icon - type: Icon
state: sheetclown state: sheetclown
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -149,7 +149,7 @@
- type: Icon - type: Icon
state: sheetcmo state: sheetcmo
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -166,7 +166,7 @@
- type: Icon - type: Icon
state: sheetcosmos state: sheetcosmos
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -183,7 +183,7 @@
- type: Icon - type: Icon
state: sheetcult state: sheetcult
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -200,7 +200,7 @@
- type: Icon - type: Icon
state: sheetgreen state: sheetgreen
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -217,7 +217,7 @@
- type: Icon - type: Icon
state: sheetgrey state: sheetgrey
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -234,7 +234,7 @@
- type: Icon - type: Icon
state: sheethop state: sheethop
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -251,7 +251,7 @@
- type: Icon - type: Icon
state: sheethos state: sheethos
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -268,7 +268,7 @@
- type: Icon - type: Icon
state: sheetian state: sheetian
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -285,7 +285,7 @@
- type: Icon - type: Icon
state: sheetmedical state: sheetmedical
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -302,7 +302,7 @@
- type: Icon - type: Icon
state: sheetmime state: sheetmime
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -319,7 +319,7 @@
- type: Icon - type: Icon
state: sheetNT state: sheetNT
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -336,7 +336,7 @@
- type: Icon - type: Icon
state: sheetorange state: sheetorange
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -353,7 +353,7 @@
- type: Icon - type: Icon
state: sheetpurple state: sheetpurple
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -370,7 +370,7 @@
- type: Icon - type: Icon
state: sheetqm state: sheetqm
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -387,7 +387,7 @@
- type: Icon - type: Icon
state: sheetrainbow state: sheetrainbow
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -404,7 +404,7 @@
- type: Icon - type: Icon
state: sheetrd state: sheetrd
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -421,7 +421,7 @@
- type: Icon - type: Icon
state: sheetred state: sheetred
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -438,7 +438,7 @@
- type: Icon - type: Icon
state: sheetsyndie state: sheetsyndie
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -455,7 +455,7 @@
- type: Icon - type: Icon
state: sheetUSA state: sheetUSA
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -472,7 +472,7 @@
- type: Icon - type: Icon
state: sheetwhite state: sheetwhite
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -489,7 +489,7 @@
- type: Icon - type: Icon
state: sheetwiz state: sheetwiz
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck
@@ -506,7 +506,7 @@
- type: Icon - type: Icon
state: sheetyellow state: sheetyellow
- type: Clothing - type: Clothing
Size: 10 size: 10
QuickEquip: true QuickEquip: true
Slots: Slots:
- neck - neck

2
Resources/Prototypes/Entities/Items/bike_horn.yml
View File

@@ -13,7 +13,7 @@
state: icon state: icon
- type: Item - type: Item
Size: 5 size: 5
sprite: Objects/Fun/bikehorn.rsi sprite: Objects/Fun/bikehorn.rsi
- type: ItemCooldown - type: ItemCooldown

2
Resources/Prototypes/Entities/Items/fire_extinguisher.yml
View File

@@ -9,4 +9,4 @@
- type: Icon - type: Icon
texture: Objects/Misc/fire_extinguisher.png texture: Objects/Misc/fire_extinguisher.png
- type: Item - type: Item
Size: 10 size: 10

2
Resources/Prototypes/Entities/Items/item_base.yml
View File

@@ -4,7 +4,7 @@
abstract: true abstract: true
components: components:
- type: Item - type: Item
Size: 5 size: 5
- type: Clickable - type: Clickable
- type: InteractionOutline - type: InteractionOutline
- type: Collidable - type: Collidable

4
Resources/Prototypes/Entities/Items/medical.yml
View File

@@ -9,9 +9,9 @@
- type: Icon - type: Icon
texture: Objects/Specific/Medical/medkit_r.png texture: Objects/Specific/Medical/medkit_r.png
- type: Storage - type: Storage
Capacity: 60 capacity: 60
- type: Item - type: Item
Size: 9999 size: 9999
- type: entity - type: entity
id: MedkitFilled id: MedkitFilled

2
Resources/Prototypes/Entities/Items/teleporters.yml
View File

@@ -14,7 +14,7 @@
- type: ItemTeleporter - type: ItemTeleporter
teleporter_type: Random teleporter_type: Random
- type: Item - type: Item
Size: 12 size: 12
sprite: Objects/Misc/hand_tele.rsi sprite: Objects/Misc/hand_tele.rsi
- type: LoopingSound - type: LoopingSound
- type: Appearance - type: Appearance

4
Resources/Prototypes/Entities/Items/toolbox.yml
View File

@@ -4,9 +4,9 @@
abstract: true abstract: true
components: components:
- type: Storage - type: Storage
Capacity: 60 capacity: 60
- type: Item - type: Item
Size: 9999 size: 9999
- type: ItemCooldown - type: ItemCooldown
- type: MeleeWeapon - type: MeleeWeapon
hitSound: "/Audio/Weapons/smash.ogg" hitSound: "/Audio/Weapons/smash.ogg"

2
Resources/Prototypes/Entities/Items/tools.yml
View File

@@ -83,7 +83,7 @@
sprite: Objects/Tools/welder.rsi sprite: Objects/Tools/welder.rsi
state: welder state: welder
- type: Item - type: Item
Size: 10 size: 10
sprite: Objects/Tools/welder.rsi sprite: Objects/Tools/welder.rsi
HeldPrefix: off HeldPrefix: off
- type: ItemCooldown - type: ItemCooldown

12
Resources/Prototypes/Entities/Items/toys.yml
View File

@@ -556,7 +556,7 @@
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
state: foamcrossbow state: foamcrossbow
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
HeldPrefix: foamcrossbow HeldPrefix: foamcrossbow
- type: RangedWeapon - type: RangedWeapon
@@ -599,7 +599,7 @@
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
state: base state: base
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
state: base state: base
- type: RangedWeapon - type: RangedWeapon
@@ -634,7 +634,7 @@
arcwidth: 0 arcwidth: 0
arc: spear arc: spear
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
HeldPrefix: foamblade HeldPrefix: foamblade
- type: ItemCooldown - type: ItemCooldown
@@ -654,7 +654,7 @@
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
state: basketball state: basketball
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
HeldPrefix: bask HeldPrefix: bask
@@ -671,7 +671,7 @@
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
state: synb state: synb
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
HeldPrefix: synb HeldPrefix: synb
@@ -688,6 +688,6 @@
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
state: corgib state: corgib
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Fun/toys.rsi sprite: Objects/Fun/toys.rsi
HeldPrefix: corgib HeldPrefix: corgib

8
Resources/Prototypes/Entities/Weapons/Battery/battery_guns.yml
View File

@@ -17,7 +17,7 @@
sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
- type: RangedWeapon - type: RangedWeapon
- type: BatteryBarrel - type: BatteryBarrel
@@ -58,7 +58,7 @@
sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
- type: RangedWeapon - type: RangedWeapon
- type: BatteryBarrel - type: BatteryBarrel
@@ -99,7 +99,7 @@
sprite: Objects/Weapons/Guns/Battery/xray.rsi sprite: Objects/Weapons/Guns/Battery/xray.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Battery/xray.rsi sprite: Objects/Weapons/Guns/Battery/xray.rsi
- type: RangedWeapon - type: RangedWeapon
- type: BatteryBarrel - type: BatteryBarrel
@@ -141,7 +141,7 @@
sprite: Objects/Weapons/Guns/Battery/taser.rsi sprite: Objects/Weapons/Guns/Battery/taser.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Battery/taser.rsi sprite: Objects/Weapons/Guns/Battery/taser.rsi
prefix: icon prefix: icon
- type: RangedWeapon - type: RangedWeapon

6
Resources/Prototypes/Entities/Weapons/Explosives/grenades.yml
View File

@@ -13,7 +13,7 @@
sprite: Objects/Weapons/Grenades/grenade.rsi sprite: Objects/Weapons/Grenades/grenade.rsi
state: icon state: icon
- type: Item - type: Item
Size: 5 size: 5
- type: OnUseTimerTrigger - type: OnUseTimerTrigger
delay: 3.5 delay: 3.5
- type: Explosive - type: Explosive
@@ -44,7 +44,7 @@
sprite: Objects/Weapons/Grenades/flashbang.rsi sprite: Objects/Weapons/Grenades/flashbang.rsi
state: icon state: icon
- type: Item - type: Item
Size: 5 size: 5
- type: OnUseTimerTrigger - type: OnUseTimerTrigger
delay: 3.5 delay: 3.5
- type: FlashExplosive - type: FlashExplosive
@@ -71,7 +71,7 @@
sprite: Objects/Weapons/Grenades/syndgrenade.rsi sprite: Objects/Weapons/Grenades/syndgrenade.rsi
state: icon state: icon
- type: Item - type: Item
Size: 5 size: 5
- type: OnUseTimerTrigger - type: OnUseTimerTrigger
delay: 5 delay: 5
- type: Explosive - type: Explosive

4
Resources/Prototypes/Entities/Weapons/LMGs/lmgs.yml
View File

@@ -52,7 +52,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/LMGs/l6.rsi sprite: Objects/Weapons/Guns/LMGs/l6.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/LMGs/l6.rsi sprite: Objects/Weapons/Guns/LMGs/l6.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -88,7 +88,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/LMGs/pk.rsi sprite: Objects/Weapons/Guns/LMGs/pk.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/LMGs/pk.rsi sprite: Objects/Weapons/Guns/LMGs/pk.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel

4
Resources/Prototypes/Entities/Weapons/Launchers/launchers.yml
View File

@@ -29,7 +29,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
- type: RangedWeapon - type: RangedWeapon
- type: BoltActionBarrel - type: BoltActionBarrel
@@ -63,7 +63,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Launchers/rocket.rsi sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Launchers/rocket.rsi sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
- type: RangedWeapon - type: RangedWeapon
- type: RevolverBarrel - type: RevolverBarrel

22
Resources/Prototypes/Entities/Weapons/Pistols/pistols.yml
View File

@@ -58,7 +58,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi sprite: Objects/Weapons/Guns/Pistols/clarissa.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -88,7 +88,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/colt.rsi sprite: Objects/Weapons/Guns/Pistols/colt.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/colt.rsi sprite: Objects/Weapons/Guns/Pistols/colt.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -115,7 +115,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/giskard.rsi sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/giskard.rsi sprite: Objects/Weapons/Guns/Pistols/giskard.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -146,7 +146,7 @@
sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
- type: RangedWeapon - type: RangedWeapon
- type: BoltActionBarrel - type: BoltActionBarrel
@@ -187,7 +187,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi sprite: Objects/Weapons/Guns/Pistols/gyro_pistol.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -231,7 +231,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/mandella.rsi sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/mandella.rsi sprite: Objects/Weapons/Guns/Pistols/mandella.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -263,7 +263,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -295,7 +295,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi sprite: Objects/Weapons/Guns/Pistols/mk58_wood.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -322,7 +322,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/molly.rsi sprite: Objects/Weapons/Guns/Pistols/molly.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/molly.rsi sprite: Objects/Weapons/Guns/Pistols/molly.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -357,7 +357,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi sprite: Objects/Weapons/Guns/Pistols/olivaw_civil.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -385,7 +385,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Pistols/paco.rsi sprite: Objects/Weapons/Guns/Pistols/paco.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Pistols/paco.rsi sprite: Objects/Weapons/Guns/Pistols/paco.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel

6
Resources/Prototypes/Entities/Weapons/Revolvers/revolvers.yml
View File

@@ -30,7 +30,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
- type: RangedWeapon - type: RangedWeapon
- type: BoltActionBarrel - type: BoltActionBarrel
@@ -63,7 +63,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
- type: RangedWeapon - type: RangedWeapon
- type: RevolverBarrel - type: RevolverBarrel
@@ -89,7 +89,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
- type: RangedWeapon - type: RangedWeapon
- type: RevolverBarrel - type: RevolverBarrel

14
Resources/Prototypes/Entities/Weapons/Rifles/rifles.yml
View File

@@ -46,7 +46,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/ak.rsi sprite: Objects/Weapons/Guns/Rifles/ak.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/ak.rsi sprite: Objects/Weapons/Guns/Rifles/ak.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -85,7 +85,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi sprite: Objects/Weapons/Guns/Rifles/black_ak.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -126,7 +126,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/carbine.rsi sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/carbine.rsi sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -167,7 +167,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/dallas.rsi sprite: Objects/Weapons/Guns/Rifles/dallas.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/dallas.rsi sprite: Objects/Weapons/Guns/Rifles/dallas.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -209,7 +209,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/sts.rsi sprite: Objects/Weapons/Guns/Rifles/sts.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/sts.rsi sprite: Objects/Weapons/Guns/Rifles/sts.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -251,7 +251,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi sprite: Objects/Weapons/Guns/Rifles/vintorez.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -290,7 +290,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi sprite: Objects/Weapons/Guns/Rifles/wintermute.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel

12
Resources/Prototypes/Entities/Weapons/SMGs/smgs.yml
View File

@@ -52,7 +52,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/SMGs/atreides.rsi sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/SMGs/atreides.rsi sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -93,7 +93,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/SMGs/c20r.rsi sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/SMGs/c20r.rsi sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -136,7 +136,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/SMGs/drozd.rsi sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -178,7 +178,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/SMGs/straylight.rsi sprite: Objects/Weapons/Guns/SMGs/straylight.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/SMGs/straylight.rsi sprite: Objects/Weapons/Guns/SMGs/straylight.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -220,7 +220,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/SMGs/wt550.rsi sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/SMGs/wt550.rsi sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel
@@ -257,7 +257,7 @@
- type: Icon - type: Icon
sprite: Objects/Weapons/Guns/SMGs/zoric.rsi sprite: Objects/Weapons/Guns/SMGs/zoric.rsi
- type: Item - type: Item
Size: 24 size: 24
sprite: Objects/Weapons/Guns/SMGs/zoric.rsi sprite: Objects/Weapons/Guns/SMGs/zoric.rsi
- type: RangedWeapon - type: RangedWeapon
- type: MagazineBarrel - type: MagazineBarrel

2
Resources/Prototypes/Entities/Weapons/Shotguns/shotguns.yml
View File

@@ -11,7 +11,7 @@
- type: Icon - type: Icon
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
- type: PumpBarrel - type: PumpBarrel
currentSelector: Single currentSelector: Single
allSelectors: allSelectors:

2
Resources/Prototypes/Entities/Weapons/Snipers/snipers.yml
View File

@@ -15,7 +15,7 @@
- type: Icon - type: Icon
state: icon state: icon
- type: Item - type: Item
Size: 24 size: 24
- type: BoltActionBarrel - type: BoltActionBarrel
currentSelector: Single currentSelector: Single
allSelectors: allSelectors:

2
Resources/Prototypes/Entities/janitor.yml
View File

@@ -13,7 +13,7 @@
state: mop state: mop
- type: Item - type: Item
Size: 10 size: 10
sprite: Objects/Specific/Janitorial/mop.rsi sprite: Objects/Specific/Janitorial/mop.rsi
- type: Mop - type: Mop