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

[MIRROR] Reworks, resprites, or in a few cases deletes, shotgun shells including but not limited to skyrat shotgun shells #1225

Merged
merged 1 commit into from
Dec 27, 2023
Merged

[MIRROR] Reworks, resprites, or in a few cases deletes, shotgun shells including but not limited to skyrat shotgun shells #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modular_skyrat/modules/assault_operatives/code/armaments/_armament_primary.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
/datum/armament_entry/assault_operatives/primary/shotgun_ammo/flechette
item_type = /obj/item/ammo_box/advanced/s12gauge/flechette

/datum/armament_entry/assault_operatives/primary/shotgun_ammo/hollowpoint
item_type = /obj/item/ammo_box/advanced/s12gauge/hp
/datum/armament_entry/assault_operatives/primary/shotgun_ammo/magnum
item_type = /obj/item/ammo_box/advanced/s12gauge/magnum

/datum/armament_entry/assault_operatives/primary/shotgun_ammo/beehive
item_type = /obj/item/ammo_box/advanced/s12gauge/beehive
Expand Down
14 changes: 7 additions & 7 deletions modular_skyrat/modules/black_mesa/code/armaments/_armament_primary.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@
/obj/item/storage/box/ammo_box/shotgun_12g

/obj/item/storage/box/ammo_box/shotgun_12g/PopulateContents()
var/funshell = pick(/obj/item/ammo_box/advanced/s12gauge/pt20,
/obj/item/ammo_box/advanced/s12gauge/incendiary,
/obj/item/ammo_box/advanced/s12gauge/flechette,
/obj/item/ammo_box/advanced/s12gauge/beehive,
/obj/item/ammo_box/advanced/s12gauge/iceblox,
/obj/item/ammo_box/advanced/s12gauge/rip,
)
var/funshell = pick(
/obj/item/ammo_box/advanced/s12gauge/incendiary,
/obj/item/ammo_box/advanced/s12gauge/flechette,
/obj/item/ammo_box/advanced/s12gauge/beehive,
/obj/item/ammo_box/advanced/s12gauge/antitide,
/obj/item/ammo_box/advanced/s12gauge/express,
)
new /obj/item/ammo_box/advanced/s12gauge/magnum(src)
new /obj/item/ammo_box/advanced/s12gauge(src)
new funshell(src)
19 changes: 12 additions & 7 deletions modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,31 +128,36 @@

/datum/armament_entry/company_import/vitezstvi/shot_shells/slugs
item_type = /obj/item/ammo_box/advanced/s12gauge
description = "A box of 15 slug shells, large singular shots that pack a punch."

/datum/armament_entry/company_import/vitezstvi/shot_shells/buckshot
item_type = /obj/item/ammo_box/advanced/s12gauge/buckshot
description = "A box of 15 buckshot shells, a modest spread of weaker projectiles."

/datum/armament_entry/company_import/vitezstvi/shot_shells/beanbag_slugs
item_type = /obj/item/ammo_box/advanced/s12gauge/bean
description = "A box of 15 beanbag slug shells, large singular beanbags that pack a less-lethal punch."

/datum/armament_entry/company_import/vitezstvi/shot_shells/rubbershot
item_type = /obj/item/ammo_box/advanced/s12gauge/rubber
description = "A box of 15 rubbershot shells, a modest spread of weaker less-lethal projectiles."

/datum/armament_entry/company_import/vitezstvi/shot_shells/magnum_buckshot
item_type = /obj/item/ammo_box/advanced/s12gauge/magnum
description = "A box of 15 magnum buckshot shells, a wider spread of larger projectiles."

/datum/armament_entry/company_import/vitezstvi/shot_shells/express_buckshot
item_type = /obj/item/ammo_box/advanced/s12gauge/express
description = "A box of 15 express buckshot shells, a tighter spread of smaller projectiles."

/datum/armament_entry/company_import/vitezstvi/shot_shells/hunter_slug
item_type = /obj/item/ammo_box/advanced/s12gauge/hunter

/datum/armament_entry/company_import/vitezstvi/shot_shells/flechettes
item_type = /obj/item/ammo_box/advanced/s12gauge/flechette

/datum/armament_entry/company_import/vitezstvi/shot_shells/hornet_nest
item_type = /obj/item/ammo_box/advanced/s12gauge/beehive

/datum/armament_entry/company_import/vitezstvi/shot_shells/stardust
item_type = /obj/item/ammo_box/advanced/s12gauge/antitide

/datum/armament_entry/company_import/vitezstvi/shot_shells/confetti
item_type = /obj/item/ammo_box/advanced/s12gauge/honk
description = "A box of 35 confetti shells, firing a spread of harmless confetti everywhere, yippie!"

// Boxes of kiboko launcher ammo

Expand Down
12 changes: 6 additions & 6 deletions modular_skyrat/modules/opposing_force/code/equipment/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
description = "A box of slug shotgun shells, fires only one big fuck-off bullet that wounds extra hard."
item_type = /obj/item/ammo_box/advanced/s12gauge

