diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml index 1a43485f64..0cdff5a8ba 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/closets.yml @@ -14,7 +14,6 @@ map: ["enum.StorageVisualLayers.Base"] - state: base_door map: ["enum.StorageVisualLayers.Door"] - - type: ItemSlots - type: DamageOnHighSpeedImpact damage: types: @@ -158,4 +157,73 @@ name: vault safe components: - type: CP14Lock - autoGenerateShape: BankVault \ No newline at end of file + autoGenerateShape: BankVault + +- type: entity + id: CP14ClosetGlassShowcase + parent: CP14ClosetBase + name: glass showcase + description: Something of value can be placed here without fear of it being discreetly stolen! + components: + - type: Sprite + drawdepth: Mobs + snapCardinals: true + sprite: _CP14/Structures/Storage/glass_showcase.rsi + state: base + - type: EntityStorage + isCollidableWhenOpen: true + enteringOffset: 0, 0 + capacity: 5 + showContents: true + occludesLight: false + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.40,-0.40,0.40,0.40" + density: 75 + mask: + - MachineMask + layer: + - MachineLayer + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmack + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 #excess damage (nuke?). avoid computational cost of spawning entities. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WindowShatter + - !type:SpawnEntitiesBehavior + spawn: + CP14GlassShard: + min: 1 + max: 2 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: True + occludes: False + paper_label: !type:ContainerSlot + showEnts: False + occludes: True \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml index c9123c0428..3495ed92a0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/directional.yml @@ -60,7 +60,7 @@ collection: WindowShatter - trigger: !type:DamageTrigger - damage: 25 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -69,7 +69,7 @@ spawn: CP14GlassShard: min: 1 - max: 1 + max: 2 - !type:DoActsBehavior acts: [ "Destruction" ] - type: Airtight diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/buy.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/buy.png index 6c6f9f8e30..7e5e79bd37 100644 Binary files a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/buy.png and b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/buy.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json index ecc9ee14e4..46812fed17 100644 --- a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by TheShuEd (Github) and resprite by Jaraten and vladimir.s", + "copyright": "Created by TheShuEd (Github) and resprite by Jaraten and vladimir.s", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/sell.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/sell.png index 4055504c28..3914d3fd0b 100644 Binary files a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/sell.png and b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/sell.png differ diff --git a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png index b493346d62..8c6198b9dd 100644 Binary files a/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png and b/Resources/Textures/_CP14/Structures/Furniture/pallets.rsi/wooden.png differ diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base.png b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base.png new file mode 100644 index 0000000000..0e83c0e57c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base.png differ diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_door.png b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_door.png new file mode 100644 index 0000000000..5c9c0e7bc9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_door.png differ diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_open.png b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_open.png new file mode 100644 index 0000000000..f64be8b74d Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/base_open.png differ diff --git a/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json new file mode 100644 index 0000000000..09e6d53dd6 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Storage/glass_showcase.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "All right reserved", + "copyright": "Created by TheShuEd (github)", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "base" + }, + { + "name": "base_open" + }, + { + "name": "base_door" + } + ] +}