Skip to content

Commit

Permalink
Autolathable stripper clips and 7.62 polymer rifle. (#3240)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Requested by Apogee.
Makes all stripper clips able to be created at the autolathe, since
they're supposed to be simple, cheap, disposable things, as opposed to
magazines which are more complex and important. They don't get built
with ammo, of course. And the polymer rifle gets changed to being
chambered in 7.62, which has the same stats as .300 blackout. They've
been done in the same PR since it'll add the polymer rifle's 762
speedloader to the autolathe too.

## Why It's Good For The Game
Clips are supposed to be disposable cheap things, when right now they're
equal to speedloaders and magazines. The polymer rifle having a special
bullet type all to itself that you could get only by killing hermits was
a bit befuddling.

## Changelog

:cl:
add: Clips of all kinds (not magazines!) can now be produced on the
autolathe.
del: .300 blackout. The polymer rifle now fires 7.62.
del: Clip cargo packs, as they are now redundant.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Martinpachu authored Aug 3, 2024
1 parent b150aa5 commit b46c784
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
/turf/open/floor/plating,
/area/ruin)
"ii" = (
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/turf/open/floor/wood,
/area/ruin)
"iK" = (
Expand Down Expand Up @@ -1184,8 +1184,8 @@
/area/ruin)
"Tl" = (
/obj/structure/table,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/obj/item/ammo_box/a762_stripper,
/turf/open/floor/concrete,
/area/ruin)
"TH" = (
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
/obj/item/ammo_box/a858, //oh boy stripper clips too
/obj/item/ammo_box/vickland_a308,
/obj/item/ammo_box/a300,
/obj/item/ammo_box/aac_300blk_stripper,
/obj/item/ammo_box/a762_stripper,
/obj/item/ammo_box/amagpellet_claris, //that's the last of the clips
/obj/item/reagent_containers/food/snacks/donut,
/obj/item/kitchen/knife/combat,
Expand Down
12 changes: 0 additions & 12 deletions code/modules/cargo/packs/ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,6 @@
contains = list(/obj/item/ammo_box/amagpellet_claris)
cost = 1000

/datum/supply_pack/ammo/a300
name = ".300 Magnum Stripper Clip Crate"
desc = "Contains a five round .300 Magnum stripper clip for sniper rifles such as the HP Scout."
contains = list(/obj/item/ammo_box/a300)
cost = 750

/datum/supply_pack/ammo/ebr_ammo
name = "M514 EBR .308 Magazine Crate"
desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds."
Expand All @@ -173,12 +167,6 @@
contains = list(/obj/item/ammo_box/magazine/p16)
cost = 1000

/datum/supply_pack/ammo/a850r_ammo
name = "8x50mmR En Bloc Clip Crate"
desc = "Contains a 8x50mmR en bloc clip for rifles like the illestren rifle, containing five rounds."
contains = list(/obj/item/ammo_box/magazine/illestren_a850r)
cost = 250

/datum/supply_pack/ammo/a762_ammo_box
name = "7.62x40mm CLIP Ammo Box Crate"
desc = "Contains a eighty-round 7.62x40mm CLIP box for the SKM rifles."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
icon_state = "survivor_hunter"
icon_living = "survivor_hunter"
projectiletype = null
casingtype = /obj/item/ammo_casing/aac_300blk/recycled
casingtype = /obj/item/ammo_casing/a762_40
projectilesound = 'sound/weapons/gun/rifle/shot.ogg'
ranged = 1
rapid_fire_delay = 6
Expand Down Expand Up @@ -244,7 +244,7 @@
if(prob(20))
l_pocket = /obj/item/reagent_containers/food/snacks/meat/steak/goliath
else if(prob(60))
l_pocket = /obj/item/ammo_box/aac_300blk_stripper
l_pocket = /obj/item/ammo_box/a762_stripper
if(prob(20))
new /obj/item/gun/ballistic/rifle/polymer(loc)
else
Expand Down
16 changes: 0 additions & 16 deletions code/modules/projectiles/ammunition/ballistic/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,6 @@
projectile_type = /obj/projectile/bullet/a762_40
bullet_per_box = 80

// .300 Blackout (Polymer Survivor Rifle)

/obj/item/ammo_casing/aac_300blk
name = ".300 BLK bullet casing"
desc = "A .300 Blackout bullet casing."
icon_state = "rifle-steel"
caliber = ".300 BLK"
projectile_type = /obj/projectile/bullet/aac_300blk
bullet_per_box = 20

/obj/item/ammo_casing/aac_300blk/recycled
name = "recycled .300 BLK bullet casing"
desc = "A recycled .300 Blackout bullet casing."
caliber = ".300 BLK"
projectile_type = /obj/projectile/bullet/aac_300blk

//.308 (M514 EBR & CM-GAL-S)

/obj/item/ammo_casing/a308
Expand Down
20 changes: 14 additions & 6 deletions code/modules/projectiles/boxes_magazines/ammo_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@
multiple_sprites = AMMO_BOX_PER_BULLET
instant_load = TRUE

/obj/item/ammo_box/a858/empty
start_empty = TRUE

// .308 Stripper Clip (Vickland)

/obj/item/ammo_box/vickland_a308
Expand All @@ -149,6 +152,8 @@
w_class = WEIGHT_CLASS_TINY
instant_load = TRUE

/obj/item/ammo_box/vickland_a308/empty
start_empty = TRUE

// .300 Magnum Stripper Clip (Scout)

Expand All @@ -164,19 +169,22 @@

/obj/item/ammo_box/a300/empty
start_empty = TRUE
// .300 Blackout Stripper Clip (Polymer Survivor Rifle)
// 7.62 Stripper Clip (Polymer Survivor Rifle)

/obj/item/ammo_box/aac_300blk_stripper
name = "stripper clip (.300 BLK)"
/obj/item/ammo_box/a762_stripper
name = "stripper clip (7.62)"
desc = "A 5-round stripper clip for makeshift bolt-action rifles. These rounds do good damage with good armor penetration."
icon_state = "300m"
ammo_type = /obj/item/ammo_casing/aac_300blk
caliber = ".300 BLK"
icon_state = "stripper_308-5"
base_icon_state = "stripper_308"
ammo_type = /obj/item/ammo_casing/a762_40
caliber = "7.62x40mm"
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_TINY
instant_load = TRUE

/obj/item/ammo_box/a762_stripper/empty
start_empty = TRUE
// Ferromagnetic Pellet Speed Loader (Claris)

/obj/item/ammo_box/amagpellet_claris
Expand Down
4 changes: 2 additions & 2 deletions code/modules/projectiles/boxes_magazines/internal/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

/obj/item/ammo_box/magazine/internal/boltaction/polymer
name = "polymer bolt action rifle internal magazine"
ammo_type = /obj/item/ammo_casing/aac_300blk
caliber = ".300 BLK"
ammo_type = /obj/item/ammo_casing/a762_40
caliber = "7.62x40mm"
max_ammo = 5

/obj/item/ammo_box/magazine/internal/vickland
Expand Down
6 changes: 3 additions & 3 deletions code/modules/projectiles/guns/ballistic/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,12 @@

/obj/item/gun/ballistic/rifle/polymer
name = "polymer survivor rifle"
desc = "A bolt-action rifle made of scrap, desperation, and luck. Likely to shatter at any moment. Chambered in .300 Blackout."
desc = "A bolt-action rifle made of scrap, desperation, and luck. Likely to shatter at any moment. Chambered in 7.62x40mm."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "crackhead_rifle"
item_state = "crackhead_rifle"
weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_NORMAL
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/polymer
can_be_sawn_off = FALSE
manufacturer = MANUFACTURER_NONE
7 changes: 0 additions & 7 deletions code/modules/projectiles/projectile/bullets/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@
damage = 25
armour_penetration = 20

//.300 BLK (Polymer Survivor Rifle)

/obj/projectile/bullet/aac_300blk
name = ".300 Blackout bullet"
damage = 30
armour_penetration = 20

//7.62x40mm CLIP (SKM Rifles)

/obj/projectile/bullet/a762_40
Expand Down
40 changes: 40 additions & 0 deletions code/modules/research/designs/autolathe_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,46 @@
build_path = /obj/item/circuitboard/machine/pipedispenser
category = list("initial", "Machinery")

/datum/design/illestren_a850rclip
name = "8x50 Stripper Clip"
id = "IllestrenStripClip"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 10000)
build_path = /obj/item/ammo_box/magazine/illestren_a850r/empty
category = list("initial", "Security", "Ammo")

