From 3e71802a520f913a30523544e77e1d7ab52e8b89 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Tue, 24 Feb 2015 21:23:19 -0500 Subject: [PATCH] Replaces colt signal pistol with a Mk58 version. Makes more sense for the HoP, and ensures the colt remains more of a detective signature item. --- .../crates_lockers/closets/secure/security.dm | 2 +- code/modules/projectiles/guns/projectile/pistol.dm | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 35c4a7f23e5..ab0a42d2908 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -54,7 +54,7 @@ new /obj/item/weapon/storage/box/ids(src) new /obj/item/weapon/storage/box/ids( src ) new /obj/item/weapon/gun/energy/gun(src) - new /obj/item/weapon/gun/projectile/colt/flash(src) + new /obj/item/weapon/gun/projectile/sec/flash(src) new /obj/item/device/flash(src) return diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index b2eb804aecc..f2155fa669d 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -7,11 +7,6 @@ origin_tech = "combat=2;materials=2" load_method = MAGAZINE -/obj/item/weapon/gun/projectile/colt/flash - name = "\improper Colt M1911 signal pistol" - desc = "A cheap Martian knock-off of a Colt M1911. Uses .45 signal flash rounds." - magazine_type = /obj/item/ammo_magazine/c45m/flash - /obj/item/weapon/gun/projectile/colt/detective desc = "A cheap Martian knock-off of a Colt M1911. Uses less-than-lethal .45 rounds." magazine_type = /obj/item/ammo_magazine/c45m/rubber @@ -35,14 +30,18 @@ return 1 /obj/item/weapon/gun/projectile/sec - desc = "A Nanotrasen designed sidearm, found pretty much everywhere humans are. Uses less-than-lethal .45 rounds." + desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses less-than-lethal .45 rounds." name = "\improper NT Mk58" icon_state = "secguncomp" magazine_type = /obj/item/ammo_magazine/c45m/rubber caliber = ".45" - origin_tech = "combat=3;materials=2" + origin_tech = "combat=2;materials=2" load_method = MAGAZINE +/obj/item/weapon/gun/projectile/sec/flash + name = "\improper NT Mk58 signal pistol" + desc = "A NanoTrasen designed sidearm, found pretty much everywhere humans are. Uses .45 signal flash rounds." + magazine_type = /obj/item/ammo_magazine/c45m/flash /obj/item/weapon/gun/projectile/sec/wood desc = "A Nanotrasen designed sidearm, this one has a sweet wooden grip. Uses less-than-lethal .45 rounds."