From 74a456af3d1822d093f8d6c7189b737d4c1c8774 Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Fri, 22 Nov 2024 18:44:56 +0100 Subject: [PATCH 1/4] Gun ship fire gone --- .../ship_weapons/energy_weapons/bsa.dm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm index c6f5ccb71b7..a7bd54a02ba 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm @@ -186,8 +186,25 @@ new /obj/effect/temp_visual/bsa_splash(point, dir) //Recharging... get_overmap()?.relay_to_nearby(weapon_type.overmap_select_sound) - if(blocker) + var/turf/location = get_turf(blocker) + var/admin_message = "The ship BSA has hit [blocker] at [ADMIN_VERBOSEJMP(location)]!" + var/log_message = "The ship BSA has hit [blocker] at [AREACOORD(location)]!" + var/firer = get_overmap().gunner + if(!firer) + firer = src + admin_message += " BSA fired by [firer]!" + if(istype(blocker, /obj/machinery/the_singularitygen)) //What did you do + var/evilperson = get_mob_by_ckey(blocker.fingerprintslast) + GLOB.bombers += evilperson + admin_message += " [blocker] was last touched by [evilperson]!" + log_message += " [blocker] was last touched by [evilperson]!" + var/obj/anomaly/singularity = new /obj/anomaly/singularity(location, 2500) + var/turf/overmaplocation = get_overmap()?.get_turf() + if(overmaplocation) + new /obj/effect/overmap_anomaly/singularity(overmaplocation) + message_admins(admin_message) + log_game(log_message) explosion(blocker, GLOB.MAX_EX_DEVESTATION_RANGE, GLOB.MAX_EX_HEAVY_RANGE, GLOB.MAX_EX_LIGHT_RANGE, GLOB.MAX_EX_FLASH_RANGE) else . = ..() //Then actually fire it. From a4a6377522d242cd6d6e0fa98e90fd74cd09a4f6 Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Thu, 28 Nov 2024 16:35:58 +0100 Subject: [PATCH 2/4] Small fix --- .../modules/munitions/ship_weapons/energy_weapons/bsa.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm index a7bd54a02ba..6c313d6bbb3 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm @@ -190,17 +190,17 @@ var/turf/location = get_turf(blocker) var/admin_message = "The ship BSA has hit [blocker] at [ADMIN_VERBOSEJMP(location)]!" var/log_message = "The ship BSA has hit [blocker] at [AREACOORD(location)]!" - var/firer = get_overmap().gunner + var/firer = get_overmap().pilot if(!firer) firer = src admin_message += " BSA fired by [firer]!" if(istype(blocker, /obj/machinery/the_singularitygen)) //What did you do var/evilperson = get_mob_by_ckey(blocker.fingerprintslast) GLOB.bombers += evilperson - admin_message += " [blocker] was last touched by [evilperson]!" - log_message += " [blocker] was last touched by [evilperson]!" + admin_message += " [blocker] was last touched by [ADMIN_LOOKUPFLW(evilperson)]!" + log_message += " [blocker] was last touched by [key_name_admin(evilperson)]!" var/obj/anomaly/singularity = new /obj/anomaly/singularity(location, 2500) - var/turf/overmaplocation = get_overmap()?.get_turf() + var/turf/overmaplocation = get_turf(get_overmap()) if(overmaplocation) new /obj/effect/overmap_anomaly/singularity(overmaplocation) message_admins(admin_message) From 23593f5954b9303fb4aa722b8f0c1c40248b899a Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Thu, 28 Nov 2024 16:56:37 +0100 Subject: [PATCH 3/4] Another minor thing --- .../modules/munitions/ship_weapons/energy_weapons/bsa.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm index 6c313d6bbb3..45a8bdacae4 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm @@ -193,13 +193,15 @@ var/firer = get_overmap().pilot if(!firer) firer = src - admin_message += " BSA fired by [firer]!" + admin_message += " BSA fired by [firer]!" + else + admin_message += " BSA fired by [ADMIN_LOOKUPFLW(firer)]!" if(istype(blocker, /obj/machinery/the_singularitygen)) //What did you do var/evilperson = get_mob_by_ckey(blocker.fingerprintslast) GLOB.bombers += evilperson admin_message += " [blocker] was last touched by [ADMIN_LOOKUPFLW(evilperson)]!" log_message += " [blocker] was last touched by [key_name_admin(evilperson)]!" - var/obj/anomaly/singularity = new /obj/anomaly/singularity(location, 2500) + new /obj/anomaly/singularity(location, 2500) var/turf/overmaplocation = get_turf(get_overmap()) if(overmaplocation) new /obj/effect/overmap_anomaly/singularity(overmaplocation) From 018a5b2f5d86adbb9c52583a505a8ed2148515a5 Mon Sep 17 00:00:00 2001 From: Bokkiewokkie Date: Fri, 6 Dec 2024 18:43:01 +0100 Subject: [PATCH 4/4] Bwa --- nsv13/code/controllers/subsystem/starsystem.dm | 4 +++- .../munitions/ship_weapons/energy_weapons/bsa.dm | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nsv13/code/controllers/subsystem/starsystem.dm b/nsv13/code/controllers/subsystem/starsystem.dm index 51445fd48e5..5752db417d9 100644 --- a/nsv13/code/controllers/subsystem/starsystem.dm +++ b/nsv13/code/controllers/subsystem/starsystem.dm @@ -594,13 +594,15 @@ Returns a faction datum by its name (case insensitive!) var/scanned = FALSE var/specialist_research_type = null //Special techweb node unlocking. -/obj/effect/overmap_anomaly/Initialize(mapload) +/obj/effect/overmap_anomaly/Initialize(mapload, system) . = ..() var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) GLOB.overmap_anomalies += src + if(system) + current_system = system /obj/effect/overmap_anomaly/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER diff --git a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm index 45a8bdacae4..e8fbb487bd7 100644 --- a/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm +++ b/nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm @@ -185,12 +185,12 @@ point.Beam(turf_target, icon_state = "bsa_beam", time = 50, maxdistance = world.maxx) //ZZZAP new /obj/effect/temp_visual/bsa_splash(point, dir) //Recharging... - get_overmap()?.relay_to_nearby(weapon_type.overmap_select_sound) - if(blocker) + linked.relay_to_nearby(weapon_type.overmap_select_sound) + if(blocker) //We hit something on the ship var/turf/location = get_turf(blocker) var/admin_message = "The ship BSA has hit [blocker] at [ADMIN_VERBOSEJMP(location)]!" var/log_message = "The ship BSA has hit [blocker] at [AREACOORD(location)]!" - var/firer = get_overmap().pilot + var/firer = linked.pilot //Fired by the pilot if(!firer) firer = src admin_message += " BSA fired by [firer]!" @@ -202,9 +202,9 @@ admin_message += " [blocker] was last touched by [ADMIN_LOOKUPFLW(evilperson)]!" log_message += " [blocker] was last touched by [key_name_admin(evilperson)]!" new /obj/anomaly/singularity(location, 2500) - var/turf/overmaplocation = get_turf(get_overmap()) + var/turf/overmaplocation = get_turf(linked) if(overmaplocation) - new /obj/effect/overmap_anomaly/singularity(overmaplocation) + new /obj/effect/overmap_anomaly/singularity(overmaplocation, linked.current_system) message_admins(admin_message) log_game(log_message) explosion(blocker, GLOB.MAX_EX_DEVESTATION_RANGE, GLOB.MAX_EX_HEAVY_RANGE, GLOB.MAX_EX_LIGHT_RANGE, GLOB.MAX_EX_FLASH_RANGE)