mine slowdown nerf + fireshrap buff + ruin mines

shiptest-ss13 · Feb 28, 2024 · 87ad48d · 87ad48d
1 parent 8f6afe5
commit 87ad48d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm b/_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm
@@ -409,7 +409,7 @@
 /turf/open/floor/plasteel,
 /area/ruin/unpowered)
 "Fk" = (
-/obj/item/mine/explosive/shrapnel,
+/obj/item/mine/explosive/shrapnel/live,
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "FH" = (

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
@@ -511,7 +511,7 @@
 /turf/open/floor/plasteel/tech,
 /area/ruin/powered)
 "ix" = (
-/obj/item/mine/explosive/shrapnel/carbon_only,
+/obj/item/mine/explosive/shrapnel/live,
 /turf/open/floor/plating/asteroid/rockplanet/lit,
 /area/overmap_encounter/planetoid/rockplanet/explored)
 "iE" = (

diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -264,15 +264,15 @@
 /turf/open/floor/plating,
 /area/ruin/space/has_grav/hellfactory)
 "aT" = (
-/obj/item/mine/gas/water_vapor,
+/obj/item/mine/gas/water_vapor/live,
 /obj/machinery/door/window,
 /turf/open/floor/plastic,
 /area/ruin/space/has_grav/hellfactory)
 "aU" = (
 /turf/open/floor/plastic,
 /area/ruin/space/has_grav/hellfactory)
 "aV" = (
-/obj/item/mine/gas/water_vapor,
+/obj/item/mine/gas/water_vapor/live,
 /turf/open/floor/plastic,
 /area/ruin/space/has_grav/hellfactory)
 "aW" = (

diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -323,7 +323,7 @@
 /turf/closed/wall/r_wall,
 /area/ruin/space/has_grav/syndicircle/winter)
 "iR" = (
-/obj/item/mine/explosive/shrapnel,
+/obj/item/mine/explosive/shrapnel/live,
 /obj/item/stack/tile/mineral/snow,
 /obj/machinery/light/dim/directional/west,
 /obj/effect/decal/cleanable/dirt/dust,
@@ -648,7 +648,7 @@
 /turf/open/floor/plating/airless,
 /area/ruin/space/has_grav/syndicircle/winter)
 "tf" = (
-/obj/item/mine/explosive/shrapnel,
+/obj/item/mine/explosive/shrapnel/live,
 /obj/item/stack/tile/mineral/snow,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/asteroid/snow/atmosphere,

diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_abandoned_mechbay.dmm
@@ -3425,7 +3425,7 @@
 /turf/open/floor/plasteel/tech/techmaint,
 /area/ruin/wasteplanet/abandoned_mechbay/bay1)
 "Og" = (
-/obj/item/mine/explosive/shrapnel/carbon_only,
+/obj/item/mine/explosive/shrapnel/live,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "Oj" = (

diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm
@@ -129,7 +129,7 @@
 		var/obj/item/mine/explosive/triggered_mine = parent
 		if(triggered_mine.shred_triggerer && istype(punishable_triggerer)) // free shrapnel for the idiot who stepped on it if we're a mine that shreds the triggerer
 			pellet_delta += radius // so they don't count against the later total
-			if(punishable_triggerer.loc == triggered_mine.loc)
+			if(punishable_triggerer.loc == triggered_mine.loc)//only trigger this if they're actually on the tile
 				for(var/i in 1 to radius)
 					pew(punishable_triggerer, TRUE)
 

diff --git a/code/game/objects/items/devices/mines.dm b/code/game/objects/items/devices/mines.dm
@@ -159,9 +159,9 @@
 
 //NOW we actually blow up
 /obj/item/mine/proc/blast_now(atom/movable/triggerer)
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(3, 1, src)
-	s.start()
+	var/datum/effect_system/spark_spread/sporks = new /datum/effect_system/spark_spread
+	sporks.set_up(3, 1, src)
+	sporks.start()
 	if(ismob(triggerer))
 		mineEffect(triggerer)
 	else
@@ -377,7 +377,7 @@
 	range_flame = 3
 	range_heavy = 0
 	shrapnel_magnitude = 8
-	shred_triggerer = FALSE //this would be ridiculous overkill
+	shred_triggerer = TRUE //this would be ridiculous overkill
 	shrapnel_type = /obj/projectile/energy/plasmabolt
 	manufacturer = MANUFACTURER_PGF
 
@@ -598,6 +598,8 @@ LIVE_MINE_HELPER(explosive/heavy)
 LIVE_MINE_HELPER(explosive/shrapnel)
 LIVE_MINE_HELPER(explosive/shrapnel/sting)
 LIVE_MINE_HELPER(spawner/manhack)
+LIVE_MINE_HELPER(gas/water_vapor)
+
 //
 // spawners (random mines, minefields, non-guaranteed mine)
 //

diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm
@@ -19,6 +19,6 @@
 	multiplicative_slowdown = -0.2
 
 /datum/movespeed_modifier/stepped_on_mine
-	multiplicative_slowdown = 6
+	multiplicative_slowdown = 5
 	movetypes = ALL
 	flags = IGNORE_NOSLOW
diff --git a/code/modules/projectiles/projectile/energy/misc.dm b/code/modules/projectiles/projectile/energy/misc.dm
@@ -38,7 +38,7 @@
 	. = ..()
 	if(iscarbon(target))
 		var/mob/living/carbon/M = target
-		M.adjust_bodytemperature(150)
+		M.adjust_bodytemperature(350)
 		if(prob(35))
 			M.adjust_fire_stacks(15)
 			M.IgniteMob()