mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
AS-24 Fix #2 + ignore
Ignore hides database config for hopeful database fix(?)
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -9,3 +9,4 @@ Thumbs.db
|
|||||||
data/
|
data/
|
||||||
cfg/
|
cfg/
|
||||||
|
|
||||||
|
code/global.dm
|
||||||
|
|||||||
@@ -198,9 +198,21 @@
|
|||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = "shotgun"
|
caliber = "shotgun"
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 2200)
|
matter = list(DEFAULT_WALL_MATERIAL = 2200)
|
||||||
ammo_type = /obj/item/ammo_casing/shotgun/pellet
|
ammo_type = /obj/item/ammo_casing/shotgun
|
||||||
max_ammo = 24
|
max_ammo = 24
|
||||||
multiple_sprites = 1
|
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
|
/obj/item/ammo_magazine/g12/empty
|
||||||
initial_ammo = 0
|
initial_ammo = 0
|
||||||
|
|||||||
@@ -235,7 +235,7 @@
|
|||||||
name = "\improper AS-24 automatic shotgun"
|
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."
|
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"
|
icon_state = "ashot"
|
||||||
item_state = null
|
item_state = "arifle"
|
||||||
w_class = 4
|
w_class = 4
|
||||||
force = 10
|
force = 10
|
||||||
caliber = "shotgun"
|
caliber = "shotgun"
|
||||||
|
|||||||
Reference in New Issue
Block a user