[MIRROR] Speargun: Now actually a gun! Again! (#1610)

* Speargun: Now actually a gun! Again! (#54289)

Turns the speargun from the syndikit bundle into a bolt action rifle instead of a pnuematic cannon.

The spears the rifle fires embeds using the new bullet embedding system by Ryll. The spears do a lot of fucking damage.

The new bundle includes:

The Ballistic Harpoon Gun

The weapon is a single shot rifle that can be loaded with harpoons. The rifle, being bolt action, requires pulling back the bolt, loading the new harpoon, then locking the bolt every time you wish to fire the weapon. This is more busy work than the pnuematic cannon version, but more reliable in functionality without any messy business with throwing.

The harpoons do 60 force, have a high wound chance against unarmored targets and very high embed chance, with a 100% against unarmored targets. They also have considerable armor piercing at 50, letting you nearly entirely shoot through a ballistic vest.

The weapon is essentially a powered-up single shot mosin or a significantly more powerful improvised shotgun filled with slugs.

The Quiver

Now a bag that goes on your belt. It holds up to 40 harpoons for your harpoon gun. This change was done because the harpoons cannot be retrieved, unlike the magspears, which were simply hacky ninja stars and could be pulled out with surgical tools/wirecutters. Previously you had 20 magspears, which because of their retrievable nature lasted a little longer than you would expect.

Sprites

New back sprites for the harpoon gun, ensuring nobody is missing it when you have it. Additionally, the Mosin Nagant now has it's back sprite as a suit storage sprite.

New sprite for the quiver.

* Speargun: Now actually a gun! Again!

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-11-07 15:43:22 +00:00
committed by GitHub
co-authored by necromanceranne
parent a608adb52e
commit 4df9bf0979
15 changed files with 61 additions and 60 deletions
@@ -332,7 +332,7 @@ Contains:
inhand_icon_state = "space_suit_syndicate"
slowdown = 0 //Space carp magic, never stop believing
armor = list(MELEE = -20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 75, FIRE = 60, ACID = 75) //As whimpy whimpy whoo
allowed = list(/obj/item/tank/internals, /obj/item/pneumatic_cannon/speargun) //I'm giving you a hint here
allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/rifle/boltaction/harpoon) //I'm giving you a hint here
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/carp
/obj/item/clothing/head/helmet/space/hardsuit/carp/equipped(mob/living/carbon/human/user, slot)
+1 -1
View File
@@ -252,7 +252,7 @@
body_parts_covered = CHEST|GROIN|ARMS
cold_protection = CHEST|GROIN|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pneumatic_cannon/speargun)
allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/rifle/boltaction/harpoon)
hoodtype = /obj/item/clothing/head/hooded/carp_hood
/obj/item/clothing/head/hooded/carp_hood
@@ -12,3 +12,11 @@
projectile_type = /obj/projectile/beam/weak/penetrator
variance = 0.8
click_cooldown_override = 1
// Harpoons (Ballistic Harpoon Gun)
/obj/item/ammo_casing/caseless/harpoon
name = "harpoon"
caliber = "harpoon"
icon_state = "magspear"
projectile_type = /obj/projectile/bullet/harpoon
@@ -13,3 +13,7 @@
/obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
ammo_type = /obj/item/ammo_casing/magic/arcane_barrage
/obj/item/ammo_box/magazine/internal/boltaction/harpoon
max_ammo = 1
caliber = "harpoon"
ammo_type = /obj/item/ammo_casing/caseless/harpoon
@@ -77,6 +77,16 @@
process_fire(user, user, FALSE)
. = 1
/obj/item/gun/ballistic/rifle/boltaction/harpoon
name = "ballistic harpoon gun"
desc = "A weapon favored by carp hunters, but just as infamously employed by agents of the Animal Rights Consortium against human aggressors. Because it's ironic."
icon_state = "speargun"
inhand_icon_state = "speargun"
worn_icon_state = "speargun"
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/harpoon
fire_sound = 'sound/weapons/gun/sniper/shot.ogg'
can_be_sawn_off = FALSE
/obj/item/gun/ballistic/rifle/boltaction/enchanted
name = "enchanted bolt action rifle"
desc = "Careful not to lose your head."
@@ -25,3 +25,15 @@
name = "enchanted 7.62 bullet"
damage = 20
stamina = 80
// Harpoons (Harpoon Gun)
/obj/projectile/bullet/harpoon
name = "harpoon"
icon_state = "gauss"
damage = 60
armour_penetration = 50
wound_bonus = -20
bare_wound_bonus = 80
embedding = list(embed_chance=100, fall_chance=3, jostle_chance=4, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10)
wound_falloff_tile = -5
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/ballistic/automatic/ar,
/obj/item/gun/ballistic/revolver/mateba,
/obj/item/gun/ballistic/rifle/boltaction,
/obj/item/pneumatic_cannon/speargun,
/obj/item/gun/ballistic/rifle/boltaction/harpoon,
/obj/item/gun/ballistic/automatic/mini_uzi,
/obj/item/gun/energy/lasercannon,
/obj/item/gun/energy/kinetic_accelerator/crossbow/large,
@@ -116,7 +116,7 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE)
var/gun_type = pick(GLOB.summoned_guns)
var/obj/item/gun/G = new gun_type(get_turf(H))
if (istype(G)) // The list contains some non-gun type guns like the speargun which do not have this proc
if (istype(G)) // The list may contain some non-gun type guns which do not have this proc
G.unlock()
playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, TRUE)