From e7abbccbe50c9aa59beb3f38300ca7a224a0ae84 Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:14:35 +0000 Subject: [PATCH 01/18] Automatic changelog compile [ci skip] --- html/changelog.html | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index f061afc6bb9..8fc8a3ea29f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -191,24 +191,6 @@

tonty updated:

- -

03 May 2024

-

Bokkiewokkie updated:

- -

DeltaFire15 updated:

- GoonStation 13 Development Team From 6337c914aa6b10197cd192bc12be7d386e726c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 5 Jul 2024 15:15:36 -0600 Subject: [PATCH 02/18] Adds relayed laser projectiles (#2670) Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> --- .../modules/overmap/weapons/projectiles_fx.dm | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index 011f39e1d7c..11c8505baa9 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -563,12 +563,31 @@ Misc projectile types, effects, think of this as the special FX file. tracer_type = /obj/effect/projectile/tracer/disabler muzzle_type = /obj/effect/projectile/muzzle/disabler impact_type = /obj/effect/projectile/impact/disabler + relay_projectile_type = /obj/item/projectile/beam/laser/heavylaser/phaser/relayed + +/obj/item/projectile/beam/laser/heavylaser/phaser/relayed + projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + flag = "laser" + damage = 80 //let's give them a chance to live, instead of smiting them with the full wraith of the Enterprise + +/obj/item/projectile/beam/laser/heavylaser/phaser/relayed/on_hit(atom/target, blocked) + . = ..() + explosion(get_turf(target), 0, 2, 4, 6, flame_range = 4) //I halved the BSA's explosion, and then poked it some myself - big boom /obj/item/projectile/beam/laser/phaser/pd name = "point defense phaser" damage = 60 // Doesn't scale with power input, but fires fairly quickly especially when upgraded icon = 'nsv13/icons/obj/projectiles_nsv.dmi' - icon_state = "pdphaser" + icon_state = "pdphaser" + relay_projectile_type = /obj/item/projectile/beam/laser/phaser/pd/relayed + +/obj/item/projectile/beam/laser/phaser/pd/relayed + projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + flag = "laser" + +/obj/item/projectile/beam/laser/phaser/pd/relayed/on_hit(atom/target, blocked) + . = ..() + explosion(get_turf(target), 0, 0, 2, 3, flame_range = 2) //weak, but still damaging... I hope /obj/item/projectile/beam/laser/point_defense name = "laser pointer" @@ -581,11 +600,25 @@ Misc projectile types, effects, think of this as the special FX file. tracer_type = /obj/effect/projectile/tracer/xray muzzle_type = /obj/effect/projectile/muzzle/xray impact_type = /obj/effect/projectile/impact/xray + relay_projectile_type = /obj/item/projectile/beam/laser/point_defense/relayed + +/obj/item/projectile/beam/laser/point_defense/relayed + projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + flag = "laser" //Designed to be spammed like crazy, but can be buffed to do extremely solid damage when you overclock the guns. /obj/item/projectile/beam/laser/phaser damage = 30 flag = "overmap_medium" + relay_projectile_type = /obj/item/projectile/beam/laser/phaser/relayed + +/obj/item/projectile/beam/laser/phaser/relayed + projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + flag = "laser" + +/obj/item/projectile/beam/laser/phaser/relayed/on_hit(atom/target, blocked) + . = ..() + explosion(get_turf(target), 0, 0, 2, 3, flame_range = 2) //weak, but still damaging... I hope /obj/item/projectile/bullet/broadside name = "broadside shell" From e5ceeaff7d0e4d5e61b339e5487963ad798c301e Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 5 Jul 2024 16:16:16 -0500 Subject: [PATCH 03/18] Automatic changelog generation for PR #2670 [ci skip] --- html/changelogs/AutoChangeLog-pr-2670.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-2670.yml diff --git a/html/changelogs/AutoChangeLog-pr-2670.yml b/html/changelogs/AutoChangeLog-pr-2670.yml new file mode 100644 index 00000000000..9a7be68a707 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2670.yml @@ -0,0 +1,4 @@ +author: Pockets-byte +delete-after: true +changes: + - rscadd: Added relayed (overmap) laser projectiles for boom From ee6f6371a3843dd154919decd32d52c40af0465b Mon Sep 17 00:00:00 2001 From: ss13-beebot <56381746+ss13-beebot@users.noreply.github.com> Date: Fri, 5 Jul 2024 22:04:41 +0000 Subject: [PATCH 04/18] Automatic changelog compile [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-2670.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-2670.yml diff --git a/html/changelog.html b/html/changelog.html index 8fc8a3ea29f..3219ca71cae 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

05 July 2024

+

Pockets-byte updated:

+ +

28 June 2024

DeltaFire15 updated: