diff --git a/code/datums/autolathe/arms.dm b/code/datums/autolathe/arms.dm index 68efa2c96e..7e336cf64d 100644 --- a/code/datums/autolathe/arms.dm +++ b/code/datums/autolathe/arms.dm @@ -137,19 +137,19 @@ path =/obj/item/ammo_magazine/m44 hidden = 1 -/////// 5.56mm -/datum/category_item/autolathe/arms/rifle_556 - name = "rifle magazine (5.56mm)" - path =/obj/item/ammo_magazine/m556 +/////// 5.45mm +/datum/category_item/autolathe/arms/rifle_545 + name = "rifle magazine (5.45mm)" + path =/obj/item/ammo_magazine/m545 hidden = 1 -/datum/category_item/autolathe/arms/rifle_556p - name = "rifle magazine (5.56mm practice)" - path =/obj/item/ammo_magazine/m556/practice +/datum/category_item/autolathe/arms/rifle_545p + name = "rifle magazine (5.45mm practice)" + path =/obj/item/ammo_magazine/m545/practice -/datum/category_item/autolathe/arms/machinegun_556 +/datum/category_item/autolathe/arms/machinegun_545 name = "machinegun box magazine (5.56)" - path =/obj/item/ammo_magazine/m556saw + path =/obj/item/ammo_magazine/m545saw hidden = 1 /////// 7.62 @@ -245,14 +245,14 @@ category = "Arms and Ammunition" hidden = 1 -/datum/category_item/autolathe/arms/rifle_556 - name = "10rnd rifle magazine (5.56mm)" - path =/obj/item/ammo_magazine/m556saw/empty +/datum/category_item/autolathe/arms/rifle_545 + name = "10rnd rifle magazine (5.45mm)" + path =/obj/item/ammo_magazine/m545saw/empty category = "Arms and Ammunition" -/datum/category_item/autolathe/arms/rifle_556m - name = "20rnd rifle magazine (5.56mm)" - path =/obj/item/ammo_magazine/m556sawm/empty +/datum/category_item/autolathe/arms/rifle_545m + name = "20rnd rifle magazine (5.45mm)" + path =/obj/item/ammo_magazine/m545sawm/empty category = "Arms and Ammunition" hidden = 1 @@ -359,15 +359,15 @@ category = "Arms and Ammunition" hidden = 1 */ -/datum/category_item/autolathe/arms/rifle_clip_556 - name = "ammo clip (5.56mm)" - path =/obj/item/ammo_magazine/clip/c556 +/datum/category_item/autolathe/arms/rifle_clip_545 + name = "ammo clip (5.45mm)" + path =/obj/item/ammo_magazine/clip/c545 category = "Arms and Ammunition" hidden = 1 -/datum/category_item/autolathe/arms/rifle_clip_556_practice - name = "ammo clip (5.56mm practice)" - path =/obj/item/ammo_magazine/clip/c556/practice +/datum/category_item/autolathe/arms/rifle_clip_545_practice + name = "ammo clip (5.45mm practice)" + path =/obj/item/ammo_magazine/clip/c545/practice category = "Arms and Ammunition" /datum/category_item/autolathe/arms/rifle_clip_762 diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index d0635ffce6..6c5be7e755 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -156,7 +156,7 @@ contains = list( /obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt/rubber, - /obj/item/ammo_magazine/m556saw + /obj/item/ammo_magazine/m545saw ) cost = 25 containertype = /obj/structure/closet/crate/secure diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm index 03f1296ad9..d644a9eaa8 100644 --- a/code/datums/uplink/ammunition.dm +++ b/code/datums/uplink/ammunition.dm @@ -48,21 +48,21 @@ name = "Anti-Materiel Rifle ammo box (14.5mm)" path = /obj/item/weapon/storage/box/sniperammo -/datum/uplink_item/item/ammo/c556 - name = "Rifle Magazine (5.56mm)" - path = /obj/item/ammo_magazine/m556 +/datum/uplink_item/item/ammo/c545 + name = "Rifle Magazine (5.45mm)" + path = /obj/item/ammo_magazine/m545 -/datum/uplink_item/item/ammo/c556/ext - name = "Rifle Magazine (5.56mm Extended)" - path = /obj/item/ammo_magazine/m556/ext +/datum/uplink_item/item/ammo/c545/ext + name = "Rifle Magazine (5.45mm Extended)" + path = /obj/item/ammo_magazine/m545/ext -/datum/uplink_item/item/ammo/c556/ap - name = "Rifle Magazine (5.56mm AP)" - path = /obj/item/ammo_magazine/m556/ap +/datum/uplink_item/item/ammo/c545/ap + name = "Rifle Magazine (5.45mm AP)" + path = /obj/item/ammo_magazine/m545/ap -/datum/uplink_item/item/ammo/c556/ap/ext - name = "Rifle Magazine (5.56mm AP Extended)" - path = /obj/item/ammo_magazine/m556/ap/ext +/datum/uplink_item/item/ammo/c545/ap/ext + name = "Rifle Magazine (5.45mm AP Extended)" + path = /obj/item/ammo_magazine/m545/ap/ext /datum/uplink_item/item/ammo/c762 name = "Rifle Magazine (7.62mm)" @@ -76,13 +76,13 @@ name = "SMG Magazine (10mm)" path = /obj/item/ammo_magazine/m10mm -/datum/uplink_item/item/ammo/a556 - name = "Machinegun Magazine (5.56mm)" - path = /obj/item/ammo_magazine/m556saw +/datum/uplink_item/item/ammo/a545 + name = "Machinegun Magazine (5.45mm)" + path = /obj/item/ammo_magazine/m545saw -/datum/uplink_item/item/ammo/a556/ap - name = "Machinegun Magazine (5.56mm AP)" - path = /obj/item/ammo_magazine/m556saw/ap +/datum/uplink_item/item/ammo/a545/ap + name = "Machinegun Magazine (5.45mm AP)" + path = /obj/item/ammo_magazine/m545saw/ap /datum/uplink_item/item/ammo/g12 name = "12g Shotgun Ammo Box (Slug)" diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 34b20a9f48..636f74be8f 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -66,15 +66,10 @@ path = /obj/item/weapon/gun/projectile/automatic/c20r /datum/uplink_item/item/visible_weapons/assaultrifle - name = "Assault Rifle (7.62mm)" + name = "Assault Rifle (5.45mm)" item_cost = 75 path = /obj/item/weapon/gun/projectile/automatic/sts35 -/*/datum/uplink_item/item/visible_weapons/bullpuprifle - name = "Assault Rifle (5.56mm)" - item_cost = 7 - path = /obj/item/weapon/gun/projectile/automatic/carbine -*/ /datum/uplink_item/item/visible_weapons/combatshotgun name = "Combat Shotgun" item_cost = 75 diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 05833d0568..2e8373866c 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -288,97 +288,97 @@ name = "ammunition box (10mm haywire)" ammo_type = /obj/item/ammo_casing/a10mm/emp -///////// 5.56mm ///////// +///////// 5.45mm ///////// -/obj/item/ammo_magazine/m556 - name = "magazine (5.56mm)" - icon_state = "m556" +/obj/item/ammo_magazine/m545 + name = "magazine (5.45mm)" + icon_state = "m545" origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE - caliber = "5.56mm" + caliber = "5.45mm" matter = list(DEFAULT_WALL_MATERIAL = 1800) - ammo_type = /obj/item/ammo_casing/a556 + ammo_type = /obj/item/ammo_casing/a545 max_ammo = 20 multiple_sprites = 1 -/obj/item/ammo_magazine/m556/ext - name = "extended magazine (5.56mm)" +/obj/item/ammo_magazine/m545/ext + name = "extended magazine (5.45mm)" matter = list(DEFAULT_WALL_MATERIAL = 2700) max_ammo = 30 -/obj/item/ammo_magazine/m556/empty +/obj/item/ammo_magazine/m545/empty initial_ammo = 0 -/obj/item/ammo_magazine/m556/ext/empty +/obj/item/ammo_magazine/m545/ext/empty initial_ammo = 0 -/obj/item/ammo_magazine/m556/practice - name = "magazine (5.56mm practice)" - ammo_type = /obj/item/ammo_casing/a556p +/obj/item/ammo_magazine/m545/practice + name = "magazine (5.45mm practice)" + ammo_type = /obj/item/ammo_casing/a545p -/obj/item/ammo_magazine/m556/practice/ext - name = "extended magazine (5.56mm practice)" +/obj/item/ammo_magazine/m545/practice/ext + name = "extended magazine (5.45mm practice)" max_ammo = 30 -/obj/item/ammo_magazine/m556/ap - name = "magazine (5.56mm armor-piercing)" - ammo_type = /obj/item/ammo_casing/a556/ap +/obj/item/ammo_magazine/m545/ap + name = "magazine (5.45mm armor-piercing)" + ammo_type = /obj/item/ammo_casing/a545/ap -/obj/item/ammo_magazine/m556/ap/ext - name = "extended magazine (5.56mm armor-piercing)" +/obj/item/ammo_magazine/m545/ap/ext + name = "extended magazine (5.45mm armor-piercing)" max_ammo = 30 -/obj/item/ammo_magazine/m556/small - name = "reduced magazine (5.56mm)" - icon_state = "m556-small" +/obj/item/ammo_magazine/m545/small + name = "reduced magazine (5.45mm)" + icon_state = "m545-small" matter = list(DEFAULT_WALL_MATERIAL = 900) max_ammo = 10 -/obj/item/ammo_magazine/m556/small/empty +/obj/item/ammo_magazine/m545/small/empty initial_ammo = 0 -/obj/item/ammo_magazine/m556/small/practice - name = "magazine (5.56mm practice)" - ammo_type = /obj/item/ammo_casing/a556p +/obj/item/ammo_magazine/m545/small/practice + name = "magazine (5.45mm practice)" + ammo_type = /obj/item/ammo_casing/a545p -/obj/item/ammo_magazine/m556/small/ap - name = "magazine (5.56mm armor-piercing)" - ammo_type = /obj/item/ammo_casing/a556/ap +/obj/item/ammo_magazine/m545/small/ap + name = "magazine (5.45mm armor-piercing)" + ammo_type = /obj/item/ammo_casing/a545/ap -/obj/item/ammo_magazine/clip/c556 - name = "ammo clip (5.56mm)" +/obj/item/ammo_magazine/clip/c545 + name = "ammo clip (5.45mm)" icon_state = "clip_rifle" - caliber = "5.56mm" - ammo_type = /obj/item/ammo_casing/a556 + caliber = "5.45mm" + ammo_type = /obj/item/ammo_casing/a545 matter = list(DEFAULT_WALL_MATERIAL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal max_ammo = 5 multiple_sprites = 1 -/obj/item/ammo_magazine/clip/c556/ap - name = "rifle clip (5.56mm armor-piercing)" - ammo_type = /obj/item/ammo_casing/a556/ap +/obj/item/ammo_magazine/clip/c545/ap + name = "rifle clip (5.45mm armor-piercing)" + ammo_type = /obj/item/ammo_casing/a545/ap -/obj/item/ammo_magazine/clip/c556/practice - name = "rifle clip (5.56mm practice)" - ammo_type = /obj/item/ammo_casing/a556 +/obj/item/ammo_magazine/clip/c545/practice + name = "rifle clip (5.45mm practice)" + ammo_type = /obj/item/ammo_casing/a545 -/obj/item/ammo_magazine/m556saw - name = "magazine box (5.56mm)" - icon_state = "a556" +/obj/item/ammo_magazine/m545saw + name = "magazine box (5.45mm)" + icon_state = "a545" origin_tech = list(TECH_COMBAT = 2) mag_type = MAGAZINE - caliber = "5.56mm" + caliber = "5.45mm" matter = list(DEFAULT_WALL_MATERIAL = 10000) - ammo_type = /obj/item/ammo_casing/a556 + ammo_type = /obj/item/ammo_casing/a545 w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!! max_ammo = 50 multiple_sprites = 1 -/obj/item/ammo_magazine/m556saw/ap - name = "magazine box (5.56mm armor-piercing)" - ammo_type = /obj/item/ammo_casing/a556/ap +/obj/item/ammo_magazine/m545saw/ap + name = "magazine box (5.45mm armor-piercing)" + ammo_type = /obj/item/ammo_casing/a545/ap -/obj/item/ammo_magazine/m556saw/empty +/obj/item/ammo_magazine/m545saw/empty initial_ammo = 0 ///////// .44 Magnum ///////// diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index eb36cae3b1..ed06df7cc2 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -270,33 +270,33 @@ matter = list(DEFAULT_WALL_MATERIAL = 1250) /* - * 5.56mm + * 5.45mm */ -/obj/item/ammo_casing/a556 - desc = "A 5.56mm bullet casing." - caliber = "5.56mm" +/obj/item/ammo_casing/a545 + desc = "A 5.45mm bullet casing." + caliber = "5.45mm" icon_state = "rifle-casing" - projectile_type = /obj/item/projectile/bullet/rifle/a556 + projectile_type = /obj/item/projectile/bullet/rifle/a545 -/obj/item/ammo_casing/a556/ap - desc = "A 5.56mm armor-piercing bullet casing." - projectile_type = /obj/item/projectile/bullet/rifle/a556/ap +/obj/item/ammo_casing/a545/ap + desc = "A 5.45mm armor-piercing bullet casing." + projectile_type = /obj/item/projectile/bullet/rifle/a545/ap -/obj/item/ammo_casing/a556p - desc = "A 5.56mm practice bullet casing." - caliber = "5.56mm" +/obj/item/ammo_casing/a545p + desc = "A 5.45mm practice bullet casing." + caliber = "5.45mm" icon_state = "rifle-casing" // Need to make an icon for these projectile_type = /obj/item/projectile/bullet/rifle/practice -/obj/item/ammo_casing/a556/blank - desc = "A blank 5.56mm bullet casing." +/obj/item/ammo_casing/a545/blank + desc = "A blank 5.45mm bullet casing." projectile_type = /obj/item/projectile/bullet/blank matter = list(DEFAULT_WALL_MATERIAL = 90) -/obj/item/ammo_casing/a556/hp - desc = "A 5.56mm hollow-point bullet casing." - projectile_type = /obj/item/projectile/bullet/rifle/a556/hollow +/obj/item/ammo_casing/a545/hp + desc = "A 5.45mm hollow-point bullet casing." + projectile_type = /obj/item/projectile/bullet/rifle/a545/hollow /* * Misc diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 5abcead8f3..85cb07264f 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -51,17 +51,17 @@ /obj/item/weapon/gun/projectile/automatic/sts35 name = "assault rifle" - desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds. This one is unmarked." + desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds. This one is unmarked." icon_state = "arifle" item_state = null w_class = ITEMSIZE_LARGE force = 10 - caliber = "5.56mm" + caliber = "5.45mm" origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) slot_flags = SLOT_BACK load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/m556 - allowed_magazines = list(/obj/item/ammo_magazine/m556) + magazine_type = /obj/item/ammo_magazine/m545 + allowed_magazines = list(/obj/item/ammo_magazine/m545) one_handed_penalty = 4 @@ -73,7 +73,7 @@ /obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands) ..() - if(istype(ammo_magazine,/obj/item/ammo_magazine/m556/small)) + if(istype(ammo_magazine,/obj/item/ammo_magazine/m545/small)) icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite. else icon_state = (ammo_magazine)? "arifle" : "arifle-empty" @@ -111,7 +111,6 @@ force = 10 caliber = "7.62mm" origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3) - ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore? fire_sound = 'sound/weapons/Gunshot.ogg' slot_flags = SLOT_BACK load_method = MAGAZINE @@ -181,14 +180,13 @@ force = 10 slot_flags = 0 max_shells = 50 - caliber = "5.56mm" + caliber = "5.45mm" origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2) slot_flags = SLOT_BACK - ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore? fire_sound = 'sound/weapons/machinegun.ogg' load_method = MAGAZINE - magazine_type = /obj/item/ammo_magazine/m556saw - allowed_magazines = list(/obj/item/ammo_magazine/m556saw, /obj/item/ammo_magazine/m556) + magazine_type = /obj/item/ammo_magazine/m545saw + allowed_magazines = list(/obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545) one_handed_penalty = 6 @@ -345,7 +343,7 @@ /obj/item/weapon/gun/projectile/automatic/carbine // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. name = "assault carbine" - desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds." + desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.45mm rounds." icon_state = "bullpup" item_state = "bullpup" w_class = ITEMSIZE_LARGE diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 17e2fe1234..8916524344 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -19,7 +19,7 @@ /obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial name = "ceremonial bolt-action rifle" - desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 5.56mm rounds." + desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds." ammo_type = /obj/item/ammo_casing/a762/blank /obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index bab8f8c811..e77f219edc 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -268,7 +268,7 @@ /obj/item/ammo_casing/a12g/stunshell = "12g", /obj/item/ammo_casing/a12g/flash = "12g", /obj/item/ammo_casing/a762 = "7.62mm", - /obj/item/ammo_casing/a556 = "5.56mm" + /obj/item/ammo_casing/a545 = "5.45mm" ) /obj/item/weapon/gun/projectile/pirate/New() diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index c234242678..a6237a604a 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -209,14 +209,14 @@ armor_penetration = -50 penetrating = 0 -/obj/item/projectile/bullet/rifle/a556 +/obj/item/projectile/bullet/rifle/a545 damage = 25 -/obj/item/projectile/bullet/rifle/a556/ap +/obj/item/projectile/bullet/rifle/a545/ap damage = 20 armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds. -/obj/item/projectile/bullet/rifle/a556/hollow +/obj/item/projectile/bullet/rifle/a545/hollow damage = 35 armor_penetration = -50 penetrating = 0 diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 8b9850f164..919193b072 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