From f3c8a6919be4d1b008686508b36b5cb5fa4e71dd Mon Sep 17 00:00:00 2001 From: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com> Date: Fri, 12 Mar 2021 15:02:48 +0000 Subject: [PATCH] Renames 9mm and 10mm to specific cartridges. (#4054) --- .../ammunition/ballistic/pistol.dm | 48 ++++++++++++------- .../boxes_magazines/external/pistol.dm | 27 +++++++---- .../boxes_magazines/external/rifle.dm | 3 +- .../projectiles/guns/ballistic/automatic.dm | 3 +- .../projectiles/guns/ballistic/pistol.dm | 3 +- .../research/designs/autolathe_designs.dm | 6 ++- 6 files changed, 60 insertions(+), 30 deletions(-) diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index 0fa034372de..52d88e5275d 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -1,47 +1,63 @@ // 10mm /obj/item/ammo_casing/c10mm - name = "10mm bullet casing" - desc = "A 10mm bullet casing." +// name = "10mm bullet casing" // SKYRAT EDIT: Original +// desc = "A 10mm bullet casing." // SKYRAT EDIT: Original + name = "10mm Magnum bullet casing" // SKYRAT EDIT + desc = "A 10mm Magnum bullet casing." // SKYRAT EDIT caliber = CALIBER_10MM projectile_type = /obj/projectile/bullet/c10mm /obj/item/ammo_casing/c10mm/ap - name = "10mm armor-piercing bullet casing" - desc = "A 10mm armor-piercing bullet casing." +// name = "10mm armor-piercing bullet casing" // SKYRAT EDIT: Original +// desc = "A 10mm armor-piercing bullet casing." // SKYRAT EDIT: Original + name = "10mm Magnum armor-piercing bullet casing" // SKYRAT EDIT + desc = "A 10mm Magnum bullet casing with an armor-piercing projectile." // SKYRAT EDIT projectile_type = /obj/projectile/bullet/c10mm_ap /obj/item/ammo_casing/c10mm/hp - name = "10mm hollow-point bullet casing" - desc = "A 10mm hollow-point bullet casing." +// name = "10mm hollow-point bullet casing" // SKYRAT EDIT: Original +// desc = "A 10mm hollow-point bullet casing." // SKYRAT EDIT: Original + name = "10mm Magnum hollow-point bullet casing" // SKYRAT EDIT + desc = "A 10mm Magnum bullet casing with a hollow-point projectile." // SKYRAT EDIT projectile_type = /obj/projectile/bullet/c10mm_hp /obj/item/ammo_casing/c10mm/fire - name = "10mm incendiary bullet casing" - desc = "A 10mm incendiary bullet casing." +// name = "10mm incendiary bullet casing" // SKYRAT EDIT: Original +// desc = "A 10mm incendiary bullet casing." // SKYRAT EDIT: Original + name = "10mm Magnum incendiary bullet casing" // SKYRAT EDIT + desc = "A 10mm Magnum bullet casing. This leaves a burning trail and ignites its target." // SKYRAT EDIT projectile_type = /obj/projectile/bullet/incendiary/c10mm // 9mm (Makarov and Stechkin APS) /obj/item/ammo_casing/c9mm - name = "9mm bullet casing" - desc = "A 9mm bullet casing." +// name = "9mm bullet casing" // SKYRAT EDIT: Original +// desc = "A 9mm bullet casing." // SKYRAT EDIT: Original + name = "9x25mm Mk.12 bullet casing" // SKYRAT EDIT + desc = "A modern 9x25mm Mk.12 bullet casing." // SKYRAT EDIT caliber = CALIBER_9MM projectile_type = /obj/projectile/bullet/c9mm /obj/item/ammo_casing/c9mm/ap - name = "9mm armor-piercing bullet casing" - desc = "A 9mm armor-piercing bullet casing." +// name = "9mm armor-piercing bullet casing" // SKYRAT EDIT: Original +// desc = "A 9mm armor-piercing bullet casing." // SKYRAT EDIT: Original + name = "9x25mm Mk.12 armor-piercing bullet casing" // SKYRAT EDIT + desc = "A modern 9x25mm Mk.12 bullet casing. This one fires an armor-piercing projectile." // SKYRAT EDIT projectile_type =/obj/projectile/bullet/c9mm_ap /obj/item/ammo_casing/c9mm/hp - name = "9mm hollow-point bullet casing" - desc = "A 10mm hollow-point bullet casing." +// name = "9mm hollow-point bullet casing" // SKYRAT EDIT: Original +// desc = "A 10mm hollow-point bullet casing." // SKYRAT EDIT: Original + name = "9x25mm Mk.12 hollow-point bullet casing" // SKYRAT EDIT + desc = "A modern 9x25mm Mk.12 bullet casing. This one fires a hollow-point projectile. Very lethal to unarmored opponents." // SKYRAT EDIT projectile_type = /obj/projectile/bullet/c9mm_hp /obj/item/ammo_casing/c9mm/fire - name = "9mm incendiary bullet casing" - desc = "A 9mm incendiary bullet casing." +// name = "9mm incendiary bullet casing" // SKYRAT EDIT: Original +// desc = "A 9mm incendiary bullet casing." // SKYRAT EDIT: Original + name = "9x25mm Mk.12 incendiary bullet casing" // SKYRAT EDIT + desc = "A modern 9x25mm Mk.12 bullet casing. This incendiary round leaves a trail of fire and ignites its target." // SKYRAT EDIT projectile_type = /obj/projectile/bullet/incendiary/c9mm diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 91d76ab1d74..2305635d3c4 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -1,5 +1,6 @@ /obj/item/ammo_box/magazine/m10mm - name = "pistol magazine (10mm)" +// name = "pistol magazine (10mm)" // SKYRAT EDIT: Original + name = "pistol magazine (10mm Magnum)" // SKYRAT EDIT: Calibre rename desc = "A gun magazine." icon_state = "9x19p" ammo_type = /obj/item/ammo_casing/c10mm @@ -20,7 +21,8 @@ icon_state = "[base_icon_state]-[min(ammo_count(), 8)]" /obj/item/ammo_box/magazine/m9mm - name = "pistol magazine (9mm)" +// name = "pistol magazine (9mm)" // SKYRAT EDIT: Original + name = "pistol magazine (9x25mm)" // SKYRAT EDIT: Calibre rename icon_state = "9x19p-8" base_icon_state = "9x19p" ammo_type = /obj/item/ammo_casing/c9mm @@ -32,25 +34,29 @@ icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]" /obj/item/ammo_box/magazine/m9mm/fire - name = "pistol magazine (9mm incendiary)" +// name = "pistol magazine (9mm incendiary)" // SKYRAT EDIT: Original + name = "pistol magazine (9x25mm incendiary)"// SKYRAT EDIT: Calibre rename icon_state = "9x19pI" desc = "A gun magazine. Loaded with rounds which ignite the target." ammo_type = /obj/item/ammo_casing/c9mm/fire /obj/item/ammo_box/magazine/m9mm/hp - name = "pistol magazine (9mm HP)" +// name = "pistol magazine (9mm HP)" // SKYRAT EDIT: Original + name = "pistol magazine (9x25mm HP)" // SKYRAT EDIT: Calibre rename icon_state = "9x19pH" desc= "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing." ammo_type = /obj/item/ammo_casing/c9mm/hp /obj/item/ammo_box/magazine/m9mm/ap - name = "pistol magazine (9mm AP)" +// name = "pistol magazine (9mm AP)" // SKYRAT EDIT: Original + name = "pistol magazine (9x25mm AP)" // SKYRAT EDIT: Calibre rename icon_state = "9x19pA" desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets." ammo_type = /obj/item/ammo_casing/c9mm/ap /obj/item/ammo_box/magazine/m9mm_aps - name = "stechkin pistol magazine (9mm)" +// name = "stechkin pistol magazine (9mm)" // SKYRAT EDIT: Original + name = "stechkin pistol magazine (9x25mm)" // SKYRAT EDIT: Calibre rename icon_state = "9mmaps-15" base_icon_state = "9mmaps" ammo_type = /obj/item/ammo_casing/c9mm @@ -62,17 +68,20 @@ icon_state = "[base_icon_state]-[round(ammo_count(), 5)]" /obj/item/ammo_box/magazine/m9mm_aps/fire - name = "stechkin pistol magazine (9mm incendiary)" +// name = "stechkin pistol magazine (9mm incendiary)" // SKYRAT EDIT: Original + name = "stechkin pistol magazine (9x25mm incendiary)" // SKYRAT EDIT: Calibre rename ammo_type = /obj/item/ammo_casing/c9mm/fire max_ammo = 15 /obj/item/ammo_box/magazine/m9mm_aps/hp - name = "stechkin pistol magazine (9mm HP)" +// name = "stechkin pistol magazine (9mm HP)" // SKYRAT EDIT: Original + name = "stechkin pistol magazine (9x25mm HP)" // SKYRAT EDIT: Calibre rename ammo_type = /obj/item/ammo_casing/c9mm/hp max_ammo = 15 /obj/item/ammo_box/magazine/m9mm_aps/ap - name = "stechkin pistol magazine (9mm AP)" +// name = "stechkin pistol magazine (9mm AP)" // SKYRAT EDIT: Original + name = "stechkin pistol magazine (9x25mm AP)" // SKYRAT EDIT: Calibre rename ammo_type = /obj/item/ammo_casing/c9mm/ap max_ammo = 15 diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index 14c1d1550bd..a0b95a8c525 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -1,5 +1,6 @@ /obj/item/ammo_box/magazine/m10mm/rifle - name = "rifle magazine (10mm)" +// name = "rifle magazine (10mm)" // SKYRAT EDIT: Original + name = "rifle magazine (10mm Magnum)" // SKYRAT EDIT: Calibre rename desc = "A well-worn magazine fitted for the surplus rifle." icon_state = "75-8" base_icon_state = "75" diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 643259cdd27..31ff63140da 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -358,7 +358,8 @@ /obj/item/gun/ballistic/automatic/surplus name = "Surplus Rifle" - desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing." +// desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing." // SKYRAT EDIT: Original + desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm Magnum ammo and its bulky frame prevents one-hand firing." // SKYRAT EDIT: Calibre rename icon_state = "surplus" inhand_icon_state = "moistnugget" worn_icon_state = null diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index e8be55b2195..24e026d8737 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -1,6 +1,7 @@ /obj/item/gun/ballistic/automatic/pistol name = "makarov pistol" - desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." +// desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Original + desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename icon_state = "pistol" w_class = WEIGHT_CLASS_SMALL mag_type = /obj/item/ammo_box/magazine/m9mm diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 2ef182b8580..d269a22765a 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -893,7 +893,8 @@ category = list("hacked", "Security") /datum/design/c10mm - name = "Ammo Box (10mm)" +// name = "Ammo Box (10mm)" // SKYRAT EDIT: Original + name = "Ammo Box (10mm Magnum)" // SKYRAT EDIT: Calibre rename id = "c10mm" build_type = AUTOLATHE materials = list(/datum/material/iron = 30000) @@ -909,7 +910,8 @@ category = list("hacked", "Security") /datum/design/c9mm - name = "Ammo Box (9mm)" +// name = "Ammo Box (9mm)" // SKYRAT EDIT: Original + name = "Ammo Box (9x25mm Mk.12)" // SKYRAT EDIT: Calibre rename id = "c9mm" build_type = AUTOLATHE materials = list(/datum/material/iron = 30000)