diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 33ecddf7da..2611ad18d3 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -18,14 +18,26 @@ name = "Pistol Magazine (.45)" path = /obj/item/ammo_magazine/c45m +/datum/uplink_item/item/ammo/c45map + name = "Pistol Magazine (.45 AP)" + path = /obj/item/ammo_magazine/c45m/ap + /datum/uplink_item/item/ammo/tommymag name = "Tommygun Magazine (.45)" path = /obj/item/ammo_magazine/tommymag +/datum/uplink_item/item/ammo/tommymagap + name = "Tommygun Magazine (.45 AP)" + path = /obj/item/ammo_magazine/tommymag/ap + /datum/uplink_item/item/ammo/tommydrum name = "Tommygun Drum Magazine (.45)" path = /obj/item/ammo_magazine/tommydrum - item_cost = 40 // Buy 40 bullets, get 10 free! + item_cost = 40 + +/datum/uplink_item/item/ammo/tommydrumap + name = "Tommygun Drum Magazine (.45 AP)" + path = /obj/item/ammo_magazine/tommydrum/ap /datum/uplink_item/item/ammo/darts name = "Darts" diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index b1cb0964d1..2ca770dff5 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -53,6 +53,10 @@ name = "magazine (.45 flash)" ammo_type = /obj/item/ammo_casing/c45f +/obj/item/ammo_magazine/c45m/ap + name = "magazine (.45 AP)" + ammo_type = /obj/item/ammo_casing/c45ap + /obj/item/ammo_magazine/c45uzi name = "stick magazine (.45)" icon_state = "uzi45" @@ -75,6 +79,10 @@ caliber = ".45" max_ammo = 20 +/obj/item/ammo_magazine/tommymag/ap + name = "tommygun magazine (.45 AP)" + ammo_type = /obj/item/ammo_casing/c45ap + /obj/item/ammo_magazine/tommymag/empty initial_ammo = 0 @@ -88,6 +96,10 @@ caliber = ".45" max_ammo = 50 +/obj/item/ammo_magazine/tommydrum/ap + name = "tommygun drum magazine (.45 AP)" + ammo_type = /obj/item/ammo_casing/c45ap + /obj/item/ammo_magazine/tommydrum/empty initial_ammo = 0 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 51652c4ccf..2fca9a3ffd 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -63,6 +63,12 @@ caliber = ".45" projectile_type = /obj/item/projectile/bullet/pistol/medium +/obj/item/ammo_casing/c45ap + desc = "A .45 Armor-Piercing bullet casing." + caliber = ".45" + icon_state = "r-casing" + projectile_type = /obj/item/projectile/bullet/pistol/medium/ap + /obj/item/ammo_casing/c45p desc = "A .45 practice bullet casing." caliber = ".45" diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index f713f1cf1f..29d130612f 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -127,12 +127,16 @@ damage = 20 /obj/item/projectile/bullet/pistol/ap - damage = 20 + damage = 15 armor_penetration = 30 /obj/item/projectile/bullet/pistol/medium damage = 25 +/obj/item/projectile/bullet/pistol/medium/ap + damage = 20 + armor_penetration = 15 + /obj/item/projectile/bullet/pistol/strong //revolvers and matebas damage = 60 diff --git a/html/changelogs/Anewbe - AP bullets.yml b/html/changelogs/Anewbe - AP bullets.yml new file mode 100644 index 0000000000..7350ffa222 --- /dev/null +++ b/html/changelogs/Anewbe - AP bullets.yml @@ -0,0 +1,36 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added .45 and tommygun AP ammo to the uplink."