Skip to content

makes the vickland 10 rounds again + 308 HP sprite instead of Inteq #4850

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+30 −34
Open

makes the vickland 10 rounds again + 308 HP sprite instead of Inteq #4850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24117d
makes the vickland 10 rounds again
generalthrax May 20, 2025
dbe1f38
308
generalthrax May 20, 2025
0b87241
rotate
generalthrax May 20, 2025
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
44 changes: 20 additions & 24 deletions _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2985,7 +2985,7 @@
"Tk" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/ammo/a308/hunterspride,
/obj/item/storage/box/ammo/a8_50r,
/turf/open/floor/wood/ebony,
/area/ruin/powered/icemoon/lodge/mainhall)
"To" = (
Expand Down Expand Up @@ -3377,43 +3377,39 @@
"YO" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
/obj/item/ammo_casing/a308{
pixel_y = 11;
projectile_type = null;
/obj/item/ammo_casing/a8_50r{
pixel_x = 0;
pixel_y = -6;
auto_scatter = 0;
auto_rotate = 0
},
/obj/item/ammo_casing/a8_50r{
pixel_x = 6;
pixel_y = -6;
auto_rotate = 0;
auto_scatter = 0
},
/obj/item/ammo_casing/a308{
pixel_y = 3;
projectile_type = null;
/obj/item/ammo_casing/a8_50r{
pixel_x = -6;
pixel_y = -6;
auto_rotate = 0;
auto_scatter = 0
},
/obj/item/ammo_casing/a308{
pixel_y = 11;
/obj/item/ammo_casing/a8_50r{
pixel_x = 6;
projectile_type = null;
pixel_y = 8;
auto_rotate = 0;
auto_scatter = 0
},
/obj/item/ammo_casing/a308{
pixel_y = 11;
pixel_x = -6;
projectile_type = null;
/obj/item/ammo_casing/a8_50r{
pixel_x = 0;
pixel_y = 8;
auto_rotate = 0;
auto_scatter = 0
},
/obj/item/ammo_casing/a308{
pixel_y = 3;
/obj/item/ammo_casing/a8_50r{
pixel_x = -6;
projectile_type = null;
auto_rotate = 0;
auto_scatter = 0
},
/obj/item/ammo_casing/a308{
pixel_y = 3;
pixel_x = 6;
projectile_type = null;
pixel_y = 8;
auto_rotate = 0;
auto_scatter = 0
},
Expand Down
8 changes: 4 additions & 4 deletions code/modules/projectiles/boxes_magazines/ammo_loaders.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@

/obj/item/ammo_box/vickland_a8_50r
name = "stripper clip (8x50mmR)"
desc = "An 8-round stripper clip for the Vickland battle rifle. These rounds do good damage with significant armor penetration."
icon_state = "stripper_8_50r-8"
base_icon_state = "stripper_8_50r"
desc = "An 5-round stripper clip for the Vickland battle rifle. These rounds do good damage with significant armor penetration."
icon_state = "850-5"
base_icon_state = "850"
ammo_type = /obj/item/ammo_casing/a8_50r
max_ammo = 8
max_ammo = 5
multiple_sprites = AMMO_BOX_PER_BULLET
w_class = WEIGHT_CLASS_TINY
instant_load = TRUE
Expand Down
10 changes: 5 additions & 5 deletions code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_rifle_stacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@
/obj/item/storage/box/ammo/a308
name = "box of .308 ammo"
desc = "A box of standard .308 ammo."
icon_state = "a308box"

/obj/item/storage/box/ammo/a308/hunterspride
icon_state = "a308box-HP"

/obj/item/storage/box/ammo/a308/inteq
icon_state = "a308box"

/obj/item/storage/box/ammo/a308/PopulateContents()
var/static/items_inside = list(
/obj/item/ammo_box/magazine/ammo_stack/prefilled/a308 = 4)
Expand All @@ -186,7 +186,7 @@
/obj/item/storage/box/ammo/a308/hp
name = "box of .308 HP ammo"
desc = "A box of standard .308 HP ammo."
icon_state = "a308box"
icon_state = "a308box-hp-hp"

/obj/item/storage/box/ammo/a308/hp/PopulateContents()
var/static/items_inside = list(
Expand All @@ -200,7 +200,7 @@
/obj/item/storage/box/ammo/a308/ap
name = "box of .308 AP ammo"
desc = "A box of standard .308 AP ammo."
icon_state = "a308box"
icon_state = "a308box-hp-ap"

/obj/item/storage/box/ammo/a308/ap/PopulateContents()
var/static/items_inside = list(
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/boxes_magazines/internal/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@
name = "Vickland battle rifle internal magazine"
ammo_type = /obj/item/ammo_casing/a8_50r
caliber = "8x50mmR"
max_ammo = 8
max_ammo = 10
instant_load = TRUE
Binary file modified icons/obj/ammunition/ammo.dmi
View file
Open in desktop
Binary file not shown.
Loading