Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds A Variant Gauss Round #4028

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,7 @@
/obj/effect/projectile/impact/pgf/rifle
name = "beam impact"
icon_state = "impact_pgf_rifle"

/obj/effect/projectile/impact/gauss
name = "gauss impact"
icon_state = "hc_gauss"
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@

/obj/effect/projectile/muzzle/pgf/rifle
icon_state = "muzzle_pgf_rifle"

/obj/effect/projectile/muzzle/gauss
icon_state = "muzzle_gauss_rifle"
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,6 @@

/obj/effect/projectile/tracer/pgf/rifle
icon_state = "beam_pgf_rifle"

/obj/effect/projectile/tracer/gauss
icon_state = "hc_gauss"
18 changes: 18 additions & 0 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,12 @@
contains = list(/obj/item/storage/box/ammo/ferropellet)
cost = 250

/datum/supply_pack/ammo/hcpellets
name = "High Conductivity Pellet Box Crate"
desc = "Contains a 48-round high conductivity pellet ammo box for gauss guns such as the Claris."
contains = list(/obj/item/storage/box/ammo/ferropellet/hc)
cost = 500

/* ferroslugs */

/datum/supply_pack/ammo/ferroslugboxcrate
Expand All @@ -432,10 +438,22 @@
contains = list(/obj/item/storage/box/ammo/ferroslug)
cost = 250

/datum/supply_pack/ammo/hcslugs
name = "High Conductivity Slug Box Crate"
desc = "Contains a twenty-round high conductivity slug for gauss guns such as the Model-H."
contains = list(/obj/item/storage/box/ammo/ferroslug/hc)
cost = 500

/* ferro lances */

/datum/supply_pack/ammo/ferrolanceboxcrate
name = "Ferromagnetic Lance Box Crate"
desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle."
contains = list(/obj/item/storage/box/ammo/ferrolance)
cost = 250

/datum/supply_pack/ammo/ferrolanceboxcrate
name = "High Conductivity Lance Box Crate"
desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle."
contains = list(/obj/item/storage/box/ammo/ferrolance/hc)
cost = 500
30 changes: 30 additions & 0 deletions code/modules/projectiles/ammunition/special/gauss.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/gauss
var/energy_cost = 100

/obj/item/ammo_casing/caseless/gauss/hc
name = "high conductivity pellet"
desc = "A small crystal-metal pellet."
caliber = "pellet"
icon_state = "hc-pellet"
projectile_type = /obj/projectile/bullet/gauss/hc
auto_rotate = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/gauss
energy_cost = 200

/obj/item/ammo_casing/caseless/gauss/lance
name = "ferromagnetic lance"
desc = "A sharp metal rod."
Expand All @@ -17,6 +27,16 @@
auto_rotate = TRUE
energy_cost = 166

/obj/item/ammo_casing/caseless/gauss/lance/hc
name = "high conductivity lance"
desc = "A sharp crystal-metal lance."
caliber = "lance"
icon_state = "hc-lance"
projectile_type = /obj/projectile/bullet/gauss/lance/hc
auto_rotate = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/gauss
energy_cost = 332

/obj/item/ammo_casing/caseless/gauss/slug
name = "ferromagnetic slug"
desc = "A large metal slug."
Expand All @@ -25,3 +45,13 @@
projectile_type = /obj/projectile/bullet/gauss/slug
auto_rotate = TRUE
energy_cost = 700

/obj/item/ammo_casing/caseless/gauss/slug/hc
name = "high conductivity lance"
desc = "A large crystal-metal slug."
caliber = "slug"
icon_state = "hc-slug"
projectile_type = /obj/projectile/bullet/gauss/slug/hc
auto_rotate = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/gauss
energy_cost = 1400
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,19 @@
/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferropellet = 4)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferropellet/hc
ammo_type = /obj/item/ammo_casing/caseless/gauss/hc

/obj/item/storage/box/ammo/ferropellet/hc
name = "box of high conductivity pellets"
desc = "A box of high conductivity pellets for gauss firearms."
icon_state = "ferropelletsbox"

/obj/item/storage/box/ammo/ferropellet/hc/PopulateContents()
var/static/items_inside = list(
/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferropellet/hc = 4)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug
ammo_type = /obj/item/ammo_casing/caseless/gauss/slug

Expand All @@ -24,6 +37,19 @@
/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug = 4)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug/hc
ammo_type = /obj/item/ammo_casing/caseless/gauss/slug/hc

/obj/item/storage/box/ammo/ferroslug/hc
name = "box of high conductivity slugs"
desc = "A box of high conductivity slugs for gauss firearms."
icon_state = "ferroslugsbox"

/obj/item/storage/box/ammo/ferroslug/hc/PopulateContents()
var/static/items_inside = list(
/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferroslug/hc = 4)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance
ammo_type = /obj/item/ammo_casing/caseless/gauss/lance

Expand All @@ -36,3 +62,16 @@
var/static/items_inside = list(
/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance = 4)
generate_items_inside(items_inside,src)

/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance/hc
ammo_type = /obj/item/ammo_casing/caseless/gauss/lance/hc

/obj/item/storage/box/ammo/ferrolance/hc
name = "box of high conductivity lances"
desc = "A box of high conductivity lances for gauss firearms."
icon_state = "ferrolancesbox"

/obj/item/storage/box/ammo/ferrolance/hc/PopulateContents()
var/static/items_inside = list(
/obj/item/ammo_box/magazine/ammo_stack/prefilled/ferrolance/hc = 4)
generate_items_inside(items_inside,src)
30 changes: 30 additions & 0 deletions code/modules/projectiles/projectile/bullets/gauss.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
light_color = MOVABLE_LIGHT
light_range = 3

/obj/projectile/bullet/gauss/hc
name = "ferromagnetic pellet"
damage = 10
armour_penetration = 60
range = 35
hitscan = TRUE
muzzle_type = /obj/effect/projectile/muzzle/gauss
tracer_type = /obj/effect/projectile/tracer/gauss
impact_type = /obj/effect/projectile/impact/gauss

// Ferromagnetic Lance (GAR AR)

/obj/projectile/bullet/gauss/lance
Expand All @@ -17,6 +27,16 @@
damage = 30
armour_penetration = 20

/obj/projectile/bullet/gauss/lance/hc
name = "ferromagnetic lance"
damage = 15
armour_penetration = 80
range = 35
hitscan = TRUE
muzzle_type = /obj/effect/projectile/muzzle/gauss
tracer_type = /obj/effect/projectile/tracer/gauss
impact_type = /obj/effect/projectile/impact/gauss

// Ferromagnetic Slug (Model H)

/obj/projectile/bullet/gauss/slug
Expand All @@ -25,3 +45,13 @@
damage = 50
armour_penetration = -60
speed = 0.8

/obj/projectile/bullet/gauss/slug/hc
name = "ferromagnetic lance"
damage = 25
armour_penetration = 0
range = 35
hitscan = TRUE
muzzle_type = /obj/effect/projectile/muzzle/gauss
tracer_type = /obj/effect/projectile/tracer/gauss
impact_type = /obj/effect/projectile/impact/gauss
Binary file modified icons/obj/ammunition/ammo_bullets.dmi
Binary file not shown.
Binary file modified icons/obj/projectiles_impact.dmi
Binary file not shown.
Binary file modified icons/obj/projectiles_muzzle.dmi
Binary file not shown.
Binary file modified icons/obj/projectiles_tracer.dmi
Binary file not shown.
Loading