diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 474f33da23b..8e940ca023b 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -8,7 +8,12 @@ /datum/uplink_item/item/ammo/mc9mm name = "9mm Magazine" path = /obj/item/ammo_magazine/mc9mm - desc = "Contains ten rounds of 9mm bullets." + desc = "Contains twelve rounds of 9mm bullets." + +/datum/uplink_item/item/ammo/mc9mm/polymer + name = "AP 9mm Magazine" + path = /obj/item/ammo_magazine/mc9mm/polymer + desc = "Contains twelve rounds of armor-piercing 9mm bullets." /datum/uplink_item/item/ammo/darts name = "Chemical Darts" @@ -18,7 +23,7 @@ /datum/uplink_item/item/ammo/fourty_five name = ".45 Pistol Magazine" path = /obj/item/ammo_magazine/c45m - desc = "Contains seven rounds of .45 bullets." + desc = "Contains nine rounds of .45 bullets." /datum/uplink_item/item/ammo/submachinegundrum name = "Submachine Gun Drum Magazine (.45)" diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 29ec9b85bc2..b5fbcd8e8c7 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -212,6 +212,15 @@ /obj/item/ammo_magazine/mc9mm/empty initial_ammo = 0 +/obj/item/ammo_magazine/mc9mm/polymer + name = "magazine (9mm polymer)" + icon_state = "9x19AP" + mag_type = MAGAZINE + caliber = "9mm" + ammo_type = /obj/item/ammo_casing/c9mm/polymer + max_ammo = 12 + multiple_sprites = 1 + /obj/item/ammo_magazine/mc9mm/flash name = "magazine (9mm flash)" ammo_type = /obj/item/ammo_casing/c9mm/flash diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 1b24dcee0d0..d90883f399f 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -47,6 +47,12 @@ caliber = "trod" projectile_type = /obj/projectile/bullet/trod +/obj/item/ammo_casing/c9mm/polymer + desc = "A 9mm polymer bullet casing." + caliber = "9mm" + projectile_type = /obj/projectile/bullet/pistol/polymer + max_stack = 15 + /obj/item/ammo_casing/c9mm desc = "A 9mm bullet casing." caliber = "9mm" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index dd00bde090a..71196a737f1 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -181,6 +181,10 @@ damage = 20 armor_penetration = 15 +/obj/projectile/bullet/pistol/polymer + damage = 12 + armor_penetration = 30 + /obj/projectile/bullet/pistol/medium damage = 30 armor_penetration = 0 diff --git a/html/changelogs/html/changelogs/Birigilis-Aurora.3Evil.yml b/html/changelogs/html/changelogs/Birigilis-Aurora.3Evil.yml new file mode 100644 index 00000000000..f5dac536eb3 --- /dev/null +++ b/html/changelogs/html/changelogs/Birigilis-Aurora.3Evil.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Baldos + +# 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 Armor-Piericing 9mm Pistol Magazines, currently only available on Antagonist Uplinks." + - spellcheck: "Fixed the Incorrect number of rounds in a magazine that the Uplink displays for both .45 and 9mm." diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 5a61fc36a7b..ac7970fbf5f 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