mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge branch 'master' into upstream-merge-11464
This commit is contained in:
Nadyr
GitHub
@@ -139,6 +139,7 @@
|
||||
force = 5
|
||||
slot_flags = SLOT_BELT
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
unacidable = TRUE
|
||||
projectile_type = /obj/item/projectile/beam
|
||||
origin_tech = null
|
||||
fire_delay = 10 //Old pistol
|
||||
|
||||
@@ -30,18 +30,6 @@
|
||||
charge_cost = 800
|
||||
recharge_time = 0.5 SECONDS
|
||||
|
||||
/obj/item/weapon/gun/energy/stunrevolver
|
||||
name = "stun revolver"
|
||||
desc = "A LAEP20 Aktzin. Designed and produced by Lawson Arms under the wing of Hephaestus, several TSCs have been trying to get a hold of the blueprints for half a decade."
|
||||
description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, often sold alongside MarsTech projectile weapons to security and law enforcement agencies. \
|
||||
The Aktzin's capsule-based stun ammunition is a closely guarded Hephaestus Industries patent, and the company has been particularly litigious towards any attempted imitators."
|
||||
icon = 'icons/obj/guns/energy/stunrevolver.dmi'
|
||||
icon_state = "stunrevolver"
|
||||
item_state = "stunrevolver"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
|
||||
projectile_type = /obj/item/projectile/energy/electrode/strong
|
||||
charge_cost = 300
|
||||
|
||||
/obj/item/weapon/gun/energy/crossbow
|
||||
name = "mini energy-crossbow"
|
||||
desc = "A weapon favored by many mercenary stealth specialists."
|
||||
@@ -81,4 +69,45 @@
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2, TECH_POWER = 3)
|
||||
fire_delay = 20
|
||||
charge_cost = 600
|
||||
projectile_type = /obj/item/projectile/energy/plasmastun
|
||||
projectile_type = /obj/item/projectile/energy/plasmastun
|
||||
|
||||
//Stun Revolvers
|
||||
|
||||
/obj/item/weapon/gun/energy/stunrevolver
|
||||
name = "stun revolver"
|
||||
desc = "A LAEP20 Aktzin. Designed and produced by Lawson Arms under the wing of Hephaestus, \
|
||||
several TSCs have been trying to get a hold of the blueprints for half a decade."
|
||||
description_fluff = "Lawson Arms is Hephaestus Industries’ main personal-energy-weapon branding, \
|
||||
often sold alongside MarsTech projectile weapons to security and law enforcement agencies. \
|
||||
The Aktzin's capsule-based stun ammunition is a closely guarded Hephaestus Industries patent, \
|
||||
and the company has been particularly litigious towards any attempted imitators."
|
||||
icon_state = "stunrevolver"
|
||||
item_state = "stunrevolver"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
|
||||
projectile_type = /obj/item/projectile/energy/electrode/strong
|
||||
charge_cost = 300
|
||||
|
||||
/obj/item/weapon/gun/energy/stunrevolver/vintage
|
||||
name = "vintage stun revolver"
|
||||
desc = "An older model stun revolver that is still in service across the frontier."
|
||||
description_fluff = "The LTX1020 Bolter, a Firefly Co. staple from when the company was in its hayday. \
|
||||
While Firefly Co. has sadly been dissmantled due to bankruptcy, their iconic weapons can still be found \
|
||||
across the frontier as anything from collectors items to surplus equipment. The LTX1020 falls under \
|
||||
the latter category. Several companies have been known to use the base tech within the Bolter to create \
|
||||
their own variants of the Stun Revolver."
|
||||
icon_state = "vinstunrevolver"
|
||||
item_state = "stunrevolver"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
|
||||
|
||||
/obj/item/weapon/gun/energy/stunrevolver/snubnose
|
||||
name = "snub stun revolver"
|
||||
desc = "A snub nose stun revolver sporting a rather elegant look."
|
||||
description_fluff = "The LTX1010 Stubby, a Firefly Co. staple from when the company was in its hayday. \
|
||||
While Firefly Co. has sadly been dissmantled due to bankruptcy, their iconic weapons can still be found \
|
||||
across the frontier as anything from collectors items to surplus equipment. The LTX1010 falls under \
|
||||
the latter category. Gangsters and other gentlemanly criminals alike use the Stubby as a means of policing \
|
||||
within their ranks. Hard to argue with the boss with 12000 volts shooting through you."
|
||||
icon_state = "snubstunrevolver"
|
||||
item_state = "stunrevolver"
|
||||
w_class = ITEMSIZE_SMALL //small pistol is small
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
|
||||
@@ -1,7 +1,8 @@
|
||||
// For all intents and purposes, these work exactly the same as pump shotguns. It's unnecessary to make their own procs for them.
|
||||
|
||||
////////Base Rifle////////
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle
|
||||
name = "bolt action rifle"
|
||||
name = "bolt-action rifle"
|
||||
desc = "The Hedberg-Hammarstrom Volsung is a modern interpretation of an almost ancient weapon design. The model is popular among hunters and collectors due to its reliability. Uses 7.62mm rounds."
|
||||
description_fluff = "Sif’s largest home-grown firearms manufacturer, the Hedberg-Hammarstrom company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the Sivian wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, precision, and stopping power."
|
||||
@@ -14,20 +15,25 @@
|
||||
ammo_type = /obj/item/ammo_casing/a762
|
||||
load_method = SINGLE_CASING|SPEEDLOADER
|
||||
action_sound = 'sound/weapons/riflebolt.ogg'
|
||||
pump_animation = null
|
||||
pump_animation = "boltaction-cycling"
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice //For target practice
|
||||
////////Practice Rifle////////
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice // For target practice
|
||||
name = "practice bolt-action rifle"
|
||||
icon_state = "boltaction_practice"
|
||||
desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds."
|
||||
ammo_type = /obj/item/ammo_casing/a762/practice
|
||||
pump_animation = "boltaction_practice-cycling"
|
||||
|
||||
////////Ceremonial Rifle////////
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
|
||||
name = "ceremonial bolt-action rifle"
|
||||
desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds."
|
||||
icon_state = "boltaction_c"
|
||||
item_state = "boltaction_c"
|
||||
icon_state = "ceremonial_rifle"
|
||||
ammo_type = /obj/item/ammo_casing/a762/blank
|
||||
pump_animation = "ceremonial_rifle-cycling"
|
||||
|
||||
// Stole hacky terrible code from doublebarrel shotgun. -Spades
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial/attackby(var/obj/item/A as obj, mob/user as mob)
|
||||
if(istype(A, /obj/item/weapon/surgical/circular_saw) || istype(A, /obj/item/weapon/melee/energy) || istype(A, /obj/item/weapon/pickaxe/plasmacutter) && w_class != ITEMSIZE_NORMAL)
|
||||
to_chat(user, "<span class='notice'>You begin to shorten the barrel and stock of \the [src].</span>")
|
||||
@@ -37,7 +43,7 @@
|
||||
user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='danger'>The rifle goes off in your face!</span>")
|
||||
return
|
||||
if(do_after(user, 30))
|
||||
icon_state = "sawnrifle"
|
||||
icon_state = "sawn_rifle"
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
recoil = 2 // Owch
|
||||
accuracy = -15 // You know damn well why.
|
||||
@@ -46,11 +52,14 @@
|
||||
slot_flags |= (SLOT_BELT|SLOT_HOLSTER) //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) - or in a holster, why not.
|
||||
name = "sawn-off rifle"
|
||||
desc = "The firepower of a rifle, now the size of a pistol, with an effective combat range of about three feet. Uses 7.62mm rounds."
|
||||
pump_animation = "sawn_rifle-cycling"
|
||||
to_chat(user, "<span class='warning'>You shorten the barrel and stock of \the [src]!</span>")
|
||||
else
|
||||
..()
|
||||
|
||||
//Lever actions are the same thing, but bigger.
|
||||
|
||||
////////Standard Lever Action Rifle////////
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
|
||||
name = "lever-action rifle"
|
||||
desc = "The Hedberg-Hammarstrom Edda is the latest version of an almost ancient weapon design from the 19th century, popular with some due to its simplistic design. This one uses a lever-action to move new rounds into the chamber. Uses 7.62mm rounds."
|
||||
@@ -61,10 +70,12 @@
|
||||
max_shells = 5
|
||||
caliber = "7.62mm"
|
||||
load_method = SINGLE_CASING
|
||||
pump_animation = "leveraction-cycling"
|
||||
|
||||
////////Vintage Lever Action Rifle////////
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage
|
||||
name = "vintage repeater"
|
||||
desc = "An iconic manually operated lever action rifle, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses 7.62mm rounds."
|
||||
item_state = "levercarabine" // That isn't how carbine is spelled ya knob! :U
|
||||
icon_state = "levercarabine"
|
||||
pump_animation = "levercarabine-cycling"
|
||||
item_state = "levercarbine"
|
||||
icon_state = "levercarbine"
|
||||
pump_animation = "levercarbine-cycling"
|
||||
|
||||
@@ -24,6 +24,8 @@
|
||||
icon_state = "[initial(icon_state)]-e"
|
||||
|
||||
//Bastard child of a revolver and a semi-auto rifle.
|
||||
|
||||
//Standard Revolving Rifle
|
||||
/obj/item/weapon/gun/projectile/revolvingrifle
|
||||
name = "revolving rifle"
|
||||
desc = "The Gungnir is a novel, antique idea brought into the modern era by Hedberg-Hammarstrom. The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. Uses .44 magnum revolver rounds."
|
||||
@@ -31,7 +33,7 @@
|
||||
The company operates just one production plant in Kalmar, but their weapons have found popularity on garden worlds as far afield as the Tajaran homeworld due to their excellent build quality, \
|
||||
precision, and stopping power."
|
||||
icon_state = "revolvingrifle"
|
||||
item_state = "boltaction"
|
||||
item_state = "rifle"
|
||||
w_class = ITEMSIZE_LARGE
|
||||
caliber = ".44"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
|
||||
@@ -41,8 +43,9 @@
|
||||
max_shells = 6
|
||||
ammo_type = /obj/item/ammo_casing/a44/rifle
|
||||
|
||||
/obj/item/weapon/gun/projectile/revolvingrifle/update_icon()
|
||||
if(ammo_magazine)
|
||||
icon_state = initial(icon_state)
|
||||
else
|
||||
icon_state = "[initial(icon_state)]-e"
|
||||
//Vintage Revolving Rifle
|
||||
/obj/item/weapon/gun/projectile/revolvingrifle/vintage
|
||||
name = "vintage revolving rifle"
|
||||
desc = "The Willhem is the Gungir's older cousin by Hedberg-Hammarstrom, the perfect collector piece. The semi-automatic revolving mechanism offers no real advantage, but some colonists swear by it. Uses .44 magnum revolver rounds."
|
||||
icon_state = "vintagerevolvingrifle"
|
||||
|
||||
|
||||
@@ -658,7 +658,7 @@
|
||||
return
|
||||
|
||||
//roll to-hit
|
||||
miss_modifier = max(15*(distance-2) - accuracy + miss_modifier + target_mob.get_evasion(), 0)
|
||||
miss_modifier = max(15*(distance-2) - accuracy + miss_modifier + target_mob.get_evasion(), -100)
|
||||
var/hit_zone = get_zone_with_miss_chance(def_zone, target_mob, miss_modifier, ranged_attack=(distance > 1 || original != target_mob)) //if the projectile hits a target we weren't originally aiming at then retain the chance to miss
|
||||
|
||||
var/result = PROJECTILE_FORCE_MISS
|
||||
|
||||
Reference in New Issue
Block a user