mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
Revert "Merge branch 'The-Model-E2' of https://github.com/klaasjared/VOREStation into The-Model-E2"
This reverts commit4431137791, reversing changes made to1806f4dc60.
This commit is contained in:
klaasjared
@@ -255,7 +255,7 @@
|
||||
|
||||
/obj/item/weapon/gun/energy/locked/frontier/carbine
|
||||
name = "frontier carbine"
|
||||
desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
|
||||
desc = "An ergonomically improved version of the venerable frontier phaser. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility."
|
||||
description_fluff = "The NT Brand Model AT2 Secured Phaser System, a specialty phaser that has an intergrated chip that prevents the user from opperating the weapon within the vicinity of any NanoTrasen opperated outposts/stations/bases. However, this chip can be disabled so the weapon CAN BE used in the vicinity of any NanoTrasen opperated outposts/stations/bases. The weapon doesn't use traditional weapon power cells and instead works via a pump action that recharges the internal cells. It is a staple amongst exploration personell who usually don't have the license to opperate a lethal weapon through NT and provides them with a weapon that can be recharged away from civilization."
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "carbkill"
|
||||
@@ -264,7 +264,7 @@
|
||||
|
||||
modifystate = "carbkill"
|
||||
firemodes = list(
|
||||
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="carbinekill", charge_cost = 300),
|
||||
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/carbine/blue, modifystate="carbinekill", charge_cost = 300),
|
||||
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbinestun", charge_cost = 80),
|
||||
)
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
..()
|
||||
|
||||
/obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked
|
||||
desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization."
|
||||
desc = "An ergonomically improved version of the venerable frontier phaser. Includes a built-in crank charger for recharging away from civilization."
|
||||
req_access = newlist() //for toggling safety
|
||||
locked = 0
|
||||
lockable = 0
|
||||
|
||||
@@ -35,6 +35,7 @@
|
||||
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/gun_vr.dmi'
|
||||
icon_state = "stunrevolver"
|
||||
item_state = "stunrevolver"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2)
|
||||
|
||||
@@ -3,5 +3,4 @@
|
||||
fire_delay = 4
|
||||
|
||||
/obj/item/weapon/gun/energy/stunrevolver
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
charge_cost = 400
|
||||
@@ -374,6 +374,7 @@
|
||||
name = "\improper Tommy Gun"
|
||||
desc = "This weapon was made famous by gangsters in the 20th century. Cybersun Industries is currently reproducing these for a target market of historic gun collectors and classy criminals. Uses .45 rounds."
|
||||
description_fluff = "Cybersun Industries is a minor arms manufacturer specialising in replica firearms from eras past. Though they offer a wide selection of made-to-order models, their products are seen as little more than novelty items to most serious collectors."
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "tommygun"
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
caliber = ".45"
|
||||
@@ -389,7 +390,6 @@
|
||||
)
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/tommygun/update_icon()
|
||||
//VOREStation Edit Start - vr sprite
|
||||
if(istype(ammo_magazine,/obj/item/ammo_magazine/m45tommy))
|
||||
icon_state = "tommygun-mag"
|
||||
item_state = icon_state
|
||||
@@ -400,7 +400,11 @@
|
||||
icon_state = "tommygun-empty"
|
||||
item_state = icon_state
|
||||
update_held_icon()
|
||||
//VOREStation Edit End
|
||||
|
||||
///obj/item/weapon/gun/projectile/automatic/tommygun/update_icon()
|
||||
// ..()
|
||||
// icon_state = (ammo_magazine)? "tommygun" : "tommygun-empty"
|
||||
// update_held_icon()
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/bullpup // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start.
|
||||
name = "bullpup rifle"
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
/obj/item/weapon/gun/projectile/automatic/wt550/lethal
|
||||
magazine_type = /obj/item/ammo_magazine/m9mmt
|
||||
|
||||
/obj/item/weapon/gun/projectile/automatic/tommygun
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
|
||||
////////////////////////////////////////////////////////////
|
||||
//////////////////// Projectile Weapons ////////////////////
|
||||
////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -2,11 +2,12 @@
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/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."
|
||||
item_state = "boltaction"
|
||||
desc = "The Weissen Company Type-19 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 = "The frontier’s largest home-grown firearms manufacturer, the APEX Arms Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in the Mytis system, 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 = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "boltaction"
|
||||
item_state = "boltaction"
|
||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
||||
max_shells = 5
|
||||
caliber = "7.62mm"
|
||||
@@ -17,14 +18,21 @@
|
||||
pump_animation = null
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice //For target practice
|
||||
name = "practice rifle"
|
||||
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."
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "boltaction_p"
|
||||
item_state = "boltaction_p"
|
||||
max_shells = 4
|
||||
ammo_type = /obj/item/ammo_casing/a762/practice
|
||||
|
||||
/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 = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "boltaction_c"
|
||||
item_state = "boltaction_c"
|
||||
max_shells = 5
|
||||
ammo_type = /obj/item/ammo_casing/a762/blank
|
||||
|
||||
// Stole hacky terrible code from doublebarrel shotgun. -Spades
|
||||
@@ -50,21 +58,46 @@
|
||||
else
|
||||
..()
|
||||
|
||||
//Lever actions are the same thing, but bigger.
|
||||
////////////////////////Yee-haw guns////////////////////////
|
||||
|
||||
/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."
|
||||
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."
|
||||
desc = "The Weissen Company Thunderking 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."
|
||||
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in the Mytis system, 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 = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "levergun"
|
||||
item_state = "leveraction"
|
||||
icon_state = "leveraction"
|
||||
max_shells = 5
|
||||
max_shells = 6
|
||||
caliber = "7.62mm"
|
||||
load_method = SINGLE_CASING
|
||||
|
||||
/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"
|
||||
desc = "The Weissen Company's version of an iconic manually operated lever action rifle, the Bushhog, 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."
|
||||
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in the Mytis system, 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 = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "levergunv"
|
||||
item_state = "leveraction"
|
||||
max_shells = 5
|
||||
caliber = "7.62mm"
|
||||
load_method = SINGLE_CASING
|
||||
|
||||
////////////////////////surplus gun - for derelicts (04/26/2021)////////////////////////
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/surplus
|
||||
name = "surplus rifle"
|
||||
desc = "An ancient weapon from an era long pas, crude in design, but still just as effective as any modern interpretation. Uses 7.62mm rounds."
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "boltaction_s"
|
||||
item_state = "boltaction_p"
|
||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
||||
max_shells = 4
|
||||
slot_flags = null
|
||||
caliber = "7.62mm"
|
||||
origin_tech = list(TECH_COMBAT = 1) // Old(er) as shit rifle doesn't have very good tech.
|
||||
ammo_type = /obj/item/ammo_casing/a762
|
||||
load_method = SINGLE_CASING|SPEEDLOADER
|
||||
action_sound = 'sound/weapons/riflebolt.ogg'
|
||||
pump_animation = null
|
||||
@@ -1,53 +0,0 @@
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle
|
||||
desc = "The Weissen Company Type-19 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 = "The frontier’s largest home-grown firearms manufacturer, the APEX Arms Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in the Mytis system, 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 = 'icons/obj/gun_vr.dmi'
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice //For target practice
|
||||
name = "practice rifle"
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "boltaction_p"
|
||||
item_state = "boltaction_p"
|
||||
max_shells = 4
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
|
||||
max_shells = 5
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever
|
||||
desc = "The Weissen Company Thunderking 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."
|
||||
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in the Mytis system, 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 = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "levergun"
|
||||
max_shells = 6
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever/vintage
|
||||
desc = "The Weissen Company's version of an iconic manually operated lever action rifle, the Bushhog, 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."
|
||||
description_fluff = "The frontier’s largest home-grown firearms manufacturer, the Weissen Company offers a range of high-quality, high-cost hunting rifles and shotguns designed with the wild frontier wilderness - and its wildlife - in mind. \
|
||||
The company operates just one production plant in the Mytis system, 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 = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "levergunv"
|
||||
item_state = "leveraction"
|
||||
max_shells = 5
|
||||
caliber = "7.62mm"
|
||||
load_method = SINGLE_CASING
|
||||
pump_animation = null
|
||||
|
||||
////////////////////////surplus gun - for derelicts (04/26/2021)////////////////////////
|
||||
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/surplus
|
||||
name = "surplus rifle"
|
||||
desc = "An ancient weapon from an era long pas, crude in design, but still just as effective as any modern interpretation. Uses 7.62mm rounds."
|
||||
icon = 'icons/obj/gun_vr.dmi'
|
||||
icon_state = "boltaction_s"
|
||||
item_state = "boltaction_p"
|
||||
fire_sound = 'sound/weapons/Gunshot_generic_rifle.ogg'
|
||||
max_shells = 4
|
||||
slot_flags = null
|
||||
caliber = "7.62mm"
|
||||
origin_tech = list(TECH_COMBAT = 1) // Old(er) as shit rifle doesn't have very good tech.
|
||||
ammo_type = /obj/item/ammo_casing/a762
|
||||
load_method = SINGLE_CASING|SPEEDLOADER
|
||||
action_sound = 'sound/weapons/riflebolt.ogg'
|
||||
pump_animation = null
|
||||
@@ -44,7 +44,6 @@
|
||||
damage = 30
|
||||
armor_penetration = 10
|
||||
|
||||
|
||||
/obj/item/projectile/beam/midlaser
|
||||
damage = 40
|
||||
armor_penetration = 10
|
||||
@@ -282,7 +281,6 @@
|
||||
damage = 5
|
||||
agony = 10
|
||||
|
||||
|
||||
//
|
||||
// Projectile Beam Definitions
|
||||
//
|
||||
@@ -300,3 +298,5 @@
|
||||
muzzle_type = /obj/effect/projectile/muzzle/pointdefense
|
||||
tracer_type = /obj/effect/projectile/tracer/pointdefense
|
||||
impact_type = /obj/effect/projectile/impact/pointdefense
|
||||
|
||||
|
||||
|
||||
@@ -50,6 +50,15 @@
|
||||
tracer_type = /obj/effect/projectile/tracer/laser_blue
|
||||
impact_type = /obj/effect/projectile/impact/laser_blue
|
||||
|
||||
/obj/item/projectile/beam/carbine/blue //double the damage of weaklaser
|
||||
damage = 30
|
||||
icon_state = "bluelaser"
|
||||
light_color = "#0066FF"
|
||||
|
||||
muzzle_type = /obj/effect/projectile/muzzle/laser_blue
|
||||
tracer_type = /obj/effect/projectile/tracer/laser_blue
|
||||
impact_type = /obj/effect/projectile/impact/laser_blue
|
||||
|
||||
/obj/item/projectile/beam/medigun
|
||||
name = "healing beam"
|
||||
icon_state = "healbeam"
|
||||
@@ -83,3 +92,5 @@
|
||||
M.adjustToxLoss(-5)
|
||||
M.adjustOxyLoss(-5)
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user