mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Adjusts ammunition autolathe costs, makes 7.62 mags printable
This commit is contained in:
@@ -322,6 +322,12 @@
|
|||||||
hidden = 1
|
hidden = 1
|
||||||
category = "Arms and Ammunition"
|
category = "Arms and Ammunition"
|
||||||
|
|
||||||
|
/datum/autolathe/recipe/magazine_arifle
|
||||||
|
name = "ammunition (7.62mm)"
|
||||||
|
path = /obj/item/ammo_magazine/c762
|
||||||
|
hidden = 1
|
||||||
|
category = "Arms and Ammunition"
|
||||||
|
|
||||||
/datum/autolathe/recipe/magazine_smg
|
/datum/autolathe/recipe/magazine_smg
|
||||||
name = "ammunition (9mm top mounted)"
|
name = "ammunition (9mm top mounted)"
|
||||||
path = /obj/item/ammo_magazine/mc9mmt
|
path = /obj/item/ammo_magazine/mc9mmt
|
||||||
@@ -329,7 +335,7 @@
|
|||||||
category = "Arms and Ammunition"
|
category = "Arms and Ammunition"
|
||||||
|
|
||||||
/datum/autolathe/recipe/magazine_carbine
|
/datum/autolathe/recipe/magazine_carbine
|
||||||
name = "ammunition (5.56)"
|
name = "ammunition (5.56mm)"
|
||||||
path = /obj/item/ammo_magazine/a556
|
path = /obj/item/ammo_magazine/a556
|
||||||
hidden = 1
|
hidden = 1
|
||||||
category = "Arms and Ammunition"
|
category = "Arms and Ammunition"
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
icon_state = "T38"
|
icon_state = "T38"
|
||||||
caliber = "357"
|
caliber = "357"
|
||||||
ammo_type = /obj/item/ammo_casing/a357
|
ammo_type = /obj/item/ammo_casing/a357
|
||||||
|
matter = list("metal" = 1260)
|
||||||
max_ammo = 7
|
max_ammo = 7
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
|
|
||||||
@@ -13,6 +14,7 @@
|
|||||||
name = "speed loader (.38)"
|
name = "speed loader (.38)"
|
||||||
icon_state = "38"
|
icon_state = "38"
|
||||||
caliber = "38"
|
caliber = "38"
|
||||||
|
matter = list("metal" = 360)
|
||||||
ammo_type = /obj/item/ammo_casing/c38
|
ammo_type = /obj/item/ammo_casing/c38
|
||||||
max_ammo = 6
|
max_ammo = 6
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -26,6 +28,7 @@
|
|||||||
icon_state = "45"
|
icon_state = "45"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
ammo_type = /obj/item/ammo_casing/c45
|
ammo_type = /obj/item/ammo_casing/c45
|
||||||
|
matter = list("metal" = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
|
||||||
caliber = ".45"
|
caliber = ".45"
|
||||||
max_ammo = 7
|
max_ammo = 7
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -46,6 +49,7 @@
|
|||||||
icon_state = "9x19p"
|
icon_state = "9x19p"
|
||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
|
matter = list("metal" = 600)
|
||||||
caliber = "9mm"
|
caliber = "9mm"
|
||||||
ammo_type = /obj/item/ammo_casing/c9mm
|
ammo_type = /obj/item/ammo_casing/c9mm
|
||||||
max_ammo = 10
|
max_ammo = 10
|
||||||
@@ -61,6 +65,7 @@
|
|||||||
name = "ammunition Box (9mm)"
|
name = "ammunition Box (9mm)"
|
||||||
icon_state = "9mm"
|
icon_state = "9mm"
|
||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
|
matter = list("metal" = 1800)
|
||||||
caliber = "9mm"
|
caliber = "9mm"
|
||||||
ammo_type = /obj/item/ammo_casing/c9mm
|
ammo_type = /obj/item/ammo_casing/c9mm
|
||||||
max_ammo = 30
|
max_ammo = 30
|
||||||
@@ -73,6 +78,7 @@
|
|||||||
icon_state = "9mmt"
|
icon_state = "9mmt"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
ammo_type = /obj/item/ammo_casing/c9mm
|
ammo_type = /obj/item/ammo_casing/c9mm
|
||||||
|
matter = list("metal" = 1200)
|
||||||
caliber = "9mm"
|
caliber = "9mm"
|
||||||
max_ammo = 20
|
max_ammo = 20
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -89,6 +95,7 @@
|
|||||||
icon_state = "9mm"
|
icon_state = "9mm"
|
||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
caliber = ".45"
|
caliber = ".45"
|
||||||
|
matter = list("metal" = 2250)
|
||||||
ammo_type = /obj/item/ammo_casing/c45
|
ammo_type = /obj/item/ammo_casing/c45
|
||||||
max_ammo = 30
|
max_ammo = 30
|
||||||
|
|
||||||
@@ -101,6 +108,7 @@
|
|||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = "12mm"
|
caliber = "12mm"
|
||||||
|
matter = list("metal" = 1500)
|
||||||
ammo_type = "/obj/item/ammo_casing/a12mm"
|
ammo_type = "/obj/item/ammo_casing/a12mm"
|
||||||
max_ammo = 20
|
max_ammo = 20
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -114,6 +122,7 @@
|
|||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = "a556"
|
caliber = "a556"
|
||||||
|
matter = list("metal" = 1800)
|
||||||
ammo_type = /obj/item/ammo_casing/a556
|
ammo_type = /obj/item/ammo_casing/a556
|
||||||
max_ammo = 10
|
max_ammo = 10
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -127,6 +136,7 @@
|
|||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = ".50"
|
caliber = ".50"
|
||||||
|
matter = list("metal" = 1260)
|
||||||
ammo_type = /obj/item/ammo_casing/a50
|
ammo_type = /obj/item/ammo_casing/a50
|
||||||
max_ammo = 7
|
max_ammo = 7
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -152,6 +162,7 @@
|
|||||||
origin_tech = "combat=2"
|
origin_tech = "combat=2"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = "a762"
|
caliber = "a762"
|
||||||
|
matter = list("metal" = 4500)
|
||||||
ammo_type = /obj/item/ammo_casing/a762
|
ammo_type = /obj/item/ammo_casing/a762
|
||||||
max_ammo = 50
|
max_ammo = 50
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
@@ -164,6 +175,7 @@
|
|||||||
icon_state = "c762"
|
icon_state = "c762"
|
||||||
mag_type = MAGAZINE
|
mag_type = MAGAZINE
|
||||||
caliber = "a762"
|
caliber = "a762"
|
||||||
|
matter = list("metal" = 1800)
|
||||||
ammo_type = /obj/item/ammo_casing/a762
|
ammo_type = /obj/item/ammo_casing/a762
|
||||||
max_ammo = 20
|
max_ammo = 20
|
||||||
multiple_sprites = 1
|
multiple_sprites = 1
|
||||||
|
|||||||
@@ -66,28 +66,28 @@
|
|||||||
icon_state = "slshell"
|
icon_state = "slshell"
|
||||||
caliber = "shotgun"
|
caliber = "shotgun"
|
||||||
projectile_type = /obj/item/projectile/bullet/shotgun
|
projectile_type = /obj/item/projectile/bullet/shotgun
|
||||||
matter = list("metal" = 12500)
|
matter = list("metal" = 360)
|
||||||
|
|
||||||
/obj/item/ammo_casing/shotgun/pellet
|
/obj/item/ammo_casing/shotgun/pellet
|
||||||
name = "shotgun shell"
|
name = "shotgun shell"
|
||||||
desc = "A 12 gauge shell."
|
desc = "A 12 gauge shell."
|
||||||
icon_state = "gshell"
|
icon_state = "gshell"
|
||||||
projectile_type = /obj/item/projectile/bullet/pellet/shotgun
|
projectile_type = /obj/item/projectile/bullet/pellet/shotgun
|
||||||
matter = list("metal" = 12500)
|
matter = list("metal" = 360)
|
||||||
|
|
||||||
/obj/item/ammo_casing/shotgun/blank
|
/obj/item/ammo_casing/shotgun/blank
|
||||||
name = "shotgun shell"
|
name = "shotgun shell"
|
||||||
desc = "A blank shell."
|
desc = "A blank shell."
|
||||||
icon_state = "blshell"
|
icon_state = "blshell"
|
||||||
projectile_type = /obj/item/projectile/bullet/blank
|
projectile_type = /obj/item/projectile/bullet/blank
|
||||||
matter = list("metal" = 250)
|
matter = list("metal" = 90)
|
||||||
|
|
||||||
/obj/item/ammo_casing/shotgun/beanbag
|
/obj/item/ammo_casing/shotgun/beanbag
|
||||||
name = "beanbag shell"
|
name = "beanbag shell"
|
||||||
desc = "A beanbag shell."
|
desc = "A beanbag shell."
|
||||||
icon_state = "bshell"
|
icon_state = "bshell"
|
||||||
projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
|
projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
|
||||||
matter = list("metal" = 500)
|
matter = list("metal" = 180)
|
||||||
|
|
||||||
//Can stun in one hit if aimed at the head, but
|
//Can stun in one hit if aimed at the head, but
|
||||||
//is blocked by clothing that stops tasers and is vulnerable to EMP
|
//is blocked by clothing that stops tasers and is vulnerable to EMP
|
||||||
@@ -97,7 +97,7 @@
|
|||||||
icon_state = "stunshell"
|
icon_state = "stunshell"
|
||||||
spent_icon = "stunshell-spent"
|
spent_icon = "stunshell-spent"
|
||||||
projectile_type = /obj/item/projectile/energy/electrode/stunshot
|
projectile_type = /obj/item/projectile/energy/electrode/stunshot
|
||||||
matter = list("metal" = 1250, "glass" = 1250)
|
matter = list("metal" = 360, "glass" = 720)
|
||||||
|
|
||||||
/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
|
/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
|
||||||
if(prob(100/severity)) BB = null
|
if(prob(100/severity)) BB = null
|
||||||
@@ -109,7 +109,7 @@
|
|||||||
desc = "A chemical shell used to signal distress or provide illumination."
|
desc = "A chemical shell used to signal distress or provide illumination."
|
||||||
icon_state = "fshell"
|
icon_state = "fshell"
|
||||||
projectile_type = /obj/item/projectile/energy/flash/flare
|
projectile_type = /obj/item/projectile/energy/flash/flare
|
||||||
matter = list("metal" = 250, "glass" = 250)
|
matter = list("metal" = 90, "glass" = 90)
|
||||||
|
|
||||||
/obj/item/ammo_casing/a762
|
/obj/item/ammo_casing/a762
|
||||||
desc = "A 7.62mm bullet casing."
|
desc = "A 7.62mm bullet casing."
|
||||||
@@ -123,6 +123,7 @@
|
|||||||
spent_icon = "lcasing-spent"
|
spent_icon = "lcasing-spent"
|
||||||
caliber = "14.5mm"
|
caliber = "14.5mm"
|
||||||
projectile_type = /obj/item/projectile/bullet/rifle/a145
|
projectile_type = /obj/item/projectile/bullet/rifle/a145
|
||||||
|
matter = list("metal" = 1250)
|
||||||
|
|
||||||
/obj/item/ammo_casing/a556
|
/obj/item/ammo_casing/a556
|
||||||
desc = "A 5.56mm bullet casing."
|
desc = "A 5.56mm bullet casing."
|
||||||
|
|||||||
Reference in New Issue
Block a user