diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 07a299251033..19b1e2094993 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -125,7 +125,7 @@ if(isgrenade(parent)) // handle_martyrs can reduce the radius and thus the number of pellets we produce if someone dives on top of a frag grenade handle_martyrs(punishable_triggerer) // note that we can modify radius in this proc - else if(islandmine(parent)) + else if(istype(parent, /obj/item/mine/pressure/explosive)) var/obj/item/mine/pressure/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 diff --git a/code/game/objects/items/devices/mines.dm b/code/game/objects/items/devices/mines.dm index 91b79c1d51a0..112e26e1303b 100644 --- a/code/game/objects/items/devices/mines.dm +++ b/code/game/objects/items/devices/mines.dm @@ -2,7 +2,7 @@ /obj/item/mine name = "mine" desc = "An anti-personnel mine. This one explodes into nothing and does nothing. Why can you see this? You should't be able to see this. Stop looking at this." - icon = 'icons/obj/device.dmi' + icon = 'icons/obj/landmine.dmi' w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 5 @@ -24,6 +24,13 @@ var/manufacturer = MANUFACTURER_NONE + +/obj/item/mine/Initialize(mapload) + . = ..() + if(armed) + now_armed() + + /obj/item/mine/examine(mob/user) . = ..() if(!armed) @@ -73,7 +80,7 @@ addtimer(CALLBACK(src, PROC_REF(now_armed)), arm_delay) else armed = TRUE - log_admin("[key_name(user)] has placed \a [src] at ([x],[y],[z]).") + message_admins("[key_name(user)] has placed \a [src] at ([x],[y],[z]).") //let them know the mine's done cooking /obj/item/mine/proc/now_armed() @@ -280,7 +287,7 @@ var/datum/proximity_monitor/proximity_monitor var/proximity_range = 2 -/obj/item/mine/proximity/Initialize() +/obj/item/mine/proximity/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 1858d1679b69..360e4cd0f3e4 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/landmine.dmi b/icons/obj/landmine.dmi new file mode 100644 index 000000000000..dd19fd9d3991 Binary files /dev/null and b/icons/obj/landmine.dmi differ