Adds some new mech weaponry for the legion, changes the way mech decals are applied (#7534)

This commit is contained in:
fernerr
2019-12-03 18:35:14 +01:00
committed by Werner
parent bb18893eb3
commit 06b9d15ee8
24 changed files with 680 additions and 489 deletions

View File

@@ -20,6 +20,20 @@
list(mode_name="2-round bursts", burst=2, fire_delay=null, move_delay=2, burst_accuracy=list(1,0,0), dispersion=list(0, 10, 15))
)
/obj/item/gun/energy/blaster/mounted/mech
name = "rapidfire blaster"
desc = "An aged but reliable rapidfire blaster tuned to expel projectiles at high fire rates."
fire_sound = 'sound/weapons/laserstrong.ogg'
projectile_type = /obj/item/projectile/energy/blaster/heavy
burst = 5
burst_delay = 3
max_shots = 30
charge_cost = 100
use_external_power = TRUE
self_recharge = TRUE
recharge_time = 1.5
dispersion = list(3,6,9,12)
/obj/item/gun/energy/blaster/revolver
name = "blaster revolver"
desc = "A robust eight-shot blaster.."
@@ -47,7 +61,6 @@
desc = "A robust, low in maintenance, eight-shot blaster. Perfect for self-defense purposes."
/obj/item/gun/energy/blaster/carbine
name = "blaster carbine"
desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat."
icon_state = "blaster_carbine"

View File

@@ -225,7 +225,6 @@
allowed_magazines = list(/obj/item/ammo_magazine/gauss)
icon_state = "gauss_thumper"
caliber = "gauss"
accuracy = 1
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
fire_sound = 'sound/weapons/railgun.ogg'
load_method = MAGAZINE
@@ -249,4 +248,20 @@
item_state = "gauss_thumper"
update_held_icon()
return
return
/obj/item/gun/energy/gauss/mounted/mech
name = "heavy gauss cannon"
desc = "An outdated and power hungry gauss cannon, modified to deliver high explosive rounds at high velocities."
icon = 'icons/obj/gun.dmi'
icon_state = "gauss_thumper"
fire_sound = 'sound/weapons/railgun.ogg'
fire_delay = 30
charge_meter = 0
max_shots = 3
charge_cost = 500
projectile_type = /obj/item/projectile/bullet/gauss/highex
self_recharge = 1
use_external_power = 1
recharge_time = 12
needspin = FALSE

View File

@@ -329,6 +329,22 @@
muzzle_type = /obj/effect/projectile/muzzle/gauss
embed = 0
/obj/item/projectile/bullet/gauss/highex
name ="high-ex shell"
damage = 10
/obj/item/projectile/bullet/gauss/highex/on_impact(var/atom/A)
explosion(A, -1, 0, 2)
..()
/obj/item/projectile/bullet/gauss/highex/on_hit(var/atom/target, var/blocked = 0)
explosion(target, -1, 0, 2)
sleep(0)
var/obj/T = target
var/throwdir = get_dir(firer,target)
T.throw_at(get_edge_target_turf(target, throwdir),3,3)
return 1
/obj/item/projectile/bullet/cannonball
name = "cannonball"
icon_state = "cannonball"