From 8d69f7f2eb43a85b50da0c59596ccaecc7035e5b Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 9 Sep 2023 22:37:56 -0500 Subject: [PATCH] Cobwebs (#19623) * adds cobwebs * like legit the most awesomest thing ever --- Content.Shared/DrawDepth/DrawDepth.cs | 14 ++-- .../Structures/Decoration/cobwebs.yml | 41 ++++++++++ .../Decoration/cobweb.rsi/cobweb1.png | Bin 0 -> 1081 bytes .../Decoration/cobweb.rsi/cobweb2.png | Bin 0 -> 1598 bytes .../Decoration/cobweb.rsi/meta.json | 75 ++++++++++++++++++ 5 files changed, 124 insertions(+), 6 deletions(-) create mode 100644 Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml create mode 100644 Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb1.png create mode 100644 Resources/Textures/Structures/Decoration/cobweb.rsi/cobweb2.png create mode 100644 Resources/Textures/Structures/Decoration/cobweb.rsi/meta.json 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 0000000000000000000000000000000000000000..62a0fc159b0edff1ef618016da1caf9523018bea GIT binary patch literal 1081 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSoCO|{#S9F5M?jcysy3fA0|WDG zPZ!6KiaBrR9Q0Cl6mdNr5UKW3M`dwnrXc65tlmA-UojiNix8u^|$H`r-N7!FIKAKecj~@s! zBhKuYaQ;;D_dg$>tp1}~qgB89eSKd_tBuh1xb??dr?^aGz4o&EaYc1)?cdBwgV6fQ zPon?Uy`J^+^ZwwsSMT1vyJJR`qT}3sn-;A1h-3V}^#9A3D`(mtmow)0f8=(>f;m-5 ziXU%${#-2eulM)G@GkBjTmQu@aej6FP?1dc55AYtA7202`DS~nyjFFP&A!`j_xgu0gH~;r#%_! z*4FQl-f=T0=uVQ(beZTTpwg#)!Fwb!_x@)ATKbVkpxXcRecNoHp2&&2r2a(J`z7!) z8niRaaAr88$nZ>np_rq=lI4I5Qvx57aLV_eKjzgny!^)eV7WYl{a=P3`!CmD7{re@m#YO%ETlx3zmdh_#EPtTNZr^hG2PbO&wbe1){`o`qFN6ED&*ER0 zPaN>KXW+o?G`Nd@F;@Lzsa@uO@CqtlH1*fUMN3VW&ewSMSoHJHrJ^bUKd#RC&G_hK_}SyrA87u$cq*{3 z{+8>!eh2%88|#4~yD^^kFGJFPsb7o;iw*v)T>mhi=`3OQ&e{JutNBH{qv0iBS-{}w L>gTe~DWM4fF$W?; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..24a3d367f9fdaa27cf24ca910f59b65d99ee6bd2 GIT binary patch literal 1598 zcmbuAdrVVT9LH}(Xzc<8M-~RiWk7_)@X$@rjrAgeh^AG+Jy?@oadW~zi?0Au@4ap+ zKG3RzFtf!j;HG9^%~0wpa6#E4AXI};6oguZf;?I*_HxU;_w3^Sm?0r?*&pX~^2_g> zC*MtO>-*k24mkZ0=Jq%?kRoEahyo@u?gLVjA1w>D!B1bH>j3_;lvuK);g zx2Gnp+FbC%*dy6a%R0ZqnJI>r;LtU1*A(}Gg*$ccJSpj3^{}kAQY>3|I_;xVM#s8O zJU+Ah-ux$$N4Mi0agNE!$=xdgv1)3=#SXA7BWQ_!WZ?Of3gb3$DoKJYvI^G1zo5N~ z5D)?MLUTcUUzu-I1^R-Fq*_lDmM6|ET%1Cjy_#W{*NIRVeY0DPaXD<8{NS@NX?%Q@ zM7N+yB9nO?WEj)b_e!_Y3vHnOirKYQoFi5Q&ZBA7gx;%BVJP=)xEYasz^B;=%E)Z! z<8`iao2~z+`p#r;1VnOCf*WB`tzAVB#_5=9sk`Aun)R~ky3lMTyZQ%2SCwaUt;%BQ zO!krd;PE;`5A%5pH|E-&zmoN{Xv=N#ZwyMes$m6LI#eHS1|w)}VHd8>GDQ16%*)CFr$ZC=CHJw6MoT&+AGpt}C7@t`LBf0Uh^+b0 zJrPvl10{t*N7q2!Cub$@NgClX(`$h&0?WLq3KU650h#BH$G0F~u_n*FQv6(#;Uq@T zLr7g5{flv~IxGa1x0wFK) zGJFNvq>$G;KCi11CXk1^*$8eXOTq&!(c{~KGxG6W2!iM&BSOCcEqCgRz`_1oE{)yT z`=M0&O!%pjxXrXGv-UV9I@tOKp`R4ydOLe?TqOl>vGw9*oR3yM_{5>1MucXKGv6lc zeyA?sa&ZbH4!7MYwi=x;6LVrZHEizs&o;&-n5ty|#mzC{C3Lk4U+$$oioan4sYv69 zv0d46Bxb7=E9|4`;yYHf?`b9rwZaAI?0m%weS=5$9knYAf5EI~MuME-bzmtAF)Y*R z5!;Nq=LN8k;=II2B7iRB>=?1$vQIkgE7hJyc{4!FD<;fXGg)P=Ga16)3nZlib69mE+HT2j1;g{;O( z&6sn9h)_(-p@^NIea^k3b1@gXzs5D{sy(=>HuGoX$oIMMc=B8 zh0i0ccze{eV5)}I{|FN}#ToDN&HEULc#oHI>-miuhiQfrXd(jP7w}}Br67<`@8bNC iV@a>^Cj4_J2PKySDq3J{K^y-eK&i>{q$`PAzWy8CNDyWK literal 0 HcmV?d00001 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 + ] + ] + } + ] +}