Skip to content

Commit 7a21de3

Browse files
A19 magazine boxes (#838)
1 parent 8651af9 commit 7a21de3

File tree

3 files changed

+41
-3
lines changed

3 files changed

+41
-3
lines changed

code/modules/cm_marines/equipment/weapons.dm

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
/obj/item/storage/box/m56_system
33
name = "\improper M56 smartgun system case"
4-
desc = "A large case containing an M56B Smartgun, M56 combat harness, head mounted sight and powerpack.\nDrag this sprite into you to open it up! NOTE: You cannot put items back inside this case."
4+
desc = "A large case containing an M56A2 Smartgun, M56 combat harness, head mounted sight and powerpack.\nDrag this sprite into you to open it up! NOTE: You cannot put items back inside this case."
55
icon = 'icons/obj/items/storage/kits.dmi'
66
icon_state = "kit_case"
77
w_class = SIZE_HUGE
@@ -14,7 +14,7 @@
1414
. = ..()
1515
new /obj/item/clothing/suit/storage/marine/smartgunner(src)
1616
new /obj/item/weapon/gun/smartgun(src)
17-
new /obj/item/clothing/glasses/night/m56_goggles(src)
17+
new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(src)
1818
new /obj/item/smartgun_battery(src)
1919
for(var/i in 1 to 3)
2020
new /obj/item/ammo_magazine/smartgun(src)

code/modules/projectiles/ammo_boxes/magazine_boxes.dm

+39-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,44 @@
185185
/obj/item/ammo_box/magazine/m49a/heap/empty
186186
empty = TRUE
187187

188+
/obj/item/ammo_box/magazine/m49a/a19
189+
name = "magazine box (A19 HV M49A x 16)"
190+
overlay_gun_type = "_a19"
191+
overlay_ammo_type = "_hv"
192+
overlay_content = "_hv"
193+
num_of_magazines = 10
194+
magazine_type = /obj/item/ammo_magazine/rifle/m49a/custom
195+
196+
/obj/item/ammo_box/magazine/m49a/a19/empty
197+
empty = TRUE
198+
199+
/obj/item/ammo_box/magazine/m49a/a19/impact
200+
name = "magazine box (A19 Impact M49A x 16)"
201+
overlay_ammo_type = "_impact"
202+
overlay_content = "_impact"
203+
magazine_type = /obj/item/ammo_magazine/rifle/m49a/custom/impact
204+
205+
/obj/item/ammo_box/magazine/m49a/a19/impact/empty
206+
empty = TRUE
207+
208+
/obj/item/ammo_box/magazine/m49a/a19/incen
209+
name = "magazine box (A19 Incen M49A x 16)"
210+
overlay_ammo_type = "_incen"
211+
overlay_content = "_incen"
212+
magazine_type = /obj/item/ammo_magazine/rifle/m49a/custom/incendiary
213+
214+
/obj/item/ammo_box/magazine/m49a/a19/incen/empty
215+
empty = TRUE
216+
217+
/obj/item/ammo_box/magazine/m49a/a19/pve
218+
name = "magazine box (A19 DU M49A x 16)"
219+
overlay_ammo_type = "_toxin"
220+
overlay_content = "_incen"
221+
magazine_type = /obj/item/ammo_magazine/rifle/m49a/pve
222+
223+
/obj/item/ammo_box/magazine/m49a/a19/pve/empty
224+
empty = TRUE
225+
188226
//-----------------------XM51 Breaching Scattergun Mag Box-----------------------
189227

190228
/obj/item/ammo_box/magazine/xm51
@@ -480,7 +518,7 @@
480518
//-----------------------M56B Drum Box-----------------------
481519

482520
/obj/item/ammo_box/magazine/m56b
483-
name = "drum box (M56B x 8)"
521+
name = "drum box (M56A2 x 8)"
484522
icon_state = "base_m56b"
485523
overlay_ammo_type = "_reg_heavy"
486524
overlay_gun_type = "_sg"
84 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)