Skip to content

Commit

Permalink
Caustic shotgun rounds. (sojourn-13#4723)
Browse files Browse the repository at this point in the history
* Caustic shotgun rounds.

Credits to @uzkulari_ur for concept, writing and sprites.

New caustic shotgun rounds for the Church, obtainable primarily via the EOTP, but also available in the regulator design disks.

High AP, High Pain, low damage - great for mobs, solid for when you need AP and LTL capacity for some reason.

* Fixes some commenting and moves the disk around
  • Loading branch information
cdb-is-not-good authored Jul 26, 2023
1 parent 1149811 commit 48305d3
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 4 deletions.
5 changes: 5 additions & 0 deletions code/datums/autolathe/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
build_path = /obj/item/ammo_casing/shotgun/plasma_heavy/prespawned
materials = list(MATERIAL_STEEL = 6, MATERIAL_SILVER = 2, MATERIAL_GOLD = 2, MATERIAL_URANIUM = 2)

/datum/design/autolathe/ammo/shotgun_biomatter
name = "shotgun shells box (caustic)"
build_path = /obj/item/ammo_magazine/ammobox/shotgun/biomatter
materials = list(MATERIAL_BIOMATTER = 120) //Double the cost of magnum rounds, i guess? It works.

/datum/design/autolathe/ammo/shotgun_he
name = "20mm shells (HEFI)"
build_path = /obj/item/ammo_casing/shotgun/payload/prespawned
Expand Down
1 change: 1 addition & 0 deletions code/datums/perks/nanogate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
/obj/item/ammo_magazine/ammobox/heavy_rifle_408_small/scrap,
/obj/item/ammo_magazine/ammobox/heavy_rifle_408/hv,
/obj/item/ammo_magazine/ammobox/shotgun/flashshells, //holds 70 shells, its a map item not meant to be common
/obj/item/ammo_magazine/ammobox/shotgun/biomatter,
/obj/item/ammo_magazine/ammobox/shotgun/payload,
/obj/item/ammo_magazine/ammobox/shotgun/incendiary,
/obj/item/ammo_magazine/ammobox/shotgun/scrap_beanbag,
Expand Down
23 changes: 19 additions & 4 deletions code/game/objects/items/weapons/autolathe_disk/absolute_disks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 4
)

//Church shotgun
//Thorn and Rose Pack - both 10mm and 9mm
/obj/item/computer_hardware/hard_drive/portable/design/nt/mk58
disk_name = "Absolute Armory - Thorn and Rose Handgun Pack Plus"
icon_state = "neotheology"
Expand Down Expand Up @@ -160,10 +160,10 @@
/datum/design/autolathe/ammo/shotgun_illumination,
/datum/design/autolathe/ammo/shotgun_pellet = 2,
/datum/design/autolathe/ammo/shotgun = 2,
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 3,
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 3
)

//Church shotgun
//Church Revolver
/obj/item/computer_hardware/hard_drive/portable/design/nt/lemant
disk_name = "Absolute Armory - .40/20mm Pilgrim revolver Plus"
icon_state = "neotheology"
Expand All @@ -180,7 +180,7 @@
/datum/design/autolathe/ammo/shotgun_illumination,
/datum/design/autolathe/ammo/shotgun_pellet = 2,
/datum/design/autolathe/ammo/shotgun = 2,
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 2,
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 2
)

//Church shotgun
Expand All @@ -194,6 +194,7 @@
/datum/design/autolathe/ammo/shotgun_beanbag,
/datum/design/autolathe/ammo/shotgun_blanks = 0,
/datum/design/autolathe/ammo/shotgun_illumination,
/datum/design/autolathe/ammo/shotgun_biomatter = 5
)

//for the EOTP
Expand All @@ -209,6 +210,7 @@
/datum/design/autolathe/ammo/shotgun_illumination,
/datum/design/autolathe/ammo/shotgun_box = 3,
/datum/design/autolathe/ammo/shotgun_pellet_box = 3,
/datum/design/autolathe/ammo/shotgun_biomatter = 3
)

// ENERGY SMALL ARMS
Expand Down Expand Up @@ -702,3 +704,16 @@ obj/item/computer_hardware/hard_drive/portable/design/nt/concillium
/datum/design/bioprinter/nt_cells/small,
/datum/design/bioprinter/nt_cells/small/plasma = 2
)

