cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4584 from Novacat/nova-heterochromia

Browse Source 
Replaces Ace's ammo with HP
This commit is contained in:
Spades
2018-12-14 11:29:42 -05:00
committed by GitHub
parent dd0a71d6b4 5742799f74
commit 1c92c06771
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/projectiles/ammunition/magazines_vr.dm Normal file
View File

@@ -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

5
code/modules/projectiles/guns/projectile/pistol_vr.dm
View File

@@ -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.
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

4
config/custom_items.txt
View File

@@ -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 #Spare ammo
req_access = 3
}

1
vorestation.dme
View File

@@ -2518,6 +2518,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"