Merge branch 'master' into abductor-update
This commit is contained in:
@@ -6,6 +6,11 @@
|
||||
caliber = "357"
|
||||
projectile_type = /obj/item/projectile/bullet/a357
|
||||
|
||||
/obj/item/ammo_casing/a357/ap
|
||||
name = ".357 armor-piercing bullet casing"
|
||||
desc = "A .357 armor-piercing bullet casing."
|
||||
projectile_type = /obj/item/projectile/bullet/a357/ap
|
||||
|
||||
// 7.62x38mmR (Nagant Revolver)
|
||||
|
||||
/obj/item/ammo_casing/n762
|
||||
@@ -20,9 +25,26 @@
|
||||
name = ".38 rubber bullet casing"
|
||||
desc = "A .38 rubber bullet casing."
|
||||
caliber = "38"
|
||||
projectile_type = /obj/item/projectile/bullet/c38
|
||||
projectile_type = /obj/item/projectile/bullet/c38/rubber
|
||||
|
||||
/obj/item/ammo_casing/c38/lethal
|
||||
name = ".38 bullet casing"
|
||||
desc = "A .38 bullet casing"
|
||||
projectile_type = /obj/item/projectile/bullet/c38lethal
|
||||
projectile_type = /obj/item/projectile/bullet/c38
|
||||
|
||||
/obj/item/ammo_casing/c38/trac
|
||||
name = ".38 TRAC bullet casing"
|
||||
desc = "A .38 \"TRAC\" bullet casing."
|
||||
projectile_type = /obj/item/projectile/bullet/c38/trac
|
||||
|
||||
/obj/item/ammo_casing/c38/hotshot
|
||||
name = ".38 Hot Shot bullet casing"
|
||||
desc = "A .38 Hot Shot bullet casing."
|
||||
caliber = "38"
|
||||
projectile_type = /obj/item/projectile/bullet/c38/hotshot
|
||||
|
||||
/obj/item/ammo_casing/c38/iceblox
|
||||
name = ".38 Iceblox bullet casing"
|
||||
desc = "A .38 Iceblox bullet casing."
|
||||
caliber = "38"
|
||||
projectile_type = /obj/item/projectile/bullet/c38/iceblox
|
||||
Reference in New Issue
Block a user