Skip to content

[PORT] Ninja energy net now a projectile #7028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2025
Merged

[PORT] Ninja energy net now a projectile #7028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions code/modules/antagonists/ninja/energy_net_nets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
desc = "It's a net made of green energy."
icon = 'icons/effects/effects.dmi'
icon_state = "energynet"

density = TRUE//Can't pass through.
opacity = FALSE //Can see through.
mouse_opacity = MOUSE_OPACITY_ICON//So you can hit it with stuff.
Expand All @@ -23,23 +22,20 @@
can_buckle = 1
buckle_lying = 0
buckle_prevents_pull = TRUE
///The creature currently caught in the net
var/mob/living/affected_mob

/obj/structure/energy_net/play_attack_sound(damage, damage_type = BRUTE, damage_flag = 0)
if(damage_type == BRUTE || damage_type == BURN)
playsound(src, 'sound/weapons/slash.ogg', 80, TRUE)

/obj/structure/energy_net/Destroy()
if(!QDELETED(affected_mob))
affected_mob.visible_message(span_notice("[affected_mob.name] is recovered from the energy net!"), span_notice("You are recovered from the energy net!"), span_hear("You hear a grunt."))
affected_mob = null
/obj/structure/energy_net/atom_destruction(damage_flag)
for(var/mob/recovered_mob as anything in buckled_mobs)
recovered_mob.visible_message(span_notice("[recovered_mob] is recovered from the energy net!"), span_notice("You are recovered from the energy net!"), span_hear("You hear a grunt."))
return ..()

/obj/structure/energy_net/attack_paw(mob/user, list/modifiers)
return attack_hand(user, modifiers)

/obj/structure/energy_net/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
/obj/structure/energy_net/user_buckle_mob(mob/living/buckled_mob, mob/user, check_loc = TRUE)
return//We only want our target to be buckled

/obj/structure/energy_net/user_unbuckle_mob(mob/living/buckled_mob, mob/living/user)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mod/modules/modules_engineering.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
/obj/projectile/tether/fire(setAngle)
if(firer)
line = firer.Beam(src, "line", 'icons/obj/clothing/modsuit/mod_modules.dmi', emissive = FALSE)
..()
return ..()

/obj/projectile/tether/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
Expand Down
31 changes: 11 additions & 20 deletions code/modules/mod/modules/modules_ninja.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,34 +311,25 @@
module_type = MODULE_ACTIVE
use_power_cost = DEFAULT_CHARGE_DRAIN * 6
incompatible_modules = list(/obj/item/mod/module/energy_net)
cooldown_time = 1.5 SECONDS
cooldown_time = 5 SECONDS
/// List of all energy nets this module made.
var/list/energy_nets = list()

/obj/item/mod/module/energy_net/on_suit_deactivation(deleting)
for(var/obj/structure/energy_net/net as anything in energy_nets)
net.atom_destruction(ENERGY)

/obj/item/mod/module/energy_net/on_select_use(atom/target)
. = ..()
if(!.)
return
if(!isliving(target))
balloon_alert(mod.wearer, "invalid target!")
return
var/mob/living/living_target = target
if(locate(/obj/structure/energy_net) in get_turf(living_target))
balloon_alert(mod.wearer, "already trapped!")
return
for(var/turf/between_turf as anything in get_line(get_turf(mod.wearer), get_turf(living_target)))
if(between_turf.density)
balloon_alert(mod.wearer, "not through obstacles!")
return
if(IS_SPACE_NINJA(mod.wearer))
if(IS_SPACE_NINJA(mod.wearer) && isliving(target))
mod.wearer.say("Get over here!", forced = type)
mod.wearer.Beam(living_target, "n_beam", time = 1.5 SECONDS)
var/obj/structure/energy_net/net = new /obj/structure/energy_net(living_target.drop_location())
net.affected_mob = living_target
mod.wearer.visible_message(span_danger("[mod.wearer] caught [living_target] with an energy net!"), span_notice("You caught [living_target] with an energy net!"))
if(living_target.buckled)
living_target.buckled.unbuckle_mob(living_target, force = TRUE)
net.buckle_mob(living_target, force = TRUE)
var/obj/projectile/net = new /obj/projectile/energy_net(mod.wearer.loc, src)
net.preparePixelProjectile(target, mod.wearer)
net.firer = mod.wearer
playsound(src, 'sound/weapons/punchmiss.ogg', 25, TRUE)
INVOKE_ASYNC(net, TYPE_PROC_REF(/obj/projectile, fire))
drain_power(use_power_cost)

/obj/item/mod/module/energy_net/proc/add_net(obj/structure/energy_net/net)
Expand Down
Loading