diff --git a/code/game/machinery/autolathe/designs/ammunition.dm b/code/game/machinery/autolathe/designs/ammunition.dm index 37978184307..2d3dd23b535 100644 --- a/code/game/machinery/autolathe/designs/ammunition.dm +++ b/code/game/machinery/autolathe/designs/ammunition.dm @@ -81,6 +81,11 @@ ABSTRACT_TYPE(/singleton/autolathe_recipe/ammunition) path = /obj/item/ammo_magazine/c45m/stendo security_level = SEC_LEVEL_RED +/singleton/autolathe_recipe/ammunition/magazine_fourty_five/extended/rubber + name = "magazine (.45, extended rubber, pistol)" + path = /obj/item/ammo_magazine/c45m/stendo/rubber + security_level = SEC_LEVEL_GREEN + /singleton/autolathe_recipe/ammunition/submachine_mag name = "magazine (.45, submachine gun)" path = /obj/item/ammo_magazine/submachinemag diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index bd2cef7b458..29ec9b85bc2 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -99,6 +99,11 @@ icon_state = "45e" max_ammo = 11 +/obj/item/ammo_magazine/c45m/stendo/rubber + name = "extended magazine (.45 rubber)" + ammo_type = /obj/item/ammo_casing/c45/rubber + icon_state = "r45e" + /obj/item/ammo_magazine/c45m/lebman name = "extended magazine (.45)" desc = "A custom .45 pistol magazine made by welding two together. Has double the capacity of a normal magazine at eighteen rounds." diff --git a/html/changelogs/geeves-rubber_stendos.yml b/html/changelogs/geeves-rubber_stendos.yml new file mode 100644 index 00000000000..9aa05310fe9 --- /dev/null +++ b/html/changelogs/geeves-rubber_stendos.yml @@ -0,0 +1,13 @@ +# Your name. +author: Geeves + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added extended rubber .45 mags to the autolathe." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index fc1e4cdd636..5a61fc36a7b 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