/datum/opposing_force_equipment/ammo_exotic/hp_slug
description = "A box of hollow point slug shotgun shells, annihilates unarmoured combatants."
item_type = /obj/item/ammo_box/advanced/s12gauge/hp
/datum/opposing_force_equipment/ammo_exotic/hornet
description = "A box of hornet's nest shotgun shells, a less-lethal pellet spread that bounces towards targets off of walls."
item_type = /obj/item/ammo_box/advanced/s12gauge/beehive

/datum/opposing_force_equipment/ammo_exotic/ap_slug
description = "A box of armour piercing slug shotgun shells, are armoured targets your number one concern? With these shells you'll hardly remember they're wearing any."
item_type = /obj/item/ammo_box/advanced/s12gauge/pt20
/datum/opposing_force_equipment/ammo_exotic/stardust
description = "A box of stardust shotgun shells, a less-lethal spread of embedding electrodes that tire targets that move."
item_type = /obj/item/ammo_box/advanced/s12gauge/antitide

/datum/opposing_force_equipment/ammo_exotic/a357phasic
description = "A speedloader of .357 that ignores structure collision at the cost of some damage."
Expand Down
47 changes: 17 additions & 30 deletions modular_skyrat/modules/shotgunrebalance/code/ammobox.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ammo_box/advanced/s12gauge
name = "Slug ammo box"
desc = "A box of shotgun shells."
desc = "A box of 15 slug shells. Large, singular shots that pack a punch."
icon = 'modular_skyrat/modules/shotgunrebalance/icons/shotbox.dmi'
icon_state = "slug"
ammo_type = /obj/item/ammo_casing/shotgun
Expand All @@ -9,90 +9,77 @@

/obj/item/ammo_box/advanced/s12gauge/buckshot
name = "Buckshot ammo box"
desc = "A box of 15 buckshot shells. These have a modest spread of weaker projectiles."
icon_state = "buckshot"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/rubber
name = "Rubbershot ammo box"
desc = "A box of 15 rubbershot shells. These have a modest spread of weaker, less-lethal projectiles."
icon_state = "rubber"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/bean
name = "Beanbag Slug ammo box"
desc = "A box of 15 beanbag slug shells. These are large, singular beanbags that pack a less-lethal punch."
icon_state = "bean"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/magnum
name = "Magnum Buckshot ammo box"
name = "Magnum blockshot ammo box"
desc = "A box of 15 magnum blockshot shells. The size of the pellet is larger in diameter than the typical shot, but there are less of them inside each shell."
icon_state = "magnum"
ammo_type = /obj/item/ammo_casing/shotgun/magnum
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/express
name = "Express Buckshot ammo box"
name = "Express pelletshot ammo box"
desc = "A box of 15 express pelletshot shells. The size of the pellet is smaller in diameter than the typical shot, but there are more of them inside each shell."
icon_state = "express"
ammo_type = /obj/item/ammo_casing/shotgun/express
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/hp
name = "Hollow Point Slug ammo box"
icon_state = "hollowpoint"
ammo_type = /obj/item/ammo_casing/shotgun/hp
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/hunter
name = "Hunter Buckshot ammo box"
name = "Hunter slug ammo box"
desc = "A box of 15 hunter slug shells. These shotgun slugs excel at damaging the local fauna."
icon_state = "hunter"
ammo_type = /obj/item/ammo_casing/shotgun/hunter
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/pt20
name = "PT-20 Armor Piercing Slug ammo box"
icon_state = "apshell"
ammo_type = /obj/item/ammo_casing/shotgun/pt20
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/rip
name = "RIP Slug ammo box"
icon_state = "rip"
ammo_type = /obj/item/ammo_casing/shotgun/rip
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/flechette
name = "Flechette ammo box"
desc = "A box of 15 flechette shells. Each shell contains a small group of tumbling blades that excel at causing terrible wounds."
icon_state = "flechette"
ammo_type = /obj/item/ammo_casing/shotgun/flechette
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/beehive
name = "B3-HVE 'Beehive' ammo box"
name = "Hornet's nest ammo box"
desc = "A box of 15 hornet's nest shells. These are less-lethal shells that will bounce off walls and direct themselves toward nearby targets."
icon_state = "beehive"
ammo_type = /obj/item/ammo_casing/shotgun/beehive
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/antitide
name = "4NT1-TD3 'Suppressor' ammo box"
name = "Stardust ammo box"
desc = "A box of 15 express pelletshot shells. These are less-lethal and will embed in targets, causing pain on movement."
icon_state = "antitide"
ammo_type = /obj/item/ammo_casing/shotgun/antitide
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/iceblox
name = "Iceshot ammo box"
icon_state = "iceblox"
ammo_type = /obj/item/ammo_casing/shotgun/iceblox
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/incendiary
name = "Incendiary Slug ammo box"
desc = "A box of 15 incendiary slug shells. These will ignite targets and leave a trail of fire behind them."
icon_state = "incendiary"
ammo_type = /obj/item/ammo_casing/shotgun/incendiary
max_ammo = 15

/obj/item/ammo_box/advanced/s12gauge/honk
name = "Confetti ammo box"
desc = "A box of 35 shotgun shells. These ones contain harmless confetti, yippie!"
icon_state = "honk"
ammo_type = /obj/item/ammo_casing/shotgun/honk
max_ammo = 35
Loading
Loading