diff --git a/_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm b/_maps/RandomRuins/RockRuins/rockplanet_boxsci.dmm index 98843bc485c0..a82ce8a7c8ea 100644 --- 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 index 46c791a478ef..33902dd07ba7 100644 --- 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 index 26fe584993f6..510c42036ca6 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -264,7 +264,7 @@ /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) @@ -272,7 +272,7 @@ /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 index bb977a16ac45..55f731e57f46 100644 --- 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 index 549476b1882e..8d856f5ce5a7 100644 --- 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 index c9f260486364..8e3fe63b3470 100644 --- 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 index 9a84744e631f..dd5aa6985a68 100644 --- 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 index 5e0c7988f1b4..b9b5c6e0682c 100644 --- 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 index ff3bf8160b92..11f948ddb415 100644 --- 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()