Skip to content

Commit

Permalink
tweaks
Browse files Browse the repository at this point in the history
admin message
fixes prox mines(?)
moves landmines to their own file
  • Loading branch information
Sun-Soaked committed Mar 17, 2024
1 parent 53cc049 commit 863c812
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/datums/components/pellet_cloud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions code/game/objects/items/devices/mines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)

Expand Down
Binary file modified icons/obj/device.dmi
Binary file not shown.
Binary file added icons/obj/landmine.dmi
Binary file not shown.

0 comments on commit 863c812

Please sign in to comment.