Supply packs, autolathe recipes, magazine and box definitions.

This commit is contained in:
mwerezak
2015-02-06 19:58:15 -05:00
parent 39b467c9da
commit 5494b4d8c9
6 changed files with 63 additions and 14 deletions

View File

@@ -31,6 +31,13 @@
max_ammo = 7
multiple_sprites = 1
/obj/item/ammo_magazine/c45f
name = "magazine (.45 flash)"
icon_state = "45"
ammo_type = "/obj/item/ammo_casing/c45f"
max_ammo = 7
multiple_sprites = 1
/obj/item/ammo_magazine/c45r/empty
max_ammo = 0

View File

@@ -79,6 +79,13 @@
load_method = MAGAZINE
mag_type = /obj/item/ammo_magazine/c45r/empty
/obj/item/weapon/gun/projectile/detective/semiauto/flash
ammo_type = "/obj/item/ammo_casing/c45f"
/obj/item/weapon/gun/projectile/detective/semiauto/colt
desc = "A cheap Martian knock-off of a Colt M1911."
ammo_type = "/obj/item/ammo_casing/c45"
/obj/item/weapon/gun/projectile/detective/semiauto/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
..()
if(!loaded.len && empty_mag)

View File

@@ -10,7 +10,7 @@
slot_flags = SLOT_BACK
caliber = "shotgun"
origin_tech = "combat=4;materials=2"
ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
ammo_type = "/obj/item/ammo_casing/shotgun/pellet"
var/recentpump = 0 // to prevent spammage
var/pumped = 0
var/obj/item/ammo_casing/current_shell = null