mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 18:02:57 +00:00
Merge pull request #10058 from Ghommie/Ghommie-cit432
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
This commit is contained in:
@@ -5,7 +5,6 @@
|
|||||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||||
icon_state= "spinner"
|
icon_state= "spinner"
|
||||||
damage = 30
|
damage = 30
|
||||||
dismemberment = 25
|
|
||||||
|
|
||||||
/obj/item/projectile/bullet/spinfusor/on_hit(atom/target, blocked = FALSE) //explosion to emulate the spinfusor's AOE
|
/obj/item/projectile/bullet/spinfusor/on_hit(atom/target, blocked = FALSE) //explosion to emulate the spinfusor's AOE
|
||||||
..()
|
..()
|
||||||
@@ -14,22 +13,16 @@
|
|||||||
|
|
||||||
/obj/item/ammo_casing/caseless/spinfusor
|
/obj/item/ammo_casing/caseless/spinfusor
|
||||||
name = "spinfusor disk"
|
name = "spinfusor disk"
|
||||||
desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Warning: extremely volatile!"
|
desc = "A magnetic disk designed specifically for the Stormhammer magnetic cannon. Packs a punch."
|
||||||
projectile_type = /obj/item/projectile/bullet/spinfusor
|
projectile_type = /obj/item/projectile/bullet/spinfusor
|
||||||
caliber = "spinfusor"
|
caliber = "spinfusor"
|
||||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||||
icon_state = "disk"
|
icon_state = "disk"
|
||||||
|
w_class = WEIGHT_CLASS_SMALL
|
||||||
throwforce = 15 //still deadly when thrown
|
throwforce = 15 //still deadly when thrown
|
||||||
|
force = 5
|
||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
|
|
||||||
/obj/item/ammo_casing/caseless/spinfusor/throw_impact(atom/target) //disks detonate when thrown
|
|
||||||
if(!..()) // not caught in mid-air
|
|
||||||
visible_message("<span class='notice'>[src] detonates!</span>")
|
|
||||||
playsound(src.loc, "sparks", 50, 1)
|
|
||||||
explosion(target, -1, -1, 1, 1, -1)
|
|
||||||
qdel(src)
|
|
||||||
return 1
|
|
||||||
|
|
||||||
/obj/item/ammo_box/magazine/internal/spinfusor
|
/obj/item/ammo_box/magazine/internal/spinfusor
|
||||||
name = "spinfusor internal magazine"
|
name = "spinfusor internal magazine"
|
||||||
ammo_type = /obj/item/ammo_casing/caseless/spinfusor
|
ammo_type = /obj/item/ammo_casing/caseless/spinfusor
|
||||||
@@ -71,7 +64,8 @@
|
|||||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||||
icon_state = "spinfusorbox"
|
icon_state = "spinfusorbox"
|
||||||
ammo_type = /obj/item/ammo_casing/caseless/spinfusor
|
ammo_type = /obj/item/ammo_casing/caseless/spinfusor
|
||||||
max_ammo = 8
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
max_ammo = 4
|
||||||
|
|
||||||
/datum/supply_pack/security/armory/spinfusor
|
/datum/supply_pack/security/armory/spinfusor
|
||||||
name = "Stormhammer Spinfusor Crate"
|
name = "Stormhammer Spinfusor Crate"
|
||||||
@@ -84,7 +78,5 @@
|
|||||||
name = "Spinfusor Disk Crate"
|
name = "Spinfusor Disk Crate"
|
||||||
cost = 7000
|
cost = 7000
|
||||||
contains = list(/obj/item/ammo_box/aspinfusor,
|
contains = list(/obj/item/ammo_box/aspinfusor,
|
||||||
/obj/item/ammo_box/aspinfusor,
|
|
||||||
/obj/item/ammo_box/aspinfusor,
|
|
||||||
/obj/item/ammo_box/aspinfusor)
|
/obj/item/ammo_box/aspinfusor)
|
||||||
crate_name = "spinfusor disk crate"
|
crate_name = "spinfusor disk crate"
|
||||||
|
|||||||
Reference in New Issue
Block a user