From e27abd2c608157604b53d57f4f002c43349c557d Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:07:57 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BC=D0=B0=D0=BB=D0=B5=D0=BD=D1=8C=D0=BA?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=80=D0=B5=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD=D1=81?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D0=BA=D0=B8=D0=BD=D0=B5=D1=82?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PressureDamageModifyComponent.cs | 25 +++ .../PressureDamageModifySystem.cs | 71 ++++++++ .../ADT/Weapons/Guns/Gunshots/beam_sniper.ogg | Bin 0 -> 30996 bytes .../Entities/Objects/Weapons/Guns/PKAs.ftl | 11 ++ .../Objects/Weapons/Guns/PKAs/PKAs.yml | 163 ++++++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 66 +++++++ .../Objects/Weapons/Melee/crushers.yml | 20 +++ Resources/Prototypes/ADT/mining_shop.yml | 8 + Resources/Prototypes/ADT/planets.yml | 8 +- .../Weapons/Guns/Projectiles/projectiles.yml | 3 +- .../Roles/Jobs/Cargo/salvage_specialist.yml | 1 - .../kinetic_pistol.rsi/animation-icon.png | Bin 0 -> 205 bytes .../PKAs/kinetic_pistol.rsi/equipped-BELT.png | Bin 0 -> 379 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 379 bytes .../Guns/PKAs/kinetic_pistol.rsi/icon.png | Bin 0 -> 896 bytes .../Guns/PKAs/kinetic_pistol.rsi/icon_a.png | Bin 0 -> 244 bytes .../PKAs/kinetic_pistol.rsi/inhand-left.png | Bin 0 -> 1387 bytes .../PKAs/kinetic_pistol.rsi/inhand-right.png | Bin 0 -> 1403 bytes .../Guns/PKAs/kinetic_pistol.rsi/meta.json | 42 +++++ .../kinetic_railgun.rsi/animation-icon.png | Bin 0 -> 206 bytes .../kinetic_railgun.rsi/equipped-BELT.png | Bin 0 -> 1465 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1465 bytes .../Guns/PKAs/kinetic_railgun.rsi/icon.png | Bin 0 -> 766 bytes .../Guns/PKAs/kinetic_railgun.rsi/icon_a.png | Bin 0 -> 236 bytes .../PKAs/kinetic_railgun.rsi/inhand-left.png | Bin 0 -> 1195 bytes .../PKAs/kinetic_railgun.rsi/inhand-right.png | Bin 0 -> 1212 bytes .../Guns/PKAs/kinetic_railgun.rsi/meta.json | 42 +++++ .../kinetic_repeater.rsi/animation-icon.png | Bin 0 -> 161 bytes .../kinetic_repeater.rsi/equipped-BELT.png | Bin 0 -> 1424 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 1424 bytes .../Guns/PKAs/kinetic_repeater.rsi/icon.png | Bin 0 -> 836 bytes .../Guns/PKAs/kinetic_repeater.rsi/icon_a.png | Bin 0 -> 281 bytes .../PKAs/kinetic_repeater.rsi/inhand-left.png | Bin 0 -> 1678 bytes .../kinetic_repeater.rsi/inhand-right.png | Bin 0 -> 1683 bytes .../Guns/PKAs/kinetic_repeater.rsi/meta.json | 42 +++++ .../kinetic_shotgun.rsi/animation-icon.png | Bin 0 -> 174 bytes .../kinetic_shotgun.rsi/equipped-BELT.png | Bin 0 -> 739 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 739 bytes .../Guns/PKAs/kinetic_shotgun.rsi/icon.png | Bin 0 -> 531 bytes .../Guns/PKAs/kinetic_shotgun.rsi/icon_a.png | Bin 0 -> 281 bytes .../PKAs/kinetic_shotgun.rsi/inhand-left.png | Bin 0 -> 742 bytes .../PKAs/kinetic_shotgun.rsi/inhand-right.png | Bin 0 -> 754 bytes .../Guns/PKAs/kinetic_shotgun.rsi/meta.json | 42 +++++ 43 files changed, 538 insertions(+), 6 deletions(-) create mode 100644 Content.Server/ADT/PressureDamageModify/PressureDamageModifyComponent.cs create mode 100644 Content.Server/ADT/PressureDamageModify/PressureDamageModifySystem.cs create mode 100644 Resources/Audio/ADT/Weapons/Guns/Gunshots/beam_sniper.ogg create mode 100644 Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Guns/PKAs.ftl create mode 100644 Resources/Prototypes/ADT/Entities/Objects/Weapons/Guns/PKAs/PKAs.yml create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/animation-icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/icon_a.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/animation-icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/icon_a.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/animation-icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/icon_a.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/meta.json create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/animation-icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/equipped-BELT.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/icon.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/icon_a.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/inhand-left.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/inhand-right.png create mode 100644 Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/meta.json diff --git a/Content.Server/ADT/PressureDamageModify/PressureDamageModifyComponent.cs b/Content.Server/ADT/PressureDamageModify/PressureDamageModifyComponent.cs new file mode 100644 index 00000000000..75aa27c47a7 --- /dev/null +++ b/Content.Server/ADT/PressureDamageModify/PressureDamageModifyComponent.cs @@ -0,0 +1,25 @@ +using Content.Shared.Damage; + +namespace Content.Server.ADT.PressureDamageModify; + +[RegisterComponent] +public sealed partial class PressureDamageModifyComponent : Component +{ + /// + /// only for projectiles, doesn`t work for melee damage + /// + [ViewVariables(VVAccess.ReadWrite), DataField("projDamage")] + public float ProjDamage = 0.2f; + + /// + /// KPd, below which damage will diminishes. 0 kPa = 1 kPa + /// + [ViewVariables(VVAccess.ReadWrite), DataField("needsPressure")] + public float Pressure = 40f; + + /// + /// only for melee, doesn`t work for projectiles + /// + [DataField("additionalDamage")] + public DamageSpecifier? AdditionalDamage = null; +} diff --git a/Content.Server/ADT/PressureDamageModify/PressureDamageModifySystem.cs b/Content.Server/ADT/PressureDamageModify/PressureDamageModifySystem.cs new file mode 100644 index 00000000000..acbda540a2c --- /dev/null +++ b/Content.Server/ADT/PressureDamageModify/PressureDamageModifySystem.cs @@ -0,0 +1,71 @@ +using Content.Server.Popups; +using Content.Shared.Projectiles; +using Content.Shared.StatusEffect; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Server.GameObjects; +using Robust.Shared.Map; +using Robust.Shared.Random; +using Content.Shared.Throwing; +using Content.Shared.Weapons.Melee.Events; +using System.Linq; +using Content.Server.Atmos.EntitySystems; +using Content.Shared.Damage; + +namespace Content.Server.ADT.PressureDamageModify; + +public sealed partial class PressureDamageModifySystem : EntitySystem +{ + [Dependency] private readonly DamageableSystem _damage = default!; // ADT-Changeling-Tweak + [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly PhysicsSystem _physics = default!; + [Dependency] private readonly IMapManager _mapMan = default!; + [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnProjectileHit); + + SubscribeLocalEvent(OnMeleeHit); + } + private void OnProjectileHit(EntityUid uid, PressureDamageModifyComponent component, ref ProjectileHitEvent args) + { + var pressure = 1f; + + if (_atmosphereSystem.GetContainingMixture(uid) is {} mixture) + { + pressure = MathF.Max(mixture.Pressure, 1f); + } + if (pressure >= component.Pressure) + { + args.Damage *= component.ProjDamage; + } + } + + private void OnMeleeHit(EntityUid uid, PressureDamageModifyComponent component, MeleeHitEvent args) + { + if (!args.IsHit || + !args.HitEntities.Any() || + component.AdditionalDamage == null) + { + return; + } + + foreach (var ent in args.HitEntities) + { + var pressure = 1f; + + if (_atmosphereSystem.GetContainingMixture(uid) is {} mixture) + { + pressure = MathF.Max(mixture.Pressure, 1f); + } + if (pressure <= component.Pressure) + { + _damage.TryChangeDamage(ent, component.AdditionalDamage); + } + } + } +} diff --git a/Resources/Audio/ADT/Weapons/Guns/Gunshots/beam_sniper.ogg b/Resources/Audio/ADT/Weapons/Guns/Gunshots/beam_sniper.ogg new file mode 100644 index 0000000000000000000000000000000000000000..f91831cddd172d9cdef30a88bdcf350cd004d224 GIT binary patch literal 30996 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 X0@B6i`+I-s 0.170 ~4 tiles of range. + lifetime: 0.1 # ADT tweak 0.4 -> 0.1 ~4 tiles of range. - type: GatheringProjectile + - type: PressureDamageModify # ADT tweak - type: entity id: BulletKineticShuttle diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 17869184dbc..c4574f26d40 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,7 +3,6 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist - canBeAntag: false # ADT tweak requirements: - !type:DepartmentTimeRequirement department: Cargo diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/animation-icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/animation-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..15aed576865b05b5e97f3f133a7df5a7733ebbd2 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IqjYzopr0E3=S A{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..95d016a9802d23df4a8e24de13842865748b651c GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4RCt{2+P_M}P!z}UpZ}nHH?a-a4!v-1000000EvXoS?HYYx{j=l(<~01 zvt|(d-oMUfxffKl!!(PVL7-I}OOjS`tj&i}dHr_JZm+K_sGXR!PQ$KiD%5m1u;nO9 z^Z=HlsJOy1O8gGExqDQ%F;TtM($Rcj&*SmIe-^fPeiCqb(XsQh)5^p@@h<}E ZeFGl|ofqxe;-CNk002ovPDHLkV1o98tI7ZX literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..95d016a9802d23df4a8e24de13842865748b651c GIT binary patch literal 379 zcmV->0fhdEP)Px$HAzH4RCt{2+P_M}P!z}UpZ}nHH?a-a4!v-1000000EvXoS?HYYx{j=l(<~01 zvt|(d-oMUfxffKl!!(PVL7-I}OOjS`tj&i}dHr_JZm+K_sGXR!PQ$KiD%5m1u;nO9 z^Z=HlsJOy1O8gGExqDQ%F;TtM($Rcj&*SmIe-^fPeiCqb(XsQh)5^p@@h<}E ZeFGl|ofqxe;-CNk002ovPDHLkV1o98tI7ZX literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..93abf0bbccbf1fe54f3cb999f7e6d70199b83359 GIT binary patch literal 896 zcmV-`1AqL9P)Px&I!Q!9R9J=Wl}%_=R}{y8FX;I4;e2GGnM4zemXb^`f}6HcBp|d>a3Ka{l8}Wd zNhguY;35lYkwR9545*P1iHb%`Aqak;1{V%N;|C(G5zVx_x%6oocr#D9CFCveTOuE!RPZCf|{GU#p=?3@Or(5`2UKAh6Vug z77J`{>K6ImeNVWgjZU{)0DSw!0kI}{Ml8iHmVenoPLIbUEEbj6sVmf^&hzZunvFcl z>ONsp#l(UZegvSkwN(J@-cT_+y_8je$K%nJuaISpJQM=pwWr zSj|Oq;$V}(`U45J|M4jR!QHnrQ5gmF_Vr6$U0;go4Ql~#tg_+&?mT!5z^jxtow~X@ zx(*J~*VD$utM?eWInHNWH|jPJit<-P0qIWw)a!n>R2qMxj2-Ch>zDSnGzkE!#Y|ev zt{FQ!e>frmxLhs)&~#;Gx{A42Ze=& z031F$h7ybGKC8t{IF=;*V1f@yEdZ=}mE!WK*1fQj(ql8;1D$TSsC7D#O(sBV|Lp1k zyk4*LGCIYx$=`JHWd%hnFI>s=8-c2-loS{9>)&??B_DA+^1Gftl$cq(1JP(Sn@fih zi}Uejr!G>>E8^vpMl?J;tcz`IY!qhM#E~o4SSOdw$zeDZ&YBug>vWQso~Ej*ijhkf zI5Bk25ZANska(*6%r~7o0BsDtef>+ms?%3-#tx*b|Hbdmn&62th3Vb5Kaf}|uK@-D zl4LBRrDdO}-}Vt>qj#BY?~h)^A4o8AbNpXbKZkGrg3sr}<#LIw_4WKTKF)N~MtNlc zppWc?Ln2z= zUNYosQ4n#xXq^(3lVQ4W(cQQ^-$bXTuW`>tBTW1=V@lktK{Xgt10!|!? zEdow|R&UF_ENr_z=t61iM~2gz7EIX{8x$(a5S87QXi>7y`)O&c@%iFuYhUl;mp#6* zqS5#Mch78I2M)&fe--Uz6W013lSt}`+_u)-xA^K_ZbgO%d(Z#!i)TCR?)4 rFS)AYksr^`DLxtX`vkja{||4g&UTpubUA~ktDnm{r-UW|RP0|) literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..945b3a761ca6332fd0e06c971f3104fc835aedfd GIT binary patch literal 1387 zcmV-x1(f=UP)Px)B}qgfCT>obU2MjvgH2|L zCXy`K#o~><+{Jb=XG~axZAMJk#V%kjF)`hA0x?>&ChI0n3eHijEoG^HWbP2o@YVNbwTccfhUW^rkoWd8($|qIf92B@c8@Bg{Ps8 zA1b?*9E+Ly#^xzwuhjRkZ~ICCP}3=BxjQ5t_Khlc?zQ7__Xa)J1u1|rA(jWd1LVJz z#Hn%@09UUxVTfA9r5>+%CvCYhT>(PELOD^^%!M8=C3|y8PmZASY>imI>3sm)?%?LS zAO-NadwHh*6PSF#{wzM;k&CCHjzd7P{kj0Ae3qRJ{kXbDh*T}K+#Mo4IRbz??XS=s z;CA0s460dxZ}NFb3dMyd0a*V=#*DGfrU6lE&!+rDB9&)<41Di(x3DfPS$QSy0D$_& zX2oW*io7HR`*)4N?315LN@85#^SuZCLCeo?!3r?h3lV4An z-&|W8H=o#f$%$Sm5=pOG9+tl4ms3}xCTomljV$IWA0PNaRgkHY{V?wN^ zu{9OI zWN&WZd;d8@^a@7~7ce%|Pny{zw04j+6(D9=v{HNVGNBRCLW~WIB%>;hRn!8oQI|>j zj!pogM#Bl6SS<2#Q#B= zOw6)qP3xMb0(krS14TG@$=9bdrzZU8m{a90O6}QH{dSO=+P0T|$*HEcO;r7MkWzbg z;C%x>|GCdyx`BW4-ac&|WKD~pZ*^TuxNbr*#Hbvrs1*Q_dKGvvc>qsCou)));vcKj zo=vg+IvWg005rF`X>N04h*6a%BSU!m`ZetUFpuuA{{-QBGxd$l3c#v_M$Vt-+G+Onv2RMR=)q1}C70pB9o(l)9)DwFAAz1 zF02_*inD28zQYGNn+5_!m|Wnw5o8SNd literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..937e45314f4642354f5a14e67c80c4bfe50c6d11 GIT binary patch literal 1403 zcmV->1%&#EP)Px)HAzH4RCt{2+FwjlR~*3c?`4h_5N;=eDO5zPQmL#+-3&6bt?^$r^=)c!!3DMu zm*~?T7GG@kvL%~Y;*5z?+{R!D%i@E$Kf0}MOzO-6vmy!u9MTR11ws77pN+GJrdOeg zTtO$<`6PYly(j1V&hMO_lk^;rBuSDaNs=TlfdRUD z`yW{+CZe(PAO4;mN7Qf+bCaV1*jrproY_EQX(97pEgn%`OF*{W#z*BHY}+_XTt9Pw z{d>GPQla5u9~axNQdx6J0FV7FXb)TlV19BeajHS2&xs{>xeY-4R&ymRek}pZ7tG?9 zKbpi7#aC~SJdj`D;MAEvFgGTGStW|)-fb3J&PsvlO&lP)_W9g`ZX z^`ph#Myk<_GsC33fB44{Wv9&49xqqU5*QG8YJvmivN{D!&4H98Ns=TCPglhY zpDiZpwUAvLjYru1fcp^B>-xf~R^ee@V^h*?k0RN>>^I~p5{*^+?K z7{!LXLI4)tJWqasg9?w2VKtT2>Lxmd{KA?NPqy8rr|L0f+ih4=;^`Rji`D8ThSgLm zJU;RZ94x$f9)Jybg&2)dm@Nsq>eiKj_P}Kp*sNl(ubUm)@`*486Fsb^YGt->UPe=E zmxvxR;IcY(1#>qptCQ#<15K@6V*BQ0+VfDG5k`d_+wvLg>t=z?Dn_3U-;b^Y#Lt|e zcq>m489PIW!CNB5tcu-bUI20onWV361;8{AL*(!@k-Kc3u3+vaciB85ho=eCKnwus zYg@@NWCF0e%u9+{6=Lv~h>V>fyp^YjpE*OfeQRpmy1A6-|v zb?pG4e;3dih%wrOCsil<3$3nMu*OiGdav>*!8E$i23?Bb9;*k54;|ov7+_Jz5g(Oz?PO8IK7akLRsl z!54>r03gkhBvOrLAb8oLy|Z`Hj-p53U1+&u^zV#8k|as5e*rd{^&2$9`g;HX002ov JPDHLkV1o2mlvDr! literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/meta.json new file mode 100644 index 00000000000..9f827a88b88 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_pistol.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon and animation-icon taken from https://github.com/Bubberstation/Bubberstation/pull/1332/commits/712c86db77c96657cd2b8cfaf6203d76f85f9649, rest made by ratyyy(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_a" + }, + { + "name": "animation-icon", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/animation-icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/animation-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..85ed5fc7c60ad5b2467e4edfc09f93cf24c0cfcd GIT binary patch literal 206 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/icon_a.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_railgun.rsi/icon_a.png new file mode 100644 index 0000000000000000000000000000000000000000..a88994188d3bd18e3ceeb8ead36a34f8904c3aad GIT binary patch literal 236 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 JS?83{1OQt6Hsb&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..32d49aae93e3c26f7dafb7e5d5bda30e889d056f GIT binary patch literal 1424 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/meta.json new file mode 100644 index 00000000000..9f827a88b88 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_repeater.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon and animation-icon taken from https://github.com/Bubberstation/Bubberstation/pull/1332/commits/712c86db77c96657cd2b8cfaf6203d76f85f9649, rest made by ratyyy(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_a" + }, + { + "name": "animation-icon", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/animation-icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/animation-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4c91c432b8f89985718056d8b23e9ac8e7cc2fda GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IT@ZVjv*P1 zZ*LsrY%t()dl+nE>|EawE2 WYL)b>iO2)(WbkzLb6Mw<&;$U;{5#A5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/equipped-BELT.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..9f4e6a63f1ee456b92e8a75c7d2226ca713fcee6 GIT binary patch literal 739 zcmV<90v!E`P)Px%ok>JNRCt{2nn7q2K@^7nh}26I*Gs@Q>MVsu0~WJ_7!PR!g&-b;l2dLL$t}{0 zP>Ir0FJceUn?;MX;H7vFgo2fVU=eK9NFY*MEwR0BS_{_Gc#wo5B0JeP>yEzfl)&zv zf8YF>+2IYqFbrb|j^jungrwBmM=7Qg%d%uN8U+CCR3_!h^bkoQ_EU%i#mA03I&cR! zuRXxK`tIMh6Fl8BYf=ayDHA|S=fH$kQ=J17QV1c3`!C3Bw-des=q8iNa03481n8Ip zj9CT&;M>$w0Kn|t55MsT44VVCcdNL* zUTuB1yNiYpAR69qW_X5Syx9E-6 z+IJQpTFwt}0yqJj08YTam;fbg+cu&Awrz*nBg2@A?*2a&Dn7Y0q;fHJZ(bMLd}hy| zHR3N|icj-+cJZDOl~wVnJPGzWgP|^hsy|)@R4$%xY@i&=g*F9y&kuM-sXaco^$2rY z%Dw{Q*Yg8j@SK2=VqTUCX#hX_^lH|Eq3NqsNMod!_moo44?=MoBM40K$uLYf_yG?z VF$7LH7U%!~002ovPDHLkV1hDFQHcNm literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..9f4e6a63f1ee456b92e8a75c7d2226ca713fcee6 GIT binary patch literal 739 zcmV<90v!E`P)Px%ok>JNRCt{2nn7q2K@^7nh}26I*Gs@Q>MVsu0~WJ_7!PR!g&-b;l2dLL$t}{0 zP>Ir0FJceUn?;MX;H7vFgo2fVU=eK9NFY*MEwR0BS_{_Gc#wo5B0JeP>yEzfl)&zv zf8YF>+2IYqFbrb|j^jungrwBmM=7Qg%d%uN8U+CCR3_!h^bkoQ_EU%i#mA03I&cR! zuRXxK`tIMh6Fl8BYf=ayDHA|S=fH$kQ=J17QV1c3`!C3Bw-des=q8iNa03481n8Ip zj9CT&;M>$w0Kn|t55MsT44VVCcdNL* zUTuB1yNiYpAR69qW_X5Syx9E-6 z+IJQpTFwt}0yqJj08YTam;fbg+cu&Awrz*nBg2@A?*2a&Dn7Y0q;fHJZ(bMLd}hy| zHR3N|icj-+cJZDOl~wVnJPGzWgP|^hsy|)@R4$%xY@i&=g*F9y&kuM-sXaco^$2rY z%Dw{Q*Yg8j@SK2=VqTUCX#hX_^lH|Eq3NqsNMod!_moo44?=MoBM40K$uLYf_yG?z VF$7LH7U%!~002ovPDHLkV1hDFQHcNm literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7af9b7b08dfa3a6392cc5c88b613ad1e48040782 GIT binary patch literal 531 zcmV+u0_^>XP)Px$%}GQ-R9J=W(oaYfQ5?YW?+cL)NoNj`68*gdmIfiD;K>e#An^_%L_`!sAYLkv z$b$$T>k@(&w}=QjJqlDj7;~_ey14_k3vKSO>+Y7&jJrb4>2(mNHFqiS(B*yL@teo| z-tYGt-hg2khGG0?!f_lX9zM_jL3xuWQ`4eevXoNWwoN=9ubcBPq?8&!DJ4W-PnW(i z*h$)}u(0IP96QVS*$=;ng)QhSBVnF zj$DqK?(6|Z$eAVjqOYe* zU+g>u!0Xxf3?0A2CF^KZcrjSpeph-y_qo%gGI^#ZZ}WEk6AMc&{ko-VOj#nLMqBEv&GK3~l|7IgZWHcw*!4z;Mp;&F{KQN3WNL6567Dj{}86bXpj)b6EtAEzewK)^IT5 ze!QHN3S)uM*ZEU}Px%ph-kQRCt{2n=xn;VHC$-Y{6Kuh*X5+1n>2(n=a?lKp{j5k~NEiQ>qRwg>C`S zC?#7Fp_A#5p#?#@IXEQJp%9liG$52nuxbiLC<%7S^jy4ntx0>0@4LGu?>8RF|K59f z@5^`j{s9mKK@bE%@CZaCO*hGTP18+6MC$b(m7MeArew^6T?9=xiHvza!tfqMBx9}K zwF8W`x^G?J35ZD1+2wzdx6yQyqO;4M7r~PeKtyU!F2MFu7^X(XyS`>>WE{4a!qA>v zfPv}+yX_CQRw!XuR9l_vnp|yljuM7N2U{zHGY)p!pOn0fvj~2S11p+tQX!WnO*dU7 zZ(|ps*IIEVu#+$3(sb#{)xHubUbfq(YRFxRs*m^Ectna!Q1+^%v<9xB4q$Gk;gFTl6GGPh($cV}Xg zU6*|gNKD_Ruitl}{$rO-8?^}CxE=uj0B&t|xM$RAcuDnGbHL|S|}0{{U3YsCrfDQgex z4OZyOD`>Tvo$Fo{-gk~}u>6k4Q-ZL;@{OTQ9udj;I6YL!1N{9DL69G(l{3`I3xaxn Y1I%Y?ZtlFsyZ`_I07*qoM6N<$g3oVFpa1{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9eae37b784b470902e57108bb3a56b25a5396c0a GIT binary patch literal 754 zcmVPx%tVu*cRCt{2nlWe-Q5eVnX$uA+tptORKE->ztLWg8tssO#LAqvjN~?oQpj$zt z7Rgp!I@t;tS|~_2Cuxg=kPg}SB&DRFb+i*HB?--_*Vt!$5Sl@xXM$1XGo)u=H=&Nu4ANK4 zuAK!^O43(NI8!R zW3+#;@x`T;DH_)kbhx|R70bbz_J_O6G_EJ8v@+Ga9=i#hyd11)@2YqU%LJhrl*^_Y zHx7jnn&G~9JCSINa@lmpnvlz;8)`n*1W#gmehrtdT*i}!x4co+NkpPC0)T<=X-Xzi z9Wev!I-AV^M?|7AnjM>?jmahD4M-+Zv@y9vvtx6Pw1(O($WM}q6x}&@9h=pC3pQ9dN$EmY^BSqYG@jwd(e`GHak_ikeepmG2JC&xyZwr9d^r2UwLVup zK#DkBJRiqa{-tug!_o!-?>|;xmMiViC`DY!9svB(rm{YUVHk#C7=~dOhG81xS6IXK zD=|OlrLe|7>GrUOBm4+!D7geIx-qQb3Z=ptLA`NRBCH`ryq*yV(gZ84;pNy(dw_M| z@N9bz#itkW=;}Q$f8P-&1=5= zSAYHT+0z;DUxV52#?a6ikeNrh3z~-6*qR2?`}PEJ4F2;O||VwH$iV2;k4- kY$rx+J)@_KXBhSQ2@LCRkHOsOcmMzZ07*qoM6N<$f>L^3(f|Me literal 0 HcmV?d00001 diff --git a/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/meta.json new file mode 100644 index 00000000000..9f827a88b88 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Guns/PKAs/kinetic_shotgun.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "icon and animation-icon taken from https://github.com/Bubberstation/Bubberstation/pull/1332/commits/712c86db77c96657cd2b8cfaf6203d76f85f9649, rest made by ratyyy(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_a" + }, + { + "name": "animation-icon", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} From 0660f1e2f8c4e96624c64809f07ccdb7fd133837 Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:10:52 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D0=B8=D0=BC=20?= =?UTF-8?q?=D0=BF=D0=B8=D1=80=D0=B0=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Rules/Components/PiratesRuleComponent.cs | 2 +- Resources/Maps/ADTMaps/Shuttles/pirate.yml | 895 ++++++++++++------ 2 files changed, 612 insertions(+), 285 deletions(-) diff --git a/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs b/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs index c04bc48fab3..c41f5ed7554 100644 --- a/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs +++ b/Content.Server/ADT/GameTicking/Rules/Components/PiratesRuleComponent.cs @@ -23,5 +23,5 @@ public sealed partial class PiratesRuleComponent : Component AudioParams.Default.WithVolume(4)); [DataField] - public string PiratesShuttlePath = "Maps/ADTMaps/Shuttles/ERT_base.yml"; + public string PiratesShuttlePath = "/Maps/ADTMaps/Shuttles/pirate.yml"; } diff --git a/Resources/Maps/ADTMaps/Shuttles/pirate.yml b/Resources/Maps/ADTMaps/Shuttles/pirate.yml index 942d2c9c026..db084bc8612 100644 --- a/Resources/Maps/ADTMaps/Shuttles/pirate.yml +++ b/Resources/Maps/ADTMaps/Shuttles/pirate.yml @@ -286,7 +286,8 @@ entities: 0,-3: 0: 30583 -1,-3: - 0: 52701 + 0: 52445 + 2: 256 0,-2: 0: 6129 -1,-2: @@ -297,7 +298,8 @@ entities: 1,-4: 0: 11187 1,-3: - 0: 12287 + 0: 12031 + 2: 256 1,-2: 0: 24575 1,-5: @@ -307,9 +309,11 @@ entities: 0: 272 1: 33860 2,-3: - 0: 1911 + 0: 1907 + 2: 4 2,-2: - 0: 1911 + 0: 887 + 2: 1024 1: 32768 2,-1: 1: 17 @@ -330,7 +334,8 @@ entities: -2,-4: 0: 36590 -2,-2: - 0: 59630 + 2: 2 + 0: 59628 -2,-1: 0: 238 1: 57344 @@ -394,6 +399,29 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -404,6 +432,14 @@ entities: - type: Transform pos: -0.5,-12.5 parent: 2 +- proto: ADTClothingUnderwearBottomPantiesCap + entities: + - uid: 420 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.7995796,-4.4446487 + parent: 2 - proto: ADTComputerPalletConsolePirate entities: - uid: 233 @@ -412,39 +448,53 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-12.5 parent: 2 -- proto: ADTDrinkRumCanister +- proto: ADTFoodTinCondensedMilk entities: - - uid: 373 + - uid: 342 components: - type: Transform - pos: 1.8769671,-16.547262 + pos: -6.566634,-14.640817 parent: 2 - - uid: 374 + - uid: 343 components: - type: Transform - pos: 1.3769671,-16.531637 + pos: -6.191634,-14.843942 parent: 2 - - uid: 375 +- proto: ADTSpawnPointLostCaptainPirate + entities: + - uid: 435 components: - type: Transform - pos: 1.8144671,-16.234762 + pos: 0.5,-0.5 parent: 2 - - uid: 376 +- proto: ADTSpawnPointLostFirstmate + entities: + - uid: 434 components: - type: Transform - pos: 1.3457171,-16.203512 + pos: 1.5,-1.5 parent: 2 -- proto: ADTFoodTinCondensedMilk +- proto: ADTSpawnPointPirate entities: - - uid: 342 + - uid: 322 components: - type: Transform - pos: -6.566634,-14.640817 + pos: -5.5,-16.5 parent: 2 - - uid: 343 + - uid: 408 components: - type: Transform - pos: -6.191634,-14.843942 + pos: -3.5,-16.5 + parent: 2 + - uid: 436 + components: + - type: Transform + pos: -0.5,-1.5 + parent: 2 + - uid: 437 + components: + - type: Transform + pos: 5.5,-10.5 parent: 2 - proto: AirlockExternalGlassShuttleSyndicateLocked entities: @@ -552,7 +602,7 @@ entities: pos: 5.5,-12.5 parent: 2 - type: Door - secondsUntilStateChange: -84.0904 + secondsUntilStateChange: -897.94574 state: Opening - type: DeviceLinkSource lastSignals: @@ -610,6 +660,13 @@ entities: rot: 3.141592653589793 rad pos: 6.5,2.5 parent: 2 +- proto: BannerRed + entities: + - uid: 421 + components: + - type: Transform + pos: -6.5,-6.5 + parent: 2 - proto: Bed entities: - uid: 307 @@ -1430,222 +1487,118 @@ entities: parent: 2 - proto: CannonBall entities: - - uid: 406 + - uid: 375 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.712067,-5.813965 - parent: 2 - - uid: 407 + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 376 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.430817,-5.813965 - parent: 2 - - uid: 408 + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 383 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.149567,-5.813965 - parent: 2 - - uid: 409 + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 384 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.118317,-5.470215 - parent: 2 + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 388 + components: + - type: Transform + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 406 + components: + - type: Transform + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 407 + components: + - type: Transform + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 410 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.180817,-5.23584 - parent: 2 + parent: 374 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 411 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.415192,-5.251465 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 412 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.743317,-5.220215 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 413 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.696442,-5.532715 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 414 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.368317,-5.532715 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 415 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.180817,-7.782715 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 416 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.165192,-7.48584 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 417 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.165192,-7.220215 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 418 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 10.462067,-7.23584 - parent: 2 - - uid: 419 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.743317,-7.23584 - parent: 2 - - uid: 420 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.758942,-7.48584 - parent: 2 - - uid: 421 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.493317,-7.48584 - parent: 2 - - uid: 422 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.462067,-7.76709 - parent: 2 - - uid: 423 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.665192,-7.782715 - parent: 2 - - uid: 424 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.743317,-9.73584 - parent: 2 - - uid: 425 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.508942,-9.73584 - parent: 2 - - uid: 426 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.165192,-9.70459 - parent: 2 - - uid: 427 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.196442,-9.42334 - parent: 2 - - uid: 428 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.477692,-9.42334 - parent: 2 - - uid: 429 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.743317,-9.42334 - parent: 2 - - uid: 430 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.712067,-9.17334 - parent: 2 - - uid: 431 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.493317,-9.23584 - parent: 2 - - uid: 432 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.212067,-9.20459 - parent: 2 - - uid: 433 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.258942,-11.73584 - parent: 2 - - uid: 434 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.524567,-11.73584 - parent: 2 - - uid: 435 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.758942,-11.73584 - parent: 2 - - uid: 436 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.727692,-11.470215 - parent: 2 - - uid: 437 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.524567,-11.470215 - parent: 2 - - uid: 438 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.212067,-11.470215 - parent: 2 - - uid: 439 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.243317,-11.23584 - parent: 2 - - uid: 440 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.508942,-11.220215 - parent: 2 - - uid: 441 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.727692,-11.220215 - parent: 2 + parent: 409 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: CannonBallGrapeshot entities: - uid: 279 @@ -1956,6 +1909,79 @@ entities: - type: Transform pos: -7.5,-9.5 parent: 2 +- proto: ClothingBeltUtilityEngineering + entities: + - uid: 419 + components: + - type: Transform + pos: -3.4962327,-10.443164 + parent: 2 + - uid: 780 + components: + - type: Transform + parent: 778 + - type: Physics + canCollide: False + - type: InsideEntityStorage +- proto: ClothingBeltUtilityFilled + entities: + - uid: 312 + components: + - type: Transform + pos: 1.8631423,-16.548126 + parent: 2 + - uid: 316 + components: + - type: Transform + pos: 1.3475173,-16.516876 + parent: 2 + - uid: 317 + components: + - type: Transform + pos: 1.3475173,-16.126251 + parent: 2 + - uid: 321 + components: + - type: Transform + pos: 1.8631423,-16.141876 + parent: 2 +- proto: ClothingHeadBandSkull + entities: + - uid: 427 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 428 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 429 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 430 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 433 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingHeadHatPirate entities: - uid: 313 @@ -1970,13 +1996,6 @@ entities: - type: Transform pos: 2.280623,-5.1993055 parent: 2 -- proto: ClothingHeadHatWelding - entities: - - uid: 322 - components: - - type: Transform - pos: -3.5025024,-10.38229 - parent: 2 - proto: ClothingHeadHelmetPodWars entities: - uid: 298 @@ -1989,6 +2008,43 @@ entities: - type: Transform pos: -1.71875,-12.552576 parent: 2 +- proto: ClothingMaskBandSkull + entities: + - uid: 424 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 425 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 426 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 431 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 432 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingMaskBreath entities: - uid: 390 @@ -2006,13 +2062,15 @@ entities: - type: Transform pos: 4.690876,-10.657715 parent: 2 -- proto: ClothingNeckCloakPirateCap +- proto: ClothingMaskWeldingGas entities: - - uid: 312 + - uid: 781 components: - type: Transform - pos: -3.7056274,-4.5877585 - parent: 2 + parent: 778 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingOuterArmorBasic entities: - uid: 276 @@ -2092,6 +2150,252 @@ entities: - type: Transform pos: 0.5,0.5 parent: 2 +- proto: CratePirate + entities: + - uid: 374 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 375 + - 410 + - 376 + - 383 + - 384 + - 388 + - 406 + - 407 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 409 + components: + - type: Transform + pos: 10.5,-11.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 411 + - 412 + - 413 + - 414 + - 415 + - 416 + - 417 + - 418 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 422 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 423 + - 424 + - 425 + - 426 + - 427 + - 428 + - 429 + - 430 + - 431 + - 432 + - 433 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 438 + components: + - type: Transform + pos: -6.5,-7.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 439 + - 440 + - 441 + - 447 + - 448 + - 449 + - 450 + - 451 + - 762 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + - uid: 778 + components: + - type: Transform + pos: -3.5,-9.5 + parent: 2 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 779 + - 780 + - 781 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: CratePirateChest entities: - uid: 235 @@ -2179,6 +2483,69 @@ entities: - type: Transform pos: -4.551009,-17.21894 parent: 2 + - uid: 439 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 440 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 441 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 447 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 448 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 449 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 450 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 451 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 762 + components: + - type: Transform + parent: 438 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: DrinkOatMilkCarton entities: - uid: 347 @@ -2970,6 +3337,15 @@ entities: - type: Transform pos: 0.5,-18.5 parent: 2 +- proto: HeadSkeleton + entities: + - uid: 423 + components: + - type: Transform + parent: 422 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: Lighter entities: - uid: 352 @@ -3013,6 +3389,13 @@ entities: - type: Transform pos: 6.8205123,-9.306477 parent: 2 + - uid: 779 + components: + - type: Transform + parent: 778 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: NitrogenCanister entities: - uid: 382 @@ -3023,18 +3406,8 @@ entities: parent: 2 - type: Physics bodyType: Static - - uid: 383 - components: - - type: Transform - pos: 8.5,-17.5 - parent: 2 - proto: OxygenCanister entities: - - uid: 316 - components: - - type: Transform - pos: -6.5,-6.5 - parent: 2 - uid: 318 components: - type: Transform @@ -3605,38 +3978,6 @@ entities: - type: Transform pos: -4.6984663,-15.60848 parent: 2 - - uid: 762 - components: - - type: Transform - pos: -3.5514107,-10.478022 - parent: 2 -- proto: SpawnPointPirates - entities: - - uid: 447 - components: - - type: Transform - pos: 5.5,-10.5 - parent: 2 - - uid: 448 - components: - - type: Transform - pos: -5.5,-15.5 - parent: 2 - - uid: 449 - components: - - type: Transform - pos: -4.5,-10.5 - parent: 2 - - uid: 450 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 2 - - uid: 451 - components: - - type: Transform - pos: -4.5,-3.5 - parent: 2 - proto: SpeedLoaderMagnum entities: - uid: 290 @@ -3665,6 +4006,11 @@ entities: parent: 2 - proto: StoolBar entities: + - uid: 323 + components: + - type: Transform + pos: 10.5,-9.5 + parent: 2 - uid: 359 components: - type: Transform @@ -3689,12 +4035,11 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-14.5 parent: 2 -- proto: StorageCanister - entities: - - uid: 384 + - uid: 373 components: - type: Transform - pos: 8.5,-16.5 + rot: 3.141592653589793 rad + pos: 10.5,-7.5 parent: 2 - proto: SubstationBasic entities: @@ -3949,25 +4294,6 @@ entities: - type: Transform pos: -6.5,-13.5 parent: 2 -- proto: VendingMachineTankDispenserEVA - entities: - - uid: 317 - components: - - type: Transform - pos: -6.5,-7.5 - parent: 2 - - uid: 388 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 2 -- proto: VendingMachineYouTool - entities: - - uid: 323 - components: - - type: Transform - pos: -3.5,-9.5 - parent: 2 - proto: WallPlastitanium entities: - uid: 60 @@ -4803,6 +5129,14 @@ entities: - type: Transform pos: 4.5,-11.5 parent: 2 +- proto: WeaponGrapplingGun + entities: + - uid: 782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.59737,-7.5000486 + parent: 2 - proto: WeaponLaserGun entities: - uid: 311 @@ -4863,13 +5197,6 @@ entities: - type: Transform pos: -1.3375802,-8.258998 parent: 2 -- proto: WelderMini - entities: - - uid: 321 - components: - - type: Transform - pos: -3.2837524,-10.66354 - parent: 2 - proto: WeldingFuelTankFull entities: - uid: 324