cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #770 from SplinterGP/master

Browse Source 
Adds back the 'Hunter' net gun as a new type
This commit is contained in:
Izac Joof Forsgren
2020-05-21 21:14:31 +02:00
committed by GitHub
parent 95ad5c96f9 fcd2844540
commit 6f082b9817
5 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/energy/netgun_vr.dm
View File

@@ -1,7 +1,7 @@
/obj/item/weapon/gun/energy/netgun
name = "energy net gun"
desc = "A Hephaestus-designed, usually dubbed 'Hunter' or 'non-lethal capture device' stunner and energy net launcher, \
for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
desc = "A Hephaestus-designed, usually dubbed 'non-lethal capture device' energy net launcher, \
for when you wanna capture feracious predators." //YW edit - small change to description
catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
icon = 'icons/obj/gun_vr.dmi'
icon_state = "netgun"

37
code/modules/projectiles/guns/energy/netgun_yw.dm Normal file
View File

@@ -0,0 +1,37 @@
/obj/item/weapon/gun/energy/hunter
name = "Hybrid 'Hunter' net gun"
desc = "A Hephaestus-designed hybrid of a taser and the energy net gun, usually dubbed 'Hunter' stunner and energy net launcher, \
for when you want criminals to stop acting like they're on a 20th century British comedy sketch show."
catalogue_data = list(/datum/category_item/catalogue/information/organization/hephaestus)
icon = 'icons/obj/gun_vr.dmi'
icon_state = "hunter"
item_state = "gun" // Placeholder
mode_name = "stun"
projectile_type = /obj/item/projectile/beam/stun/blue
charge_cost = 320
fire_delay = 10
fire_sound = 'sound/weapons/Taser.ogg'
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_MAGNET = 4)
firemodes = list(
list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun/blue, fire_sound='sound/weapons/Taser.ogg', charge_cost=320, fire_delay=10),
list(mode_name="capture", projectile_type=/obj/item/projectile/beam/energy_net, fire_sound = 'sound/weapons/eluger.ogg', charge_cost=1200, fire_delay=50)
)
/obj/item/weapon/gun/energy/hunter/update_icon()
overlays.Cut()
if(power_supply)
var/ratio = power_supply.charge / power_supply.maxcharge
if(power_supply.charge < charge_cost)
ratio = 0
else
ratio = max(round(ratio, 0.25) * 100, 25)
overlays += "[initial(icon_state)]_cell"
overlays += "[initial(icon_state)]_[ratio]"
overlays += "[initial(icon_state)]_[mode_name]"

2
code/modules/research/designs/weapons_vr.dm
View File

@@ -26,7 +26,7 @@
sort_string = "MAAVB"
/datum/design/item/weapon/energy/netgun
name = "\'Hunter\' capture gun"
name = "Energy net gun" //ywedit - hunter is the hybrid one
id = "netgun"
req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 5, TECH_MAGNET = 3)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000)

7
code/modules/research/designs/weapons_yw.dm Normal file
View File

@@ -0,0 +1,7 @@
/datum/design/item/weapon/energy/hunter
name = "Hybrid 'Hunter' net gun"
id = "huntergun"
req_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 6, TECH_MAGNET = 4)
materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 3000, "silver" = 1000)
build_path = /obj/item/weapon/gun/energy/hunter
sort_string = "MAAVC"

2
vorestation.dme
View File

@@ -3192,6 +3192,7 @@
#include "code\modules\projectiles\guns\energy\laser_vr.dm"
#include "code\modules\projectiles\guns\energy\laser_yw.dm"
#include "code\modules\projectiles\guns\energy\netgun_vr.dm"
#include "code\modules\projectiles\guns\energy\netgun_yw.dm"
#include "code\modules\projectiles\guns\energy\nuclear.dm"
#include "code\modules\projectiles\guns\energy\nuclear_yw.dm"
#include "code\modules\projectiles\guns\energy\particle.dm"
@@ -3379,6 +3380,7 @@
#include "code\modules\research\designs\tech_disks.dm"
#include "code\modules\research\designs\weapons.dm"
#include "code\modules\research\designs\weapons_vr.dm"
#include "code\modules\research\designs\weapons_yw.dm"
#include "code\modules\research\designs\xenoarch_toys.dm"
#include "code\modules\research\designs\xenobio_toys.dm"
#include "code\modules\research\designs\circuits\ai_modules.dm"