diff --git a/Content.Shared/DrawDepth/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs index e15b4b9e62..f7b1f3648a 100644 --- a/Content.Shared/DrawDepth/DrawDepth.cs +++ b/Content.Shared/DrawDepth/DrawDepth.cs @@ -75,30 +75,32 @@ namespace Content.Shared.DrawDepth Items = DrawDepthTag.Default + 3, Mobs = DrawDepthTag.Default + 4, + + OverMobs = DrawDepthTag.Default + 5, - Doors = DrawDepthTag.Default + 5, + Doors = DrawDepthTag.Default + 6, /// /// Blast doors and shutters which go over the usual doors. /// - BlastDoors = DrawDepthTag.Default + 6, + BlastDoors = DrawDepthTag.Default + 7, /// /// Stuff that needs to draw over most things, but not effects, like Kudzu. /// - Overdoors = DrawDepthTag.Default + 7, + Overdoors = DrawDepthTag.Default + 8, /// /// Explosions, fire, melee swings. Whatever. /// - Effects = DrawDepthTag.Default + 8, + Effects = DrawDepthTag.Default + 9, - Ghosts = DrawDepthTag.Default + 9, + Ghosts = DrawDepthTag.Default + 10, /// /// Use this selectively if it absolutely needs to be drawn above (almost) everything else. Examples include /// the pointing arrow, the drag & drop ghost-entity, and some debug tools. /// - Overlays = DrawDepthTag.Default + 10, + Overlays = DrawDepthTag.Default + 11, } } diff --git a/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml new file mode 100644 index 0000000000..15897201b2 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml @@ -0,0 +1,41 @@ +#BaseCobweb doesn't really need to exist since, as of writing, these only have 2 sprite states & obviously have no need for variation beyond that. + +- type: entity + id: Cobweb1 + name: cobweb + description: Somebody should remove that. + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: Sprite + sprite: Structures/Decoration/cobweb.rsi + state: cobweb1 + drawdepth: OverMobs #We want this to appear below doors but above mobs + - type: Icon + sprite: Structures/Decoration/cobweb.rsi + state: cobweb1 + - type: Transform + anchored: true + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 20 #With the damage modifier you should have a hard time getting through it with something blunt, but an axe or something flammable will do the trick. + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: Cobweb2 + parent: Cobweb1 + components: + - type: Sprite + sprite: Structures/Decoration/cobweb.rsi + state: cobweb2 + - type: Icon + sprite: Structures/Decoration/cobweb.rsi + state: cobweb2 \ No newline at end of file diff --git a/Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb1.png b/Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb1.png new file mode 100644 index 0000000000..62a0fc159b Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb1.png differ diff --git a/Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb2.png b/Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb2.png new file mode 100644 index 0000000000..24a3d367f9 Binary files /dev/null and b/Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb2.png differ diff --git a/Resources/Textures/Structures/Decoration/cobweb.rsi/meta.json b/Resources/Textures/Structures/Decoration/cobweb.rsi/meta.json new file mode 100644 index 0000000000..3a602bac70 --- /dev/null +++ b/Resources/Textures/Structures/Decoration/cobweb.rsi/meta.json @@ -0,0 +1,75 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cobweb1", + "delays": [ + [ + 25.5, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.2, + 0.1, + 0.1, + 0.1, + 0.3, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "cobweb2", + "delays": [ + [ + 15, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 5, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 15 + ] + ] + } + ] +}