Merge pull request #6654 from scrubmcnoob/Munitions-Express

Munitions Express
This commit is contained in:
Fox McCloud
2017-04-30 03:15:10 -04:00
committed by GitHub
8 changed files with 132 additions and 32 deletions
+25 -14
View File
@@ -64,42 +64,53 @@
max_ammo = 14
/obj/item/ammo_box/shotgun
name = "Ammunition Box (slug)"
icon_state = "slugbox"
name = "Shotgun Speedloader (slug)"
icon_state = "slugloader"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 7
materials = list(MAT_METAL=28000)
multiple_sprites = 1
/obj/item/ammo_box/shotgun/buck
name = "Ammunition Box (buckshot)"
icon_state = "buckshotbox"
name = "Shotgun Speedloader (buckshot)"
icon_state = "buckloader"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
/obj/item/ammo_box/shotgun/dragonsbreath
name = "Shotgun Speedloader (dragonsbreath)"
icon_state = "dragonsbreathloader"
ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
/obj/item/ammo_box/shotgun/stun
name = "Ammunition Box (stun shells)"
icon_state = "stunbox"
name = "Shotgun Speedloader (stun shells)"
icon_state = "stunloader"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
materials = list(MAT_METAL=1750)
/obj/item/ammo_box/shotgun/beanbag
name = "Ammunition Box (beanbag shells)"
icon_state = "beanbagbox"
name = "Shotgun Speedloader (beanbag shells)"
icon_state = "beanbagloader"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
materials = list(MAT_METAL=1750)
/obj/item/ammo_box/shotgun/rubbershot
name = "Ammunition Box (rubbershot shells)"
icon_state = "rubbershotbox"
name = "Shotgun Speedloader (rubbershot shells)"
icon_state = "rubbershotloader"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
materials = list(MAT_METAL=28000)
materials = list(MAT_METAL=1750)
/obj/item/ammo_box/shotgun/tranquilizer
name = "Ammunition Box (tranquilizer darts)"
icon_state = "tranqbox"
name = "Shotgun Speedloader (tranquilizer darts)"
icon_state = "tranqloader"
ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
materials = list(MAT_METAL=1750)
//FOAM DARTS
/obj/item/ammo_box/foambox
name = "ammo box (Foam Darts)"