//for the EOTP

/obj/item/computer_hardware/hard_drive/portable/design/nt_caustic_rounds
disk_name = "Absolute Armory - Caustic Ammunition Pack"
desc = "A rare and expensive disk containing designs for biomatter based caseless ballistic rounds."
icon_state = "neotheology"
license = 20
designs = list(
/datum/design/autolathe/ammo/shotgun_biomatter = 4,
/datum/design/autolathe/ammo/magnum_ammobox_biomatter = 2,
/datum/design/autolathe/ammo/pistol_ammobox_biomatter
)
6 changes: 6 additions & 0 deletions code/modules/core_implant/cruciform/machinery/armaments.dm
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,12 @@
min_cost = 10
path = /obj/item/computer_hardware/hard_drive/portable/design/nt/lightfall

/datum/armament/item/disk/caustic_rounds
name = "Disk - Caustic Ammo"
cost = 20
min_cost = 10
path = /obj/item/computer_hardware/hard_drive/portable/design/nt_caustic_rounds

/datum/armament/item/disk/nukes
name = "Disk - Holy Grenades"
cost = 25
Expand Down
8 changes: 8 additions & 0 deletions code/modules/projectiles/ammunition/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,14 @@
icon_state = "buckshot"
ammo_type = /obj/item/ammo_casing/shotgun/pellet

/obj/item/ammo_magazine/ammobox/shotgun/biomatter
name = "ammunition packet (20mm Biomatter Slug)"
icon_state = "caustic"
desc = "A luxurious wooden box with a bevelled lid, filled to the brim with acrid-smelling paper cartridges, intended for use in a 20mm shotgun. \
The lid is kept on with a fine silken ribbon tied around the top. The ammunition inside is 20mm caustic sabot, \
an armour-piercing delivery system for painful acids designed to debilitate your target."
ammo_type = /obj/item/ammo_casing/shotgun/biomatter

//used in mapping only cases
/obj/item/ammo_magazine/ammobox/shotgun/flashshells
name = "signaling ammunition packet (20mm Illumination)"
Expand Down
13 changes: 13 additions & 0 deletions code/modules/projectiles/ammunition/bullets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,19 @@
/obj/item/ammo_casing/shotgun/plasma_heavy/prespawned
amount = 5

/obj/item/ammo_casing/shotgun/biomatter
name = "shotgun slug"
desc = "A New Testament paper cartridge with caustic sabot, in 20mm. Designed for deep-impact delivery of caustic biomass, \
in a caseless fashion. The cartridge is made of a form of wax paper, designed to burn away and leave nothing to eject after being fired."
icon_state = "s-shell_caustic"
is_caseless = TRUE
caliber = CAL_SHOTGUN
projectile_type = /obj/item/projectile/bullet/shotgun/biomatter
maxamount = 5

/obj/item/ammo_casing/shotgun/biomatter/prespawned
amount = 5


//Can stun in one hit if aimed at the head, but
//is blocked by clothing that stops tasers and is vulnerable to EMP
Expand Down
14 changes: 14 additions & 0 deletions code/modules/projectiles/projectile/bullettypes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,20 @@
affective_ap_range = 4
recoil = 4

/obj/item/projectile/bullet/shotgun/biomatter //Unique niche round. High AP, Low damage, high agony. Good for mob crunching, or AP LTL uses
name = "biomatter slug"
damage_types = list(BURN = 10) // Thin little piece of biomass designed to defeat armor but not really large enough to cause super serious injuries.
agony = 40 // BURNS SO BAD
armor_penetration = 40 //high velocity
penetrating = 0
can_ricochet = FALSE
embed = FALSE
sharp = FALSE
step_delay = 0.95 //slightly slower than a slug
check_armour = ARMOR_BIO //duh.
recoil = 6 //much less damage than slug, much less recoil.


//Railgun
/obj/item/projectile/bullet/shotgun/railgun
nocap_structures = TRUE
Expand Down
Binary file modified icons/obj/ammo.dmi
Binary file not shown.

0 comments on commit 48305d3

Please sign in to comment.