diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index cc161df02b..bb7fe28238 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -11,7 +11,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodSnackChocolate + - id: FoodTinMRE - type: Sprite layers: - state: internals @@ -30,7 +30,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodSnackChocolate + - id: FoodTinMRE - type: Sprite layers: - state: internals @@ -50,7 +50,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodSnackChocolate + - id: FoodTinMRE - type: Sprite layers: - state: internals @@ -70,7 +70,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodSnackChocolate + - id: FoodTinMRE - type: Sprite layers: - state: internals @@ -95,7 +95,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodSnackChocolate + - id: FoodTinMRE - type: entity name: extended-capacity survival box @@ -110,7 +110,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodSnackChocolate + - id: FoodTinMRE - type: Sprite layers: - state: internals diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 32f1804f04..c564c814ac 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -149,25 +149,6 @@ - state: box - state: meson -- type: entity - name: survival box - parent: BoxCardboard - id: BoxSurvival - description: It's a box with basic internals inside. - components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: EmergencyOxygenTankFilled - - id: SpaceMedipen - - id: EmergencyMedipen - - id: Flare - - id: FoodSnackChocolate - - type: Sprite - layers: - - state: box - - state: writing - - type: entity name: M.R.E. parent: BoxCardboard @@ -272,4 +253,4 @@ - state: writing - type: Tag tags: - - DroneUsable \ No newline at end of file + - DroneUsable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index f9292eaecb..5f1a037f94 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -17,6 +17,7 @@ - type: Item sprite: Objects/Consumable/Food/snacks.rsi HeldPrefix: packet + size: 3 color: gray - type: DamageOnLand damage: @@ -43,6 +44,7 @@ sprite: Objects/Consumable/Food/snacks.rsi HeldPrefix: packet color: gray + size: 3 # Tins @@ -198,7 +200,6 @@ components: - type: Sprite state: beans-empty - # MRE can - type: entity @@ -226,6 +227,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] + - type: entity parent: FoodTinBase id: FoodTinMREOpen