/datum/design/a300clip
name = ".300 Scout Stripper Clip"
id = "ScoutStripClip"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 10000)
build_path = /obj/item/ammo_box/a300/empty
category = list("initial", "Security", "Ammo")

/datum/design/a762_40clip
name = "7.62 Stripper Clip"
id = "PolymerStripClip"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 10000)
build_path = /obj/item/ammo_box/a762_stripper/empty
category = list("initial", "Security", "Ammo")

/datum/design/vickland_a308clip
name = ".308 Stripper Clip"
id = "VicklandStripClip"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 10000)
build_path = /obj/item/ammo_box/vickland_a308/empty
category = list("initial", "Security", "Ammo")

/datum/design/a858clip
name = "8x58 Stripper Clip"
id = "SSGStripClip"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 10000)
build_path = /obj/item/ammo_box/a858/empty
category = list("initial", "Security", "Ammo")

/datum/design/control
name = "Blast Door Controller"
id = "blast"
Expand Down
2 changes: 1 addition & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1886,9 +1886,9 @@
#include "code\modules\buildmode\submodes\basic.dm"
#include "code\modules\buildmode\submodes\boom.dm"
#include "code\modules\buildmode\submodes\copy.dm"
#include "code\modules\buildmode\submodes\lightmaker.dm"
#include "code\modules\buildmode\submodes\delete.dm"
#include "code\modules\buildmode\submodes\fill.dm"
#include "code\modules\buildmode\submodes\lightmaker.dm"
#include "code\modules\buildmode\submodes\map_export.dm"
#include "code\modules\buildmode\submodes\outfit.dm"
#include "code\modules\buildmode\submodes\proccall.dm"
Expand Down

0 comments on commit b46c784

Please sign in to comment.