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.

Sign up for GitHub

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 barrel charger for the 20mm #648

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adds a barrel charger for the 20mm #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
327e528
allows 20mm sniper to take barrel chargers
irRegularGuy646 Jul 14, 2023
9595e22
i'm stupid
irRegularGuy646 Jul 14, 2023
9375957
adds 20mm specific ABC
irRegularGuy646 Jul 15, 2023
03bcb67
removes it from the tendril chest loot table
irRegularGuy646 Jul 15, 2023
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
2 changes: 1 addition & 1 deletion code/_core/datum/loot/lavaland.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@
/loot/lavaland/ai_core
loot_table = list(
/obj/item/weapon/ranged/energy/gatling = 3
)
)
20 changes: 20 additions & 0 deletions code/_core/obj/item/attachment/attachment_barrel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,3 +143,23 @@

value = 1600
rarity = RARITY_MYTHICAL

/obj/item/attachment/barrel/charger/advanced/20
name = "20mm advanced barrel charger"
desc = "SUPERCHARGE TO THE MAX-ER."
desc_extended = "A supermagnetic barrel charger that uses the power of MAGNETS to launch bullets faster and stronger than what could normally occur with gunpowder. Increases damage and projectile speed at the cost of increased recoil and decreased firerate. This one has been modified for use with 20mm Anti-materiel rifles"
icon_state = "barrel_charger_advanced"

attachment_stats = list(
damage_multiplier = 1.5,
projectile_speed = 1.5,
heat_spread = 1.5,

shoot_delay = 1.5,
bullet_color = COLOR_CYAN
)

value = 3000
value_burgerbux = 1

rarity = RARITY_MYTHICAL
4 changes: 2 additions & 2 deletions code/_core/obj/item/attachment/attachment_stock.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

removable = FALSE

/obj/item/attachment/barrel/sniper_20
/obj/item/attachment/stock/sniper_20
name = "20mm barrel"
desc = "Extendong."
desc_extended = ""
Expand All @@ -61,4 +61,4 @@

value = 0

removable = FALSE
removable = FALSE
12 changes: 7 additions & 5 deletions code/_core/obj/item/weapon/ranged/bullet/magazine/rifle/sniper_20.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
dan_mode = TRUE

attachment_whitelist = list(
/obj/item/attachment/barrel/sniper_20 = TRUE,
/obj/item/attachment/stock/sniper_20 = TRUE,

/obj/item/attachment/barrel/charger/advanced/20 = TRUE,

/obj/item/attachment/sight/laser_sight = TRUE,
/obj/item/attachment/sight/quickfire_adapter = TRUE,
Expand Down Expand Up @@ -94,10 +96,10 @@
GENERATE(attachment_sight)
FINALIZE(attachment_sight)

attachment_barrel = new /obj/item/attachment/barrel/sniper_20(src)
INITIALIZE(attachment_barrel)
GENERATE(attachment_barrel)
FINALIZE(attachment_barrel)
attachment_stock = new /obj/item/attachment/stock/sniper_20(src)
INITIALIZE(attachment_stock)
GENERATE(attachment_stock)
FINALIZE(attachment_stock)

. = ..()

Expand Down