Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds consequences to some (funny) actions #2719

Merged
merged 4 commits into from
Dec 27, 2024
Merged

Adds consequences to some (funny) actions #2719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74a456a
Gun ship fire gone
Bokkiewokkie Nov 22, 2024
a4a6377
Small fix
Bokkiewokkie Nov 28, 2024
23593f5
Another minor thing
Bokkiewokkie Nov 28, 2024
018a5b2
Bwa
Bokkiewokkie Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion nsv13/code/controllers/subsystem/starsystem.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 22 additions & 3 deletions nsv13/code/modules/munitions/ship_weapons/energy_weapons/bsa.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,28 @@
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 = linked.pilot //Fired by the pilot
if(!firer)
firer = src
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)]!"
new /obj/anomaly/singularity(location, 2500)
var/turf/overmaplocation = get_turf(linked)
if(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)
else
. = ..() //Then actually fire it.
Expand Down
Loading