diff --git a/modular_chomp/code/datums/supplypacks/security.dm b/modular_chomp/code/datums/supplypacks/security.dm index a402eb1563..a790ad384d 100644 --- a/modular_chomp/code/datums/supplypacks/security.dm +++ b/modular_chomp/code/datums/supplypacks/security.dm @@ -24,4 +24,14 @@ ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear - containername = "PSG-P crate" \ No newline at end of file + containername = "PSG-P crate" + +/datum/supply_pack/security/rednetgun + name = "Experimental Capture Gun" + num_contained = 4 + contains = list( + /obj/item/weapon/gun/energy/rednetgun + ) + cost = 150 + containertype = /obj/structure/closet/crate/secure/gear + containername = "Expirmental Capture crate" \ No newline at end of file diff --git a/modular_chomp/code/modules/projectiles/gun.dm b/modular_chomp/code/modules/projectiles/gun.dm index ce2afeada7..f06ab3f9cb 100644 --- a/modular_chomp/code/modules/projectiles/gun.dm +++ b/modular_chomp/code/modules/projectiles/gun.dm @@ -1,9 +1,12 @@ // prevent gun activation when stealth swimming. The low alpha hides you from NPC AI, which allows you to cheese mobs. +//Just adding onto this code for funny net gun /obj/item/weapon/gun/special_check(var/mob/user) var/mob/living/L = user if(istype(L)) if(L.has_modifier_of_type(/datum/modifier/underwater_stealth)) to_chat(user,"You cannot use guns whilst hiding underwater!") return 0 - + if(L.has_modifier_of_type(/datum/modifier/rednet)) + to_chat(user,"Your gun refuses to fire!") + return 0 return ..() diff --git a/modular_chomp/code/modules/projectiles/guns/energy/special.dm b/modular_chomp/code/modules/projectiles/guns/energy/special.dm index 442b66f3ff..d070723c54 100644 --- a/modular_chomp/code/modules/projectiles/guns/energy/special.dm +++ b/modular_chomp/code/modules/projectiles/guns/energy/special.dm @@ -26,4 +26,31 @@ /obj/item/projectile/energy/plasmastun/slow/on_hit(var/atom/target) if(isliving(target)) var/mob/living/L = target - L.add_modifier(/datum/modifier/entangled, 10 SECONDS) \ No newline at end of file + L.add_modifier(/datum/modifier/entangled, 10 SECONDS) + + +/obj/item/weapon/gun/energy/rednetgun + name = "experimental capture gun" + desc = "An experimental gun, in efforts to expand net gun technology. Utilizing eletronic interferance and a \ + heat aura it in theory stops the subject from fighting back." + icon_state = "goldstunrevolver" + item_state = null + projectile_type = /obj/item/projectile/energy/rednet + charge_cost = 1440 //so a taser has 15 shots at 480 and I want five but this feels goofy + + +/obj/item/projectile/energy/rednet + name = "expirmental energy net" + icon_state = "toxin" + damage = 0 + check_armour = "energy" + hud_state = "pistol_tranq" + fire_sound = 'sound/weapons/Taser.ogg' + nodamage = 1 + modifier_type_to_apply = /datum/modifier/rednet + modifier_duration = 0.5 MINUTE + speed = 1.5 + +/datum/modifier/rednet + mob_overlay_state = "red_electricity_constant" + slowdown = 1 \ No newline at end of file