9mm pistol updates (#4480)

* These aren't supposed to be here!!

* Adds new Security pistol and large capacity magazines

* Removes new pistol from Security spawns

* Removed references of Beretta because it's not one
This commit is contained in:
Spades
2018-01-14 14:45:15 -06:00
committed by Anewbe
parent 20062a5fd2
commit b441ccd6e3
15 changed files with 134 additions and 34 deletions
+23 -11
View File
@@ -81,17 +81,7 @@
/////// 9mm
/obj/item/ammo_magazine/m9mm/flash
ammo_type =/obj/item/ammo_casing/a9mmf
/obj/item/ammo_magazine/m9mm/rubber
name = "magazine (9mm rubber)"
ammo_type =/obj/item/ammo_casing/a9mmr
/obj/item/ammo_magazine/m9mm/practice
name = "magazine (9mm practice)"
ammo_type =/obj/item/ammo_casing/a9mmp
// Full size pistol mags.
/datum/category_item/autolathe/arms/pistol_9mm
name = "pistol magazine (9mm)"
path =/obj/item/ammo_magazine/m9mm
@@ -109,6 +99,28 @@
name = "pistol magazine (9mm flash)"
path =/obj/item/ammo_magazine/m9mm/flash
// Small mags for small or old guns.
/datum/category_item/autolathe/arms/pistol_9mm_compact
name = "compact pistol magazine (9mm)"
path =/obj/item/ammo_magazine/m9mm/compact
hidden = 1
/datum/category_item/autolathe/arms/pistol_9mmr_compact
name = "compact pistol magazine (9mm rubber)"
path =/obj/item/ammo_magazine/m9mm/compact/rubber
hidden = 1 // These are all hidden because they are traitor mags and will otherwise just clutter the Autolathe.
/datum/category_item/autolathe/arms/pistol_9mmp_compact
name = "compact pistol magazine (9mm practice)"
path =/obj/item/ammo_magazine/m9mm/compact/practice
hidden = 1
/datum/category_item/autolathe/arms/pistol_9mmf_compact
name = "compact pistol magazine (9mm flash)"
path =/obj/item/ammo_magazine/m9mm/compact/flash
hidden = 1
// SMG mags
/datum/category_item/autolathe/arms/smg_9mm
name = "top-mounted SMG magazine (9mm)"
path =/obj/item/ammo_magazine/m9mmt
+9
View File
@@ -10,10 +10,19 @@
name = ".357 Speedloader"
path = /obj/item/ammo_magazine/s357
/datum/uplink_item/item/ammo/mc9mm_compact
name = "Compact Pistol Magazine (9mm)"
path = /obj/item/ammo_magazine/m9mm/compact
/datum/uplink_item/item/ammo/mc9mm
name = "Pistol Magazine (9mm)"
path = /obj/item/ammo_magazine/m9mm
/datum/uplink_item/item/ammo/mc9mm_large
name = "Large Capacity Pistol Magazine (9mm)"
path = /obj/item/ammo_magazine/m9mm/large
item_cost = 40
/datum/uplink_item/item/ammo/c45m
name = "Pistol Magazine (.45)"
path = /obj/item/ammo_magazine/m45
+10
View File
@@ -99,6 +99,16 @@
item_cost = 70
path = /obj/item/weapon/gun/projectile/revolver/judge
/datum/uplink_item/item/visible_weapons/pistol_standard_capacity
name = "9mm Pistol"
item_cost = 40
path = /obj/item/weapon/gun/projectile/p92x
/datum/uplink_item/item/visible_weapons/pistol_large_capacity
name = "9mm Pistol (with large capacity magazine)"
item_cost = 70
path = /obj/item/weapon/gun/projectile/p92x/large
/datum/uplink_item/item/visible_weapons/lemat
name = "LeMat"
item_cost = 60