From 55e6e3b3eb3ce62fdef78b63a82dac4d0d8d0dba Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:23:14 +0000 Subject: [PATCH 1/7] make meteors duds on glacier (#1872) * make meteors duds on glacier * remove unused explosive from copy paste --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../StationEvents/Events/MeteorSwarmRule.cs | 8 ++- .../Weapons/Guns/Projectiles/meteors.yml | 53 +++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/Content.Server/DeltaV/StationEvents/Events/MeteorSwarmRule.cs b/Content.Server/DeltaV/StationEvents/Events/MeteorSwarmRule.cs index da1575c7c09..52c4e0aade1 100644 --- a/Content.Server/DeltaV/StationEvents/Events/MeteorSwarmRule.cs +++ b/Content.Server/DeltaV/StationEvents/Events/MeteorSwarmRule.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Content.Server.Atmos.Components; using Content.Server.GameTicking.Rules.Components; using Content.Server.StationEvents.Components; using Content.Shared.GameTicking.Components; @@ -12,6 +13,7 @@ namespace Content.Server.StationEvents.Events { public sealed class MeteorSwarmRule : StationEventSystem { + [Dependency] private readonly SharedMapSystem _map = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; protected override void Started(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) @@ -40,6 +42,10 @@ protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent compo Box2? playableArea = null; var mapId = GameTicker.DefaultMap; + // use a dud meteor if there's an atmosphere to "simulate" burning up + var proto = "MeteorLargeDeltaV"; + if (_map.TryGetMap(mapId, out var mapUid) && TryComp(mapUid, out var atmos) && !atmos.Space) + proto = "MeteorGlacierDeltaV"; var query = AllEntityQuery(); while (query.MoveNext(out var gridId, out _, out var xform)) @@ -67,7 +73,7 @@ protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent compo var angle = new Angle(RobustRandom.NextFloat() * MathF.Tau); var offset = angle.RotateVec(new Vector2((maximumDistance - minimumDistance) * RobustRandom.NextFloat() + minimumDistance, 0)); var spawnPosition = new MapCoordinates(center + offset, mapId); - var meteor = Spawn("MeteorLargeDeltaV", spawnPosition); + var meteor = Spawn(proto, spawnPosition); var physics = EntityManager.GetComponent(meteor); _physics.SetBodyStatus(meteor, physics, BodyStatus.InAir); _physics.SetLinearDamping(meteor, physics, 0f); diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 240de32b178..5a95f1ed7d9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -38,3 +38,56 @@ mask: - Impassable - BulletImpassable + +# this gets spawned by the meteor swarm rule if the target map has an atmosphere +# since meteors dont make much sense +- type: entity + categories: [ HideSpawnMenu ] + id: MeteorGlacierDeltaV + name: meteor + description: This meteor is burning up like a in the atmosphere, like a... meteor. + components: + - type: Sprite + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/meteor.rsi + scale: 0.5,0.5 + layers: + - state: large + shader: unshaded + - type: PointLight + radius: 3 + energy: 5 + color: "#ff6622" + - type: AmbientSound + enabled: true + volume: 2 + range: 14 + sound: + path: /Audio/Items/Flare/flare_burn.ogg + params: + loop: true + - type: IgnitionSource + ignited: true + temperature: 500 + - type: DeleteOnTrigger + - type: TriggerOnCollide + fixtureID: projectile + - type: Projectile + damage: {} + deleteOnCollide: false + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeCircle + radius: 0.8 + density: 100 + hard: true + # Didn't use MapGridComponent for now as the bounds are stuffed. + layer: + - LargeMobLayer + mask: + - Impassable + - BulletImpassable From 6c570be4c3b8da5a6201b5430c920779089f77df Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 20 Sep 2024 15:23:33 +0200 Subject: [PATCH 2/7] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 3dd886a443a..a4a2208bd83 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,10 +1,4 @@ Entries: -- author: Vordenburg - changes: - - message: Enhanced intrusion defenses have been deployed in electrical systems. - type: Add - id: 64 - time: '2023-10-15T14:07:21.0000000+00:00' - author: leonardo-dabepis changes: - message: added mothamphetamine drink @@ -3606,3 +3600,10 @@ id: 563 time: '2024-09-20T03:38:10.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1866 +- author: deltanedas + changes: + - message: Glacier's atmosphere now protects it from meteor storms. + type: Tweak + id: 564 + time: '2024-09-20T13:23:14.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1872 From bc82caf38eabb457d433a7788311051782793112 Mon Sep 17 00:00:00 2001 From: Venn Date: Fri, 20 Sep 2024 09:32:25 -0400 Subject: [PATCH 3/7] Dual Boot Batches (#1633) * Dual Boot Batches Adds two batch files to automatically run runserver.bat and runclient.bat . Also includes tool versions. * Delete RunBoth-Tools.bat Removes Tools batch at Danger's advice . * Revert Tools Batch Removal Re-adds Tools batch after discussion in Contribution-Help on the discord. * Debug Dual boot Adds launch batchs for Debug , as well as a dual boot batch for it . --- RunBoth-Debug.bat | 3 +++ RunBoth-Tools.bat | 3 +++ RunBoth.bat | 3 +++ runclient-Debug.bat | 2 ++ runserver-Debug.bat | 3 +++ 5 files changed, 14 insertions(+) create mode 100644 RunBoth-Debug.bat create mode 100644 RunBoth-Tools.bat create mode 100644 RunBoth.bat create mode 100644 runclient-Debug.bat create mode 100644 runserver-Debug.bat diff --git a/RunBoth-Debug.bat b/RunBoth-Debug.bat new file mode 100644 index 00000000000..a63a8861acb --- /dev/null +++ b/RunBoth-Debug.bat @@ -0,0 +1,3 @@ +@echo off +start "DeltaVServer-Debug" cmd /k "runserver-Debug.bat" +start "DeltaVClient-Debug" cmd /k "runclient-Debug.bat" diff --git a/RunBoth-Tools.bat b/RunBoth-Tools.bat new file mode 100644 index 00000000000..8c78835a764 --- /dev/null +++ b/RunBoth-Tools.bat @@ -0,0 +1,3 @@ +@echo off +start "DeltaVServer-Tools" cmd /k "runserver-Tools.bat" +start "DeltaVClient-Tools" cmd /k "runclient-Tools.bat" diff --git a/RunBoth.bat b/RunBoth.bat new file mode 100644 index 00000000000..b7fc3547974 --- /dev/null +++ b/RunBoth.bat @@ -0,0 +1,3 @@ +@echo off +start "DeltaVServer" cmd /k "runserver.bat" +start "DeltaVClient" cmd /k "runclient.bat" diff --git a/runclient-Debug.bat b/runclient-Debug.bat new file mode 100644 index 00000000000..7c7e30a3f6d --- /dev/null +++ b/runclient-Debug.bat @@ -0,0 +1,2 @@ +@echo off +dotnet run --project Content.Client --configuration Debug diff --git a/runserver-Debug.bat b/runserver-Debug.bat new file mode 100644 index 00000000000..af6ab2ebd85 --- /dev/null +++ b/runserver-Debug.bat @@ -0,0 +1,3 @@ +@echo off +dotnet run --project Content.Server --configuration Debug +pause From c8cc1802be13dfe195b10b2745fd8afb637ff7c4 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Fri, 20 Sep 2024 23:43:09 +1000 Subject: [PATCH 4/7] Adds the SLP-67 "Volk" (#1793) * Adds the SLP-67 "Volk" Legally distinct VP :blunt: * Increase size of Volk to normal --------- Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- .../Objects/Weapons/Guns/Pistols/pistols.yml | 32 ++++++++++++++ .../Weapons/Guns/Pistols/slp67.rsi/base.png | Bin 0 -> 1063 bytes .../Guns/Pistols/slp67.rsi/bolt-open.png | Bin 0 -> 1073 bytes .../Guns/Pistols/slp67.rsi/equipped-BELT.png | Bin 0 -> 724 bytes .../slp67.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 929 bytes .../Weapons/Guns/Pistols/slp67.rsi/icon.png | Bin 0 -> 1081 bytes .../Guns/Pistols/slp67.rsi/inhand-left.png | Bin 0 -> 873 bytes .../Guns/Pistols/slp67.rsi/inhand-right.png | Bin 0 -> 876 bytes .../Weapons/Guns/Pistols/slp67.rsi/mag-0.png | Bin 0 -> 561 bytes .../Weapons/Guns/Pistols/slp67.rsi/meta.json | 39 ++++++++++++++++++ 10 files changed, 71 insertions(+) create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/base.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/bolt-open.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/equipped-BELT.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/mag-0.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/meta.json diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index e9e26a3e329..0a3260d2829 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -133,6 +133,38 @@ - type: UseDelay delay: 0 #Straight up doesn't work for guns +- type: entity + name: SLP-67 "Volk" + parent: BaseWeaponPistol + id: WeaponPistolSLP67 + description: The SLP-67, featuring a fullsize polymer frame and extended slide, improves upon its predecessor in ergonomics, accuracy, and capacity. Uses .35 auto ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi + - type: Item + size: Normal + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolHighCapacity + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolHighCapacity + whitelistFailPopup: gun-magazine-whitelist-fail + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: entity name: SLP-57 parent: BaseWeaponPistol diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..9c93bb852eb35e37d3673f3b7b80860a8af35ef6 GIT binary patch literal 1063 zcmV+?1laqDP)r!Z3SBeK~Mw{OKV?^g!PUIBuJcP_I{k1bD22_ca||skE&_OS|xdZdyg*DdF&X(Nw%G+^gpj zDd8jGfF%bMzE*m&$}ftuRsK+H#Uj(-Qa!b711B3;&shcG5n+EJU(##mQ8)3XjfJSx z0hxo?M3^OnMv@Y%i#v!Y4TI_ox0{f1m7l{U)8nb z9$aie|D&0(62FpLrYnOiTw6cnMqKtvFCU6gKJiho8375rHEu@Nn8Lpyd;OY>1|u_kpB-+AOd z<|Q-j1lfVV$s` zfY&$Ht@QBFFc`bxO@nI2>^ zd*XNw&b+(UYJkafy3o$&bGUT*BC4A;ga5I;jjculwOYf(h!YFO_ahX%cxwar!Z3SBeK~Mw{OKV?^g!PUIBuJcP_I{k1bD22_ca||skE&_OS|xdZdyg*DdF&X(Nw%G+^gpj zDd8jGfF%bMzE*m&$}ftuRsK+H#Uj(-Qa!b711B3;&shcG5n+EJU(##mQ8)3XjfJSx z0hxo?M3^OnMv@Y%i#v!Y4TI_ox0{f1m7l{U)8nb z9$aie|D&0(62FpLrYnP13u!b>q;ylK zCF(*dDt^+1HXF6ef+F-6hzR1Yi_)!2@vpdQK@b;G-2^LbLpm0rt@$dZG)=I=IOmc3 zc$taG1l^1Cl?&4>oiC3>*qOw=V!omx!51SSqJ${Jk zY!u$3gHFu)!g(^~BG(QXQp^NZkxnEr0$^jp1_jq~G7dx^}RIG#Cs z5p(8Z6CG$xJf3z_sU&XPypB?_EI9nA)v#BsqFk?CSO(i_eqzfRg00000NkvXXu0mjfngabf literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb512f684b0ab1ecf0cb6cc5198ad70ec4b649d GIT binary patch literal 724 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzEOs zhkC~6e4+o>{67(qwLDPYE~dT6Dt?v4y;+VCSHqZ>Y@eD_R?XSu@afOuuQ_M7uUgAi za6KqS!`1;X*^O=(GQ_I%A%xd`cWB;V~m+!W(OZf8OZ-nnp zeS=-{!VV0KECM)*7XlKmOuhb^-7xf@yy5=j1+oc~80!2F=`jA8*AmIZb91u6No@yz lCR@&1v;FO$?*GHGPf*k8VV}gRCSYJOc)I$ztaD0e0ssPjGL!%S literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..d3d2e5798bd49f669bb128a760d485058252d0ec GIT binary patch literal 929 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzEAz=P5uvzIbwft#C;Q+uE*jked~s=Vbmj~9rDF& z!C4D0s08=?V)vSqW|aOcS#5T4M}Y$alRyIlivj~92Z;HjovG8H_*`20Pt%E>=__hJ zd2K0^UNzrfW9WWkfh~tykA`mCVx#_J@7cGqS~C4?ZSEi< z5UZts4>KE;^{aTSNxSwqfl2pnijnH4$--aWSzO7nGHO}2^rXSJ7q1@uxt`xX?~KI4 zy^8m%@3S0Syu6(-l;QFYRYi~l1b54=V?_Kn`DfnsfV@;!TW>)i7?0tHx<QKV{$YPr{Nf qetN#%&pX>K>TKqq`QlGxqkp;L1n23E@63TQ&*16m=d#Wzp$P!&w~!nF literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d849d2f65ea7bf969cab313a652e6078aeb6dce8 GIT binary patch literal 1081 zcmV-91jhS`P)r!Z3SBeK~Mw{OKV?^g!PUIBuJcP_I{k1bD22_ca||skE&_OS|xdZdyg*DdF&X(Nw%G+^gpj zDd8jGfF%bMzE*m&$}ftuRsK+H#Uj(-Qa!b711B3;&shcG5n+EJU(##mQ8)3XjfJSx z0hxo?M3^OnMv@Y%i#v!Y4TI_ox0{f1m7l{U)8nb z9$aie|D&0(62FpLrYnkW6xB=AJV%_X3F}6G$eIOrXmIY`fIPn~UnBes{@>1$*aQow(JG%C(|E zN#5Ap@P!8l20`qGGwH)$mFFNa(|=x=N9o+Cs;SpE(ceD+`rX~C<~`~=$@@d{hmRk5 z$py^JJV830SN{BkF-%Y2#rwA(aR0$QOifNo7~?>!S7*(}i|EpTm{$%cySEbnf?^9c(umsMQ)8W1g6aM|CQBLGN1ugPr1brLu}* zaYTtYo=PFxsU*?qGesq4ZEeZd0L2Tr_nT)0`9lAXgb)wlAuG!j6(V`7*@Wx5ij?4| zkMFF$Tn@v-XZ71Axfjxc;*j&K&;$tbFm@?Ma@)4SHE;rqi@**sQ!SI!!(&Y#QUG_G z&18gMky8Z8IUOD7@xv6;BMqSyup@R`IGOjze&||`+`M$`@LyO+fJs6E?qAHj>4N>O z_X*&oit1jTVBGN^MwCxLutRn)p00000NkvXXu0mjf2SNs3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1072555df60cb4c31dfee3ccf1d7cf863612d8d2 GIT binary patch literal 873 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzE^Uk@i(?`te-iksyoy1mz00j|^P`IwJfE8HtniSX4swHtf5f)TDNL*UVZ& zuKNeXcIT(vtDb*1XLIr~enu7n2L@C^q0eFMw#0`XQr7OBwmE9Tp}ZeY1^;uY?0Zn@ z?zeDC*>B5UYa6?b$BqUqoZ~p*(bVty^N=E(=Xq8_}9Q}z1g~hYc{Ub=~%>}(7?cio0uY8@Rhk@SIFY-tK=S#pCWbkzLb6Mw<&;$V25{V)J literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0a182ae41abccc4b83f42804e06daf14e032c770 GIT binary patch literal 876 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV9d*Ob`Ho)PG(@xm{>Z|+MC%? zq;LNm<*m+>6%~1Pig&&^ap$r~ z9GQMiCfmw#;-mW?E8G3A-k$O5>;HYb7UxEmn|v_k?$4O^maCuBf9=j`k8~gU>CTT6 zvlHpNRpjtcdujTrKWi+)pOzmj(=z0%yJ|e=_tBa0Yo5MsD%fAJBtc~B{Ld?9vy>K_ zX>N^9l9XVo+!!_lN988a?QT{1&?MYhT6>fqw96!(TR!T`5{*pm0Vq#=6e09 zvBt_f|DU}~X>VV3x4DqRrt)62zR6pM%G;m!_1Ubi;o*tK()YX>#^)SGdyUw*-kU)KD>u86a*(&tXD_E>vbIQH;8yDumI zUASa^fi?Y$z-+F~zzEOFRP*?S zw|TAi@9}yawIlnK^Uo*$V(xEg{@uR(!%KM?x#LA=pOxJ?C%dMp@nq>M-2l5&+SQhm zukX9OlY8>|tJjvRshr>39D03r%<^-s3-%b*^SzofiETOSNW$CxW#npY!r%kAo<_Iyf^ znwZnxeVOXZ)4%=wnwkH;f9a8{|4&~#w{CCA{PeJG@!nk`me=c=J|Vg{sBa46oknj@v!8*x*R;yl8brLWV89ZJ6T-G@yGywqL(2qg@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/mag-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..4fcdb884c71ef2f35ff6c31289104489b73c356d GIT binary patch literal 561 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFy>`CI|pPYCo?c;Oe~#f?ak~c z(z;)ztKTIkLosQh(@`bIKmqU01-@H41bc3!n9p{(vF3DM6HD~LV@?|ca%)8YG3T;I zvpNQ_2zqD7_qKfP6I5EX`OLk3<6=GI^aJw^zAn0Lz~Q?3iHiE;i95g4EP2@})?{Mj zV6k}jw<~8{y6TVr=Cuo5pSOr=c+{N7GDmH3!A~bJynYUPfaZ=OX zqc2nXq~Vab*Y&JFD=gw4hadIRvgE6~YCP%x!CU;-xcvfm#P3+1G41R7&nsrP@MM>{ zWlcYm7clz<_8}Xbf4E$v3Sw6rK=T9)pse* z_jG;w&)VPI+$Q9;T$l6X=I49AI9(PCF}HpH_`v5??E*X6jaR>mpEk$szRUeJ*|yaJ zam|xI?^>37_@!0Jy_=HipH*2?eid6**tKml*%I&g+DUiy`_jHV#jRTYC7jl~FR1@M z+&%y0+YE*Y8AVyZ2;eO6h%9Dc;1&j9Muu5)B!GgMo-U3d5uC{h60D0A4WyW`5z4kK z5{0Y{D`%dqXRNE+@TI+9UNZ0Aj-wx5Ue=!Ts&J;Whs^56Q>SMAkKbR{y>7bT3x*vM q^7AE5I2QcVNH$?{b8fgJz`)RQS%g`=XSV^+QU*^~KbLh*2~7Zp&g>BY literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/meta.json new file mode 100644 index 00000000000..40251545d35 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/slp67.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} From fe30e870889ae49bc7453fa43eb840a641990704 Mon Sep 17 00:00:00 2001 From: Solaris <63768197+Solaris7518@users.noreply.github.com> Date: Fri, 20 Sep 2024 09:02:21 -0500 Subject: [PATCH 5/7] Update animals.yml (#1867) * Update animals.yml Signed-off-by: Solaris <63768197+Solaris7518@users.noreply.github.com> * Update animals.yml Signed-off-by: Solaris <63768197+Solaris7518@users.noreply.github.com> * Update animals.yml Signed-off-by: Solaris <63768197+Solaris7518@users.noreply.github.com> --------- Signed-off-by: Solaris <63768197+Solaris7518@users.noreply.github.com> --- .../Entities/Markers/Spawners/Random/animals.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml index 0a84109a98c..900285e1a0e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml @@ -35,10 +35,10 @@ - MobBoxingKangaroo - MobGoose - MobSnake - - MobGiantSpider - - MobGiantSpiderAngry + # - MobGiantSpider # Delta-V Change + # - MobGiantSpiderAngry # Delta-V Change - MobCorgi - - MobCorgiNarsi + #- MobCorgiNarsi # Delta-V change, disables the "corrupted corgi" (literally just a hostile cerberus with no master) from spawning naturally - MobCorgiPuppy - MobCrab - MobCatSpace From 6510f4dc1a8fa3b04853e0944fde6259bd4dbdb1 Mon Sep 17 00:00:00 2001 From: Delta-V bot <135767721+DeltaV-Bot@users.noreply.github.com> Date: Fri, 20 Sep 2024 16:02:40 +0200 Subject: [PATCH 6/7] Automatic changelog update --- Resources/Changelog/DeltaVChangelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index a4a2208bd83..477aee51193 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,12 +1,4 @@ Entries: -- author: leonardo-dabepis - changes: - - message: added mothamphetamine drink - type: Add - - message: changed "dulleavene" to "health violation" - type: Tweak - id: 65 - time: '2023-10-16T23:25:27.0000000+00:00' - author: DebugOk changes: - message: Moth coloration has been changed, existing characters might look slightly @@ -3607,3 +3599,11 @@ id: 564 time: '2024-09-20T13:23:14.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1872 +- author: Solaris7518 + changes: + - message: The corrupted corgi will no longer terrorize the crew the moment the + round starts. + type: Remove + id: 565 + time: '2024-09-20T14:02:21.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1867 From a3727d2f47e29a7d55b74960884ec603bb3d43d1 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 20 Sep 2024 14:17:06 +0000 Subject: [PATCH 7/7] add mediborg to silicons department (#1850) * add mediborg to silicons department * make silicon nonprimary dept Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * add station ai to command dept Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> * add comments Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --------- Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- .../Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml | 1 - Resources/Prototypes/Roles/Jobs/departments.yml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml index e2047d3c200..6582de79d08 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml @@ -1,4 +1,3 @@ - - type: job id: MedicalBorg name: job-name-medical-borg diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index c11c7e69a4f..64d811004c5 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -78,6 +78,7 @@ - ERTSecurity - ERTEngineer - DeathSquad + - StationAi # DeltaV - added for playtime trackers primary: false weight: 100 @@ -141,7 +142,9 @@ color: "#D381C9" roles: - Borg + - MedicalBorg # DeltaV - roundstart mediborg job - StationAi + primary: false # DeltaV - removed from primary dept - type: department id: Specific