Skip to content

Commit

Permalink
Fixes from suggestions
Browse files Browse the repository at this point in the history
  • Loading branch information
Bokkiewokkie committed Jul 8, 2024
1 parent 31b0d76 commit 596aa78
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion nsv13/code/controllers/subsystem/starsystem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ Returns a faction datum by its name (case insensitive!)
if(!amount)
amount = difficulty_budget*2
if(!faction) //Someone forgot to set their IFF
faction = "unaligned"
faction = alignment
var/z_level = 1
if(occupying_z)
z_level = occupying_z
Expand Down
2 changes: 1 addition & 1 deletion nsv13/code/modules/overmap/ai-skynet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2095,7 +2095,7 @@ Seek a ship thich we'll station ourselves around
return
mine_cooldown = world.time + 6 SECONDS
mines_left--
new /obj/structure/space_mine(get_turf(src),faction,current_system,get_center_coordinates())
new /obj/structure/space_mine(get_center(),faction,current_system)

/client/proc/instance_overmap_menu() //Creates a verb for admins to open up the ui
set name = "Instance Overmap"
Expand Down
8 changes: 3 additions & 5 deletions nsv13/code/modules/overmap/weapons/mines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
var/damage_flag = "overmap_heavy"
alpha = 110 //They're supposed to be sneaky, their main advantage is being cloaked

/obj/structure/space_mine/Initialize(mapload, var/new_faction, var/datum/star_system/system, var/list/coordinates)
/obj/structure/space_mine/Initialize(mapload, var/new_faction, var/datum/star_system/system)
. = ..()
if(system)
current_system = system
Expand All @@ -26,9 +26,6 @@
if(new_faction)
faction = new_faction
update_icon()
if(coordinates)
x = coordinates["x"]
y = coordinates["y"]
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
Expand All @@ -37,6 +34,7 @@
/obj/structure/space_mine/Destroy(force)
current_system?.contents_positions.Remove(src)
current_system?.system_contents.Remove(src)
current_system = null
RemoveElement(/datum/element/connect_loc)
. = ..()

Expand Down Expand Up @@ -88,7 +86,7 @@
var/turf/T = pick(get_area_turfs(A))
new /obj/effect/temp_visual/explosion_telegraph(T, damage)
else
for(var/obj/structure/overmap/O in orange(2)) //You're in range! Keep in mind this affects *all* ships, explosions don't discriminate between friend and foe
for(var/obj/structure/overmap/O in orange(2, src)) //You're in range! Keep in mind this affects *all* ships, explosions don't discriminate between friend and foe
OM = O
if(OM.use_armour_quadrants)
OM.take_quadrant_hit(OM.run_obj_armor(damage, damage_type, damage_flag, null, armour_penetration), OM.quadrant_impact(src))
Expand Down

0 comments on commit 596aa78

Please sign in to comment.