Skip to content

Commit

Permalink
fixes create & destroy test (I think)
Browse files Browse the repository at this point in the history
live mine was trying to draw tripwires in nullspace after being move()'d there
  • Loading branch information
Sun-Soaked committed May 13, 2024
1 parent b6d0ab6 commit db41fdd
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/mines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
//handles weird cases like ship movement or teleporting
/obj/item/mine/directional/Moved()
. = ..()
if(armed & !triggered)
if(armed & !triggered & loc)
draw_tripwires()

//
Expand Down
31 changes: 0 additions & 31 deletions code/game/objects/items/shrapnel.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,34 +147,3 @@
dismemberment = 30
armour_penetration = 0

// /obj/item/ammo_casing/caseless/claymore
// name = "bomblet spray"
// desc = "How are you reading this?"
// pellets = 3
// variance = 40
// projectile_type = /obj/projectile/bullet/claymore
// randomspread = TRUE

// /obj/projectile/bullet/claymore
// name = "explosive bomblet"
// desc = "A small explosive charge that detonates when the shell is breached, used in cluster munitions. Stop reading this, run!"
// icon_state= "pellet"
// damage = 15
// var/hashit = FALSE

// //distribution of explosions along an unpredictable scatter, near the claymore
// /obj/projectile/bullet/claymore/Initialize()
// range = rand(2,4)
// . = ..()

// /obj/projectile/bullet/claymore/on_hit(atom/target, blocked = FALSE)
// ..()
// explosion(target, -1, 0, 0, 0, 0, flame_range = 0)
// hashit = TRUE
// return BULLET_ACT_HIT

// //when the bullet's range reaches 0, explode.
// /obj/projectile/bullet/claymore/Destroy()
// if(!hashit)
// explosion(src, -1, 0, 0, 0, 0, flame_range = 0)
// . = ..()

0 comments on commit db41fdd

Please sign in to comment.