Some fixes

incorporating feedback
BeeStation · Jul 6, 2024 · e5f1248 · e5f1248
1 parent 007a0cf
commit e5f1248
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/nsv13/code/controllers/subsystem/starsystem.dm b/nsv13/code/controllers/subsystem/starsystem.dm
@@ -806,7 +806,7 @@ Returns a faction datum by its name (case insensitive!)
 	if(alignment == "syndicate")
 		spawn_enemies() //Syndicate systems are even more dangerous, and come pre-loaded with some Syndie ships.
 		if(prob(20)) //Watch your step!
-			spawn_mines()
+			spawn_mines("syndicate")
 	if(alignment == "unaligned")
 		if(prob(25))
 			spawn_enemies()
@@ -908,7 +908,7 @@ Returns a faction datum by its name (case insensitive!)
 	if(occupying_z)
 		z_level = occupying_z
 	for(var/i = 0, i < amount, i++)
-		var/obj/structure/space_mine/M = new /obj/structure/space_mine(get_turf(locate(rand(5, world.maxx - 5), rand(5, world.maxy - 5), z_level)), faction, src) //random location in the system
+		var/obj/structure/space_mine/M = new /obj/structure/space_mine(get_turf(locate(rand(5, world.maxx - 5), rand(5, world.maxy - 5), z_level)), new_faction = faction, system = src) //random location in the system
 		if(z_level == 1) //We didn't get one
 			contents_positions[M] = list("x" = M.x,"y" = M.y)
 			M.moveToNullspace()

diff --git a/nsv13/code/modules/overmap/weapons/mines.dm b/nsv13/code/modules/overmap/weapons/mines.dm
@@ -14,7 +14,7 @@
 	var/damage = 100
 	var/damage_type = BRUTE
 	var/damage_flag = "overmap_heavy"
-	alpha = 50 //They're supposed to be sneaky, their main advantage is being cloaked
+	alpha = 110 //They're supposed to be sneaky, their main advantage is being cloaked
 
 /obj/structure/space_mine/Initialize(mapload, var/list/coordinates, var/new_faction, var/datum/star_system/system)
 	. = ..()
@@ -53,17 +53,21 @@
 	switch(AM.type)
 		if(/obj/item/projectile)
 			var/obj/item/projectile/P = AM
-			if(P.faction != faction || !(P.faction == "nanotrasen" || P.faction == "solgov") && (faction == "nanotrasen" || faction == "solgov"))
+			if(P.faction != faction)
 				P.Impact(src)
 
 		if(/obj/structure/overmap)
 			var/obj/structure/overmap/OM = AM
-			if(OM.faction != faction || !(OM.faction == "nanotrasen" || OM.faction == "solgov") && (faction == "nanotrasen" || faction == "solgov"))
+			if(OM.faction != faction)
 				mine_explode(OM)
 
 /obj/structure/space_mine/update_icon(updates)
 	. = ..()
-	icon_state = "mine_[faction]"
+	if(faction)
+		icon_state = "mine_[faction]"
+	else
+		icon_state = "mine_unaligned"
+		faction = "unaligned"
 
 /obj/structure/space_mine/obj_break(damage_flag)
 	if(prob(80))
@@ -73,10 +77,10 @@
 
 /obj/structure/space_mine/obj_destruction(damage_flag)
 	mine_explode() //Why you mine explode? To the woods with you
-	..(damage_flag)
+	. = ..()
 
 /obj/structure/space_mine/proc/mine_explode(obj/structure/overmap/OM)
-	var/armour_penetration
+	var/armour_penetration = 0
 	if(OM) //You just flew into a mine
 		armour_penetration = 20 //It's blowing up right next to you, this is what it was designed for
 		if(OM.use_armour_quadrants)

diff --git a/nsv13/code/modules/projectiles/projectile.dm b/nsv13/code/modules/projectiles/projectile.dm
@@ -20,6 +20,6 @@ GLOBAL_LIST_INIT(projectile_hitbox, list(new /matrix/vector(-2,16),\
 	var/obj/structure/overmap/OM = A
 	if(!istype(OM))
 		return TRUE
-	if(faction != OM.faction || !(OM.faction == "nanotrasen" || OM.faction == "solgov") && !(faction == "nanotrasen" || faction == "solgov"))
+	if(faction != OM.faction)
 		return TRUE
 	return FALSE