From 64fd3a11a63f29aeca07e00db22c45ecee380085 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 12 Dec 2018 21:53:24 -0500 Subject: [PATCH] Replaces Ace's ammo with HP Since 9mm has hollow point now. --- code/modules/projectiles/ammunition/magazines_vr.dm | 3 +++ code/modules/projectiles/guns/projectile/pistol_vr.dm | 5 ++++- config/custom_items.txt | 4 ++-- vorestation.dme | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 code/modules/projectiles/ammunition/magazines_vr.dm diff --git a/code/modules/projectiles/ammunition/magazines_vr.dm b/code/modules/projectiles/ammunition/magazines_vr.dm new file mode 100644 index 0000000000..56221e2dde --- /dev/null +++ b/code/modules/projectiles/ammunition/magazines_vr.dm @@ -0,0 +1,3 @@ +/obj/item/ammo_magazine/m9mm/large/preban/hp // Hollow Point Version + name = "magazine (9mm hollow-point)" + ammo_type = /obj/item/ammo_casing/a9mm/hp \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/pistol_vr.dm b/code/modules/projectiles/guns/projectile/pistol_vr.dm index e7e369cebf..7a76b12552 100644 --- a/code/modules/projectiles/guns/projectile/pistol_vr.dm +++ b/code/modules/projectiles/guns/projectile/pistol_vr.dm @@ -6,4 +6,7 @@ /obj/item/weapon/gun/projectile/p92x/large/preban icon_state = "p92x-brown" - magazine_type = /obj/item/ammo_magazine/m9mm/large/preban // Spawns with big magazines that are legal. \ No newline at end of file + magazine_type = /obj/item/ammo_magazine/m9mm/large/preban // Spawns with big magazines that are legal. + +/obj/item/weapon/gun/projectile/p92x/large/preban/hp + magazine_type = /obj/item/ammo_magazine/m9mm/large/preban/hp // Spawns with legal hollow-point mag \ No newline at end of file diff --git a/config/custom_items.txt b/config/custom_items.txt index ae84998507..9f6464f398 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -390,14 +390,14 @@ req_access = 3 { ckey: jertheace character_name: Jeremiah Acacius -item_path: /obj/item/weapon/gun/projectile/p92x/large/preban #Todo: Replace with HP version allowed in the application. +item_path: /obj/item/weapon/gun/projectile/p92x/large/preban/hp req_access = 3 } { ckey: jertheace character_name: Jeremiah Acacius -item_path: /obj/item/ammo_magazine/m9mm/large/preban #Spare ammo. #Todo: Replace with HP version allowed in the application. +item_path: /obj/item/ammo_magazine/m9mm/large/preban/hp req_access = 3 } diff --git a/vorestation.dme b/vorestation.dme index 07d2b1b4ab..e1aab6cdf9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2516,6 +2516,7 @@ #include "code\modules\projectiles\gun.dm" #include "code\modules\projectiles\projectile.dm" #include "code\modules\projectiles\ammunition\magazines.dm" +#include "code\modules\projectiles\ammunition\magazines_vr.dm" #include "code\modules\projectiles\ammunition\magnetic.dm" #include "code\modules\projectiles\ammunition\rounds.dm" #include "code\modules\projectiles\ammunition\smartmag.dm"