From 2be5593ce44493e135acae1890a13d66b83420cd 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, 31 May 2024 23:01:39 -0600 Subject: [PATCH 1/6] laser go boom it's- it's not buffing out --- .../modules/overmap/weapons/projectiles_fx.dm | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index 011f39e1d7c..d87cbbf73d7 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -563,12 +563,30 @@ 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 + +/obj/item/projectile/beam/laser/heavylaser/phaser/relayed/on_hit(atom/target, blocked) + . = ..() + explosion(get_turf(target), 0, 2, 4, 6, ignorecap = FALSE, 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" + flag = "overmap_medium" //won't just ignore armor anymore... + armour_penetration = 50 //half as strong as it used to be, but still powerful + relay_projectile_type = /obj/item/projectile/beam/laser/phaser/pd/relayed + +/obj/item/projectile/beam/laser/phaser/pd/relayed + projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + +/obj/item/projectile/beam/laser/phaser/pd/relayed/on_hit(atom/target, blocked) + . = ..() + explosion(get_turf(target), 0, 0, 2, 3, ignorecap = FALSE, flame_range = 2) //weak, but still damaging... I hope /obj/item/projectile/beam/laser/point_defense name = "laser pointer" @@ -586,6 +604,14 @@ Misc projectile types, effects, think of this as the special FX file. /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 + +/obj/item/projectile/beam/laser/phaser/relayed/on_hit(atom/target, blocked) + . = ..() + explosion(get_turf(target), 0, 0, 2, 3, ignorecap = FALSE, flame_range = 2) //weak, but still damaging... I hope /obj/item/projectile/bullet/broadside name = "broadside shell" From 4722ceeaef61760ed7a6e8d500378e7513b724d9 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: Sat, 1 Jun 2024 00:02:27 -0600 Subject: [PATCH 2/6] makes the phase cannon deal a lot less damage directly on the shipmap --- nsv13/code/modules/overmap/weapons/projectiles_fx.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index d87cbbf73d7..fa611012e64 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -567,6 +567,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/heavylaser/phaser/relayed projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + damage = 40 //yes, the explosion will probably gib them. but if it doesn't, 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) . = ..() From 168bdd6c9e42dd49a8d60d16455721ab73b068c5 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: Sat, 1 Jun 2024 17:43:48 -0600 Subject: [PATCH 3/6] fixes unneeded fixes --- nsv13/code/modules/overmap/weapons/projectiles_fx.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index fa611012e64..388bc361ffc 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -567,7 +567,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/heavylaser/phaser/relayed projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE - damage = 40 //yes, the explosion will probably gib them. but if it doesn't, let's give them a chance to live, instead of smiting them with the full wraith of the Enterprise + damage = 40 //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) . = ..() @@ -577,9 +577,7 @@ Misc projectile types, effects, think of this as the special FX file. 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" - flag = "overmap_medium" //won't just ignore armor anymore... - armour_penetration = 50 //half as strong as it used to be, but still powerful + icon_state = "pdphaser" relay_projectile_type = /obj/item/projectile/beam/laser/phaser/pd/relayed /obj/item/projectile/beam/laser/phaser/pd/relayed From 36ba640428b13e6abb2678a936038ec308a74335 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: Sat, 1 Jun 2024 17:45:28 -0600 Subject: [PATCH 4/6] stops setting false when it's inherited --- nsv13/code/modules/overmap/weapons/projectiles_fx.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index 388bc361ffc..b7ad6a86862 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -571,7 +571,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/heavylaser/phaser/relayed/on_hit(atom/target, blocked) . = ..() - explosion(get_turf(target), 0, 2, 4, 6, ignorecap = FALSE, flame_range = 4) //I halved the BSA's explosion, and then poked it some myself - big boom + 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" @@ -585,7 +585,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/phaser/pd/relayed/on_hit(atom/target, blocked) . = ..() - explosion(get_turf(target), 0, 0, 2, 3, ignorecap = FALSE, flame_range = 2) //weak, but still damaging... I hope + 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" @@ -610,7 +610,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/phaser/relayed/on_hit(atom/target, blocked) . = ..() - explosion(get_turf(target), 0, 0, 2, 3, ignorecap = FALSE, flame_range = 2) //weak, but still damaging... I hope + 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 2f13b83fd779359524e7341f284d525a6482d3da 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: Sat, 1 Jun 2024 20:57:18 -0600 Subject: [PATCH 5/6] no more overmap damagetypes on the shipmap --- nsv13/code/modules/overmap/weapons/projectiles_fx.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index b7ad6a86862..d4e7ea3506b 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -567,6 +567,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/heavylaser/phaser/relayed projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE + flag = "laser" damage = 40 //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) @@ -582,6 +583,7 @@ Misc projectile types, effects, think of this as the special FX file. /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) . = ..() @@ -598,6 +600,11 @@ 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 @@ -607,6 +614,7 @@ Misc projectile types, effects, think of this as the special FX file. /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) . = ..() From 4e849932ce75c30c63a17dbd4077b58502b4680b 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: Wed, 5 Jun 2024 11:00:27 -0600 Subject: [PATCH 6/6] more ::fun:: from the phase cannon Co-authored-by: Bokkiewokkie <43698041+Bokkiewokkie@users.noreply.github.com> --- nsv13/code/modules/overmap/weapons/projectiles_fx.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm index d4e7ea3506b..11c8505baa9 100644 --- a/nsv13/code/modules/overmap/weapons/projectiles_fx.dm +++ b/nsv13/code/modules/overmap/weapons/projectiles_fx.dm @@ -568,7 +568,7 @@ Misc projectile types, effects, think of this as the special FX file. /obj/item/projectile/beam/laser/heavylaser/phaser/relayed projectile_piercing = PASSGLASS|PASSGRILLE|PASSTABLE flag = "laser" - damage = 40 //let's give them a chance to live, instead of smiting them with the full wraith of the Enterprise + 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) . = ..()