Skip to content

Commit

Permalink
direct hit balloons, mine layer above objects
Browse files Browse the repository at this point in the history
  • Loading branch information
Nomoresolvalou committed Sep 22, 2024
1 parent a4970c3 commit b6a8010
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/explosives/mine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@
name = "\improper P9 SHARP explosive dart"
desc = "An experimental P9 SHARP proximity triggered explosive dart designed by Armat Systems for use by the United States Colonial Marines. This one has full 360 detection range."
icon_state = "sharp_explosive_mine"
layer = ABOVE_OBJ_LAYER
angle = 360
health = 50
var/disarmed = FALSE
Expand Down
2 changes: 2 additions & 0 deletions code/modules/projectiles/guns/specialist/sharp.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
var/mob/shooter = shot_dart.firer
shake_camera(target, 2, 1)
if(shooter && ismob(shooter))
target.balloon_alert(target, "you have been hit by an explosive dart!")
if(!target.get_target_lock(shooter.faction_group))
var/obj/item/weapon/gun/rifle/sharp/weapon = shot_dart.shot_from
playsound(get_turf(target), 'sound/weapons/gun_sharp_explode.ogg', 100)
Expand Down Expand Up @@ -171,6 +172,7 @@
var/mob/shooter = shot_dart.firer
shake_camera(target, 2, 1)
if(shooter && ismob(shooter))
target.balloon_alert(target, "you have been hit by an incendiary dart!")
if(!target.get_target_lock(shooter.faction_group))
var/obj/item/weapon/gun/rifle/sharp/weapon = shot_dart.shot_from
playsound(get_turf(target), 'sound/weapons/gun_sharp_explode.ogg', 100)
Expand Down

0 comments on commit b6a8010

Please sign in to comment.