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

Jump to bottom

Adds HEAP for the F903 [ADMIN-SPAWN ONLY] #4389

Merged
merged 3 commits into from
Sep 21, 2023
Merged

Adds HEAP for the F903 [ADMIN-SPAWN ONLY] #4389

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
c57ac02
adds twe heap
Waseemq1235 Sep 11, 2023
53c7a8f
oops
Waseemq1235 Sep 11, 2023
dfa6d04
/datum/ammo/bullet/heap
Waseemq1235 Sep 11, 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
20 changes: 18 additions & 2 deletions code/modules/projectiles/magazines/rifles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,8 @@
default_ammo = /datum/ammo/bullet/rifle
max_rounds = 30
gun_type = /obj/item/weapon/gun/rifle/rmc_f90
ammo_band_icon = "+m41a_band"
ammo_band_icon_empty = "+m41a_band_e"
ammo_band_icon = "+aug_band"
ammo_band_icon_empty = "+aug_band_e"

/obj/item/ammo_magazine/rifle/rmc_f90/marksman
name = "\improper F903A1 Marksman magazine (10x24mm)"
Expand All @@ -483,3 +483,19 @@
gun_type = /obj/item/weapon/gun/rifle/rmc_f90/scope
max_rounds = 20
ammo_band_color = AMMO_BAND_COLOR_AP
ammo_band_icon = "+aug_dmr_band"
ammo_band_icon_empty = "+aug_dmr_band_e"

/obj/item/ammo_magazine/rifle/rmc_f90/heap
name = "\improper F903 HEAP magazine (10x24mm)"
desc = "A 10mm armor piercing high explosive assault rifle magazine used by the royal marines."
default_ammo = /datum/ammo/bullet/rifle/heap
ammo_band_color = AMMO_BAND_COLOR_HEAP

/obj/item/ammo_magazine/rifle/rmc_f90/marksman/heap
name = "\improper F903A1 Marksman magazine (10x24mm)"
desc = "A 10mm armor piercing high explosive assault rifle magazine used by the royal marines."
icon_state = "aug_dmr"
item_state = "aug_dmr"
default_ammo = /datum/ammo/bullet/rifle/heap
ammo_band_color = AMMO_BAND_COLOR_HEAP
Binary file modified icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi
View file
Open in desktop
Binary file not shown.
Loading