cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

AS-24 Fix #2 + ignore

Browse Source 
Ignore hides database config for hopeful database fix(?)
This commit is contained in:
SinTwo
2015-08-18 18:09:48 -04:00
parent 4ddf90d8f7
commit 9b51c352ae
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/projectiles/ammunition/boxes.dm
View File

@@ -198,9 +198,21 @@
mag_type = MAGAZINE
caliber = "shotgun"
matter = list(DEFAULT_WALL_MATERIAL = 2200)
ammo_type = /obj/item/ammo_casing/shotgun/pellet
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 24
multiple_sprites = 1
/obj/item/ammo_magazine/g12/beanbag
name = "magazine (12 gauge beanbag)"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
/obj/item/ammo_magazine/g12/pellet
name = "magazine (12 gauge pellet)"
ammo_type = /obj/item/ammo_casing/shotgun/pellet
/obj/item/ammo_magazine/g12/flash
name = "magazine (12 gauge flash)"
ammo_type = /obj/item/ammo_casing/shotgun/flash
/obj/item/ammo_magazine/g12/empty
initial_ammo = 0

2
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -235,7 +235,7 @@
name = "\improper AS-24 automatic shotgun"
desc = "A durable, rugged looking automatic weapon of a make popular on the frontier worlds. Uses 12 gauge shells. It is unmarked."
icon_state = "ashot"
item_state = null
item_state = "arifle"
w_class = 4
force = 10
caliber = "shotgun"