cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 14:47:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes material costs use sheets amount define (#12887)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-07-09 19:17:37 -04:00
committed by GitHub
co-authored by Guti Cameron Lennox
parent 16fda18c8c
commit 435bb3079d
167 changed files with 1637 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition.dm
+1 -1
View File
@@ -101,7 +101,7 @@
icon = 'icons/obj/ammo.dmi'
slot_flags = SLOT_BELT
item_state = "syringe_kit"
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
throwforce = 5
w_class = ITEMSIZE_SMALL
throw_speed = 4
code/modules/projectiles/ammunition/ammo_boxes.dm
+49 -49
View File
@@ -32,7 +32,7 @@
icon_state = "foambox"
caliber = "foam"
ammo_type = /obj/item/ammo_casing/afoam_dart
matter = list(MAT_PLASTIC = 1800)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.9))
max_ammo = 30
multiple_sprites = null
@@ -41,7 +41,7 @@
desc = "Contains Donk-Soft riot darts. It's Donk or Don't! Ages 18 and up."
icon_state = "foambox_riot"
ammo_type = /obj/item/ammo_casing/afoam_dart/riot
matter = list(MAT_STEEL = 5040, MAT_PLASTIC = 1800)
matter = list(MAT_STEEL = MATERIAL_COST(2.52), MAT_PLASTIC = MATERIAL_COST(0.9))
/*
* Cap
@@ -54,7 +54,7 @@
icon_state = "capbox"
caliber = "caps"
ammo_type = /obj/item/ammo_casing/cap
matter = list(MAT_STEEL = 2040)
matter = list(MAT_STEEL = MATERIAL_COST(1.02))
max_ammo = 24
multiple_sprites = null
@@ -68,7 +68,7 @@
icon_state = "magnum"
caliber = ".357"
ammo_type = /obj/item/ammo_casing/a357
matter = list(MAT_STEEL = 5040)
matter = list(MAT_STEEL = MATERIAL_COST(2.52))
max_ammo = 24
multiple_sprites = 1
@@ -78,7 +78,7 @@
icon_state = "magnum_r"
caliber = ".357"
ammo_type = /obj/item/ammo_casing/a357/rubber
matter = list(MAT_STEEL = 5040)
matter = list(MAT_STEEL = MATERIAL_COST(2.52))
max_ammo = 24
multiple_sprites = 1
@@ -92,7 +92,7 @@
icon_state = "pistol"
caliber = ".38"
ammo_type = /obj/item/ammo_casing/a38
matter = list(MAT_STEEL = 1440)
matter = list(MAT_STEEL = MATERIAL_COST(0.72))
max_ammo = 24
multiple_sprites = 1
@@ -102,7 +102,7 @@
icon_state = "pistol_p"
caliber = ".38"
ammo_type = /obj/item/ammo_casing/a38/rubber
matter = list(MAT_STEEL = 1440)
matter = list(MAT_STEEL = MATERIAL_COST(0.72))
max_ammo = 24
multiple_sprites = 1
@@ -116,7 +116,7 @@
icon_state = "box10mm"
caliber = "10mm"
ammo_type = /obj/item/ammo_casing/a10mm
matter = list(MAT_STEEL = 3000)
matter = list(MAT_STEEL = MATERIAL_COST(1.5))
max_ammo = 40
multiple_sprites = 1
@@ -126,7 +126,7 @@
icon_state = "box10mm-practice"
caliber = "10mm"
ammo_type = /obj/item/ammo_casing/a10mm/practice
matter = list(MAT_STEEL = 2400)
matter = list(MAT_STEEL = MATERIAL_COST(1.2))
max_ammo = 40
multiple_sprites = 1
@@ -136,7 +136,7 @@
icon_state = "box10mm-rubber"
caliber = "10mm"
ammo_type = /obj/item/ammo_casing/a10mm/rubber
matter = list(MAT_STEEL = 2400)
matter = list(MAT_STEEL = MATERIAL_COST(1.2))
max_ammo = 40
multiple_sprites = 1
@@ -146,7 +146,7 @@
icon_state = "box10mm-hw"
caliber = "10mm"
ammo_type = /obj/item/ammo_casing/a10mm/emp
matter = list(MAT_STEEL = 5200, MAT_URANIUM = 4000)
matter = list(MAT_STEEL = MATERIAL_COST(2.6), MAT_URANIUM = MATERIAL_COST(2))
max_ammo = 40
multiple_sprites = 1
@@ -160,7 +160,7 @@
icon_state = "box44"
caliber = ".44"
ammo_type = /obj/item/ammo_casing/a44
matter = list(MAT_STEEL = 5040)
matter = list(MAT_STEEL = MATERIAL_COST(2.52))
max_ammo = 24
multiple_sprites = 1
@@ -170,7 +170,7 @@
icon_state = "box44-rubber"
caliber = ".44"
ammo_type = /obj/item/ammo_casing/a44/rubber
matter = list(MAT_STEEL = 1440)
matter = list(MAT_STEEL = MATERIAL_COST(0.72))
max_ammo = 24
multiple_sprites = 1
@@ -184,7 +184,7 @@
icon_state = "pistol_s"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 1800)
matter = list(MAT_STEEL = MATERIAL_COST(0.9))
max_ammo = 24
multiple_sprites = 1
@@ -194,7 +194,7 @@
icon_state = "pistol_p"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45/practice
matter = list(MAT_STEEL = 1440)
matter = list(MAT_STEEL = MATERIAL_COST(0.72))
max_ammo = 24
multiple_sprites = 1
@@ -204,7 +204,7 @@
icon_state = "pistol_ap"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45/ap
matter = list(MAT_STEEL = 1200, MAT_PLASTEEL = 600)
matter = list(MAT_STEEL = MATERIAL_COST(0.6), MAT_PLASTEEL = MATERIAL_COST(0.3))
max_ammo = 24
multiple_sprites = 1
@@ -214,7 +214,7 @@
icon_state = "pistol_hp"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45/hp
matter = list(MAT_STEEL = 1440, MAT_PLASTIC = 360)
matter = list(MAT_STEEL = MATERIAL_COST(0.72), MAT_PLASTIC = MATERIAL_COST(0.18))
max_ammo = 24
multiple_sprites = 1
@@ -224,7 +224,7 @@
icon_state = "pistol_r"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45/rubber
matter = list(MAT_STEEL = 1440)
matter = list(MAT_STEEL = MATERIAL_COST(0.72))
max_ammo = 24
multiple_sprites = 1
@@ -234,7 +234,7 @@
icon_state = "pistol_hw"
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45/emp
matter = list(MAT_STEEL = 3120, MAT_URANIUM = 2400)
matter = list(MAT_STEEL = MATERIAL_COST(1.56), MAT_URANIUM = MATERIAL_COST(1.2))
max_ammo = 24
multiple_sprites = 1
@@ -248,7 +248,7 @@
icon_state = "slug"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g
matter = list(MAT_STEEL = 2880)
matter = list(MAT_STEEL = MATERIAL_COST(1.44))
max_ammo = 8
multiple_sprites = 1
@@ -258,7 +258,7 @@
icon_state = "buckshot"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/pellet
matter = list(MAT_STEEL = 2880)
matter = list(MAT_STEEL = MATERIAL_COST(1.44))
max_ammo = 8
multiple_sprites = 1
@@ -268,7 +268,7 @@
icon_state = "bean"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/beanbag
matter = list(MAT_STEEL = 1440)
matter = list(MAT_STEEL = MATERIAL_COST(0.72))
max_ammo = 8
multiple_sprites = 1
@@ -278,7 +278,7 @@
icon_state = "stunslug"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/stunshell
matter = list(MAT_STEEL = 2880, MAT_GLASS = 5760)
matter = list(MAT_STEEL = MATERIAL_COST(1.44), MAT_GLASS = MATERIAL_COST(2.88))
max_ammo = 8
multiple_sprites = 1
@@ -288,7 +288,7 @@
icon_state = "emp"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/emp
matter = list(MAT_STEEL = 2880, MAT_URANIUM = 1920)
matter = list(MAT_STEEL = MATERIAL_COST(1.44), MAT_URANIUM = MATERIAL_COST(0.96))
max_ammo = 8
multiple_sprites = 1
@@ -298,7 +298,7 @@
icon_state = "bean"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/flechette
matter = list(MAT_STEEL = 2880, MAT_PLASTEEL = 800)
matter = list(MAT_STEEL = MATERIAL_COST(1.44), MAT_PLASTEEL = MATERIAL_COST(0.4))
max_ammo = 8
multiple_sprites = 1
@@ -308,7 +308,7 @@
icon_state = "practice"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/practice
matter = list(MAT_STEEL = 480)
matter = list(MAT_STEEL = MATERIAL_COST(0.24))
max_ammo = 8
multiple_sprites = 1
@@ -318,7 +318,7 @@
icon_state = "blank"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/blank
matter = list(MAT_STEEL = 720)
matter = list(MAT_STEEL = MATERIAL_COST(0.36))
max_ammo = 8
multiple_sprites = 1
@@ -328,7 +328,7 @@
icon_state = "flash"
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g/flash
matter = list(MAT_STEEL = 720, MAT_GLASS = 720)
matter = list(MAT_STEEL = MATERIAL_COST(0.36), MAT_GLASS = MATERIAL_COST(0.36))
max_ammo = 8
multiple_sprites = 1
@@ -342,7 +342,7 @@
icon_state = "sniper"
caliber = "14.5mm"
ammo_type = /obj/item/ammo_casing/a145
matter = list(MAT_STEEL = 28000, MAT_PLASTEEL = 3500) //CHOMPedit Makes them a bit more expensive
matter = list(MAT_STEEL = MATERIAL_COST(14), MAT_PLASTEEL = MATERIAL_COST(1.75)) //CHOMPedit Makes them a bit more expensive
max_ammo = 7
multiple_sprites = 1
@@ -352,7 +352,7 @@
icon_state = "sniper"
caliber = "14.5mm"
ammo_type = /obj/item/ammo_casing/a145/highvel //CHOMPedit
matter = list(MAT_STEEL = 2800, MAT_PLASTEEL = 7000) //CHOMPedit Makes them a bit more expensive
matter = list(MAT_STEEL = MATERIAL_COST(1.4), MAT_PLASTEEL = MATERIAL_COST(3.5)) //CHOMPedit Makes them a bit more expensive
max_ammo = 7
multiple_sprites = 1
@@ -366,7 +366,7 @@
icon_state = "rifle"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762
matter = list(MAT_STEEL = 6000)
matter = list(MAT_STEEL = MATERIAL_COST(3))
max_ammo = 30
multiple_sprites = 1
@@ -376,7 +376,7 @@
icon_state = "rifle_hp"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762/hp
matter = list(MAT_STEEL = 9000)
matter = list(MAT_STEEL = MATERIAL_COST(4.5))
max_ammo = 30
multiple_sprites = 1
@@ -386,7 +386,7 @@
icon_state = "rifle_ap"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762/ap
matter = list(MAT_STEEL = 9000)
matter = list(MAT_STEEL = MATERIAL_COST(4.5))
max_ammo = 30
multiple_sprites = 1
@@ -396,7 +396,7 @@
icon_state = "rifle_p"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762/practice
matter = list(MAT_STEEL = 2700)
matter = list(MAT_STEEL = MATERIAL_COST(1.35))
max_ammo = 30
multiple_sprites = 1
@@ -406,7 +406,7 @@
icon_state = "rifle_hunter"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762/hunter
matter = list(MAT_STEEL = 6000)
matter = list(MAT_STEEL = MATERIAL_COST(3))
max_ammo = 30
multiple_sprites = 1
@@ -416,7 +416,7 @@
icon_state = "paper_wrap"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762
matter = list(MAT_STEEL = 1600)
matter = list(MAT_STEEL = MATERIAL_COST(0.8))
max_ammo = 8
multiple_sprites = 1
@@ -426,7 +426,7 @@
icon_state = "paper_wrap"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762/blank
matter = list(MAT_STEEL = 720)
matter = list(MAT_STEEL = MATERIAL_COST(0.36))
max_ammo = 8
multiple_sprites = 1
@@ -436,7 +436,7 @@
icon_state = "paper_wrap"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762/hunter
matter = list(MAT_STEEL = 1600)
matter = list(MAT_STEEL = MATERIAL_COST(0.8))
max_ammo = 8
multiple_sprites = 1
@@ -450,7 +450,7 @@
icon_state = "hrifle"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545
matter = list(MAT_STEEL = 5400)
matter = list(MAT_STEEL = MATERIAL_COST(2.7))
max_ammo = 30
multiple_sprites = 1
@@ -460,7 +460,7 @@
icon_state = "hrifle-ap"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/ap
matter = list(MAT_STEEL = 8100)
matter = list(MAT_STEEL = MATERIAL_COST(4.05))
max_ammo = 30
multiple_sprites = 1
@@ -470,7 +470,7 @@
icon_state = "hrifle-hp"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/hp
matter = list(MAT_STEEL = 5400)
matter = list(MAT_STEEL = MATERIAL_COST(2.7))
max_ammo = 30
multiple_sprites = 1
@@ -480,7 +480,7 @@
icon_state = "hrifle-blank"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/practice
matter = list(MAT_STEEL = 2700)
matter = list(MAT_STEEL = MATERIAL_COST(1.35))
max_ammo = 30
multiple_sprites = 1
@@ -490,7 +490,7 @@
icon_state = "hrifle-hunter"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/hunter
matter = list(MAT_STEEL = 5400)
matter = list(MAT_STEEL = MATERIAL_COST(2.7))
max_ammo = 30
multiple_sprites = 1
@@ -500,7 +500,7 @@
icon_state = "hrifle-blank"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/blank
matter = list(MAT_STEEL = 2700)
matter = list(MAT_STEEL = MATERIAL_COST(1.35))
max_ammo = 30
multiple_sprites = 1
@@ -510,7 +510,7 @@
icon_state = "boxhrifle"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545
matter = list(MAT_STEEL = 18000)
matter = list(MAT_STEEL = MATERIAL_COST(9))
max_ammo = 100
multiple_sprites = 1
@@ -520,7 +520,7 @@
icon_state = "boxhrifle-ap"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/ap
matter = list(MAT_STEEL = 27000)
matter = list(MAT_STEEL = MATERIAL_COST(13.5))
max_ammo = 100
multiple_sprites = 1
@@ -530,7 +530,7 @@
icon_state = "boxhrifle-hp"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/hp
matter = list(MAT_STEEL = 18000)
matter = list(MAT_STEEL = MATERIAL_COST(9))
max_ammo = 100
multiple_sprites = 1
@@ -540,7 +540,7 @@
icon_state = "boxhrifle-practice"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/practice
matter = list(MAT_STEEL = 9000)
matter = list(MAT_STEEL = MATERIAL_COST(4.5))
max_ammo = 100
multiple_sprites = 1
@@ -550,6 +550,6 @@
icon_state = "boxhrifle-hunter"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545/hunter
matter = list(MAT_STEEL = 18000)
matter = list(MAT_STEEL = MATERIAL_COST(9))
max_ammo = 100
multiple_sprites = 1
code/modules/projectiles/ammunition/magazines.dm
+48 -48
View File
@@ -30,7 +30,7 @@
icon_state = "toy"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/afoam_dart
matter = list(MAT_PLASTIC = 250)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.125))
caliber = "foam"
max_ammo = 9
multiple_sprites = 1
@@ -48,7 +48,7 @@
icon_state = "toysmg"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/afoam_dart
matter = list(MAT_PLASTIC = 250)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.125))
caliber = "foam"
max_ammo = 20
multiple_sprites = 1
@@ -58,7 +58,7 @@
/obj/item/ammo_magazine/mfoam_dart/smg/riot
ammo_type = /obj/item/ammo_casing/afoam_dart/riot
matter = list(MAT_PLASTIC = 1260, MAT_PLASTIC = 250)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.63), MAT_PLASTIC = MATERIAL_COST(0.125))
///////// .357 /////////
@@ -68,7 +68,7 @@
icon_state = "38"
caliber = ".357"
ammo_type = /obj/item/ammo_casing/a357
matter = list(MAT_STEEL = 1260)
matter = list(MAT_STEEL = MATERIAL_COST(0.63))
max_ammo = 6
multiple_sprites = 1
@@ -94,7 +94,7 @@
desc = "A speedloader for .38 revolvers."
icon_state = "38"
caliber = ".38"
matter = list(MAT_STEEL = 360)
matter = list(MAT_STEEL = MATERIAL_COST(0.18))
ammo_type = /obj/item/ammo_casing/a38
max_ammo = 6
multiple_sprites = 1
@@ -113,7 +113,7 @@
name = "makarov magazine (.38)"
icon_state = "45"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 480)
matter = list(MAT_STEEL = MATERIAL_COST(0.24))
caliber = ".38"
ammo_type = /obj/item/ammo_casing/a38
max_ammo = 8
@@ -128,7 +128,7 @@
name = "magazine (.38)"
icon_state = "m91"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 540)
matter = list(MAT_STEEL = MATERIAL_COST(0.27))
caliber = ".38"
ammo_type = /obj/item/ammo_casing/a38
max_ammo = 10
@@ -145,7 +145,7 @@
icon_state = "45"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.2625)) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45"
max_ammo = 7
multiple_sprites = 1
@@ -183,7 +183,7 @@
icon_state = "uzi45"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 1200)
matter = list(MAT_STEEL = MATERIAL_COST(0.6))
caliber = ".45"
max_ammo = 16
multiple_sprites = 1
@@ -197,7 +197,7 @@
icon_state = "tomstick"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 1500)
matter = list(MAT_STEEL = MATERIAL_COST(0.75))
caliber = ".45"
max_ammo = 20
multiple_sprites = 1
@@ -215,7 +215,7 @@
w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 3750)
matter = list(MAT_STEEL = MATERIAL_COST(1.875))
caliber = ".45"
max_ammo = 50
multiple_sprites = 1
@@ -234,7 +234,7 @@
desc = "A stripper clip for reloading .45 rounds into magazines."
caliber = ".45"
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 675) // metal costs very roughly based around one .45 casing = 75 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.3375)) // metal costs very roughly based around one .45 casing = 75 metal
max_ammo = 9
multiple_sprites = 1
@@ -255,7 +255,7 @@
name = "speedloader (.45)"
icon_state = "45s"
ammo_type = /obj/item/ammo_casing/a45
matter = list(MAT_STEEL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.2625)) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45"
max_ammo = 6
multiple_sprites = 1
@@ -303,7 +303,7 @@
name = "magazine (9mm)"
icon_state = "m91"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 600)
matter = list(MAT_STEEL = MATERIAL_COST(0.3))
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 10
@@ -330,7 +330,7 @@
desc = "\"FOR LAW ENFORCEMENT/MILITARY USE ONLY\" is clearly etched on the magazine. This is probably illegal for you to have." // Remember, Security is not Law Enforcement, so it's illegal for Security to use as well.
icon_state = "m93"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 17
@@ -351,7 +351,7 @@
name = "compact magazine (9mm)"
icon_state = "m92"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 480)
matter = list(MAT_STEEL = MATERIAL_COST(0.24))
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 8
@@ -377,7 +377,7 @@
name = "\improper \"Mäuse\" magazine (9mm)"
icon_state = "9x19p"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 480)
matter = list(MAT_STEEL = MATERIAL_COST(0.24))
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 8
@@ -396,7 +396,7 @@
icon_state = "9mmt"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a9mm
matter = list(MAT_STEEL = 1200)
matter = list(MAT_STEEL = MATERIAL_COST(0.6))
caliber = "9mm"
max_ammo = 20
multiple_sprites = 1
@@ -419,14 +419,14 @@
/obj/item/ammo_magazine/m9mmt/ap
name = "top mounted magazine (9mm armor piercing)"
ammo_type = /obj/item/ammo_casing/a9mm/ap
matter = list(MAT_STEEL = 1000, MAT_PLASTEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_PLASTEEL = MATERIAL_COST(1))
/obj/item/ammo_magazine/m9mmp90
name = "large capacity top mounted magazine (9mm armor-piercing)"
icon_state = "p90"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a9mm/ap
matter = list(MAT_STEEL = 3000)
matter = list(MAT_STEEL = MATERIAL_COST(1.5))
caliber = "9mm"
max_ammo = 50
multiple_sprites = 1
@@ -448,7 +448,7 @@
desc = "A stripper clip for reloading 9mm rounds into magazines."
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/a9mm
matter = list(MAT_STEEL = 540) // metal costs are very roughly based around one 9mm casing = 60 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.27)) // metal costs are very roughly based around one 9mm casing = 60 metal
max_ammo = 9
multiple_sprites = 1
@@ -470,7 +470,7 @@
icon_state = "S9mm"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/a9mm
matter = list(MAT_STEEL = 1200)
matter = list(MAT_STEEL = MATERIAL_COST(0.6))
caliber = "9mm"
max_ammo = 21
multiple_sprites = 1
@@ -479,7 +479,7 @@
desc = "A high capacity double stack magazine made specially for the Advanced SMG. Filled with 21 9mm armor piercing bullets."
icon_state = "S9mm"
ammo_type = /obj/item/ammo_casing/a9mm/ap
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
/obj/item/ammo_magazine/m9mmAdvanced/empty
initial_ammo = 0
@@ -491,7 +491,7 @@
icon_state = "10mm"
mag_type = MAGAZINE
caliber = "10mm"
matter = list(MAT_STEEL = 1500)
matter = list(MAT_STEEL = MATERIAL_COST(0.75))
ammo_type = /obj/item/ammo_casing/a10mm
max_ammo = 20
multiple_sprites = 1
@@ -501,38 +501,38 @@
/obj/item/ammo_magazine/m10mm/practice
name = "magazine (10mm practice)"
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
ammo_type = /obj/item/ammo_casing/a10mm/practice
/obj/item/ammo_magazine/m10mm/rubber
name = "magazine (10mm rubber)"
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
ammo_type = /obj/item/ammo_casing/a10mm/rubber
/obj/item/ammo_magazine/m10mm/emp
name = "magazine (10mm haywire)"
matter = list(MAT_STEEL = 1500, MAT_URANIUM = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_URANIUM = MATERIAL_COST(1))
ammo_type = /obj/item/ammo_casing/a10mm/emp
// Pistol
/obj/item/ammo_magazine/m10mm/pistol
icon_state = "m91"
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
max_ammo = 12
/obj/item/ammo_magazine/m10mm/pistol/practice
name = "magazine (10mm practice)"
matter = list(MAT_STEEL = 800)
matter = list(MAT_STEEL = MATERIAL_COST(0.4))
ammo_type = /obj/item/ammo_casing/a10mm/practice
/obj/item/ammo_magazine/m10mm/pistol/rubber
name = "magazine (10mm rubber)"
matter = list(MAT_STEEL = 800)
matter = list(MAT_STEEL = MATERIAL_COST(0.4))
ammo_type = /obj/item/ammo_casing/a10mm/rubber
/obj/item/ammo_magazine/m10mm/pistol/emp
name = "magazine (10mm haywire)"
matter = list(MAT_STEEL = 1000, MAT_URANIUM = 1500)
matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_URANIUM = MATERIAL_COST(0.75))
ammo_type = /obj/item/ammo_casing/a10mm/emp
/obj/item/ammo_magazine/m10mm/pistol/empty
@@ -545,7 +545,7 @@
icon_state = "m545"
mag_type = MAGAZINE
caliber = "5.45mm"
matter = list(MAT_STEEL = 1800)
matter = list(MAT_STEEL = MATERIAL_COST(0.9))
ammo_type = /obj/item/ammo_casing/a545
max_ammo = 20
multiple_sprites = 1
@@ -568,7 +568,7 @@
// Extended
/obj/item/ammo_magazine/m545/ext
name = "extended magazine (5.45mm)"
matter = list(MAT_STEEL = 2700)
matter = list(MAT_STEEL = MATERIAL_COST(1.35))
max_ammo = 30
/obj/item/ammo_magazine/m545/ext/empty
@@ -590,7 +590,7 @@
/obj/item/ammo_magazine/m545/small
name = "reduced magazine (5.45mm)"
icon_state = "m545-small"
matter = list(MAT_STEEL = 900)
matter = list(MAT_STEEL = MATERIAL_COST(0.45))
max_ammo = 10
/obj/item/ammo_magazine/m545/small/empty
@@ -614,7 +614,7 @@
icon_state = "clip_rifle"
caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a545
matter = list(MAT_STEEL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.225)) // metal costs are very roughly based around one 10mm casing = 180 metal
max_ammo = 5
multiple_sprites = 1
@@ -636,7 +636,7 @@
icon_state = "a545"
mag_type = MAGAZINE
caliber = "5.45mm"
matter = list(MAT_STEEL = 10000)
matter = list(MAT_STEEL = MATERIAL_COST(5))
ammo_type = /obj/item/ammo_casing/a545
w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!!
max_ammo = 50
@@ -660,7 +660,7 @@
icon_state = "m44"
mag_type = MAGAZINE
caliber = ".44"
matter = list(MAT_STEEL = 1260)
matter = list(MAT_STEEL = MATERIAL_COST(0.63))
ammo_type = /obj/item/ammo_casing/a44
max_ammo = 7
multiple_sprites = 1
@@ -679,7 +679,7 @@
desc = "A stripper clip for reloading .44 rounds into magazines."
caliber = ".44"
ammo_type = /obj/item/ammo_casing/a44
matter = list(MAT_STEEL = 1620) // metal costs are very roughly based around one .50 casing = 180 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.81)) // metal costs are very roughly based around one .50 casing = 180 metal
max_ammo = 9
multiple_sprites = 1
@@ -688,7 +688,7 @@
name = "speedloader (.44)"
icon_state = "44"
ammo_type = /obj/item/ammo_casing/a44
matter = list(MAT_STEEL = 1260) //metal costs are very roughly based around 1 .45 casing = 75 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.63)) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".44"
max_ammo = 6
multiple_sprites = 1
@@ -713,7 +713,7 @@
icon_state = "m762-small"
mag_type = MAGAZINE
caliber = "7.62mm"
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 10
multiple_sprites = 1
@@ -729,7 +729,7 @@
/obj/item/ammo_magazine/m762/ext
name = "extended magazine (7.62mm)"
icon_state = "m762"
matter = list(MAT_STEEL = 4000)
matter = list(MAT_STEEL = MATERIAL_COST(2))
max_ammo = 20
/obj/item/ammo_magazine/m762/ext/empty
@@ -745,7 +745,7 @@
icon_state = "enbloc"
mag_type = MAGAZINE
caliber = "7.62mm"
matter = list(MAT_STEEL = 1600)
matter = list(MAT_STEEL = MATERIAL_COST(0.8))
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 8
multiple_sprites = 1
@@ -763,7 +763,7 @@
icon_state = "clip_rifle"
caliber = "7.62mm"
ammo_type = /obj/item/ammo_casing/a762
matter = list(MAT_STEEL = 1000) // metal costs are very roughly based around one 7.62 casing = 200 metal
matter = list(MAT_STEEL = MATERIAL_COST(0.5)) // metal costs are very roughly based around one 7.62 casing = 200 metal
max_ammo = 5
multiple_sprites = 1
@@ -785,7 +785,7 @@
icon_state = "SVD"
mag_type = MAGAZINE
caliber = "7.62mm"
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 10
multiple_sprites = 1
@@ -804,7 +804,7 @@
icon_state = "ashot-mag"
mag_type = MAGAZINE
caliber = "12g"
matter = list(MAT_STEEL = 13000)
matter = list(MAT_STEEL = MATERIAL_COST(6.5))
ammo_type = /obj/item/ammo_casing/a12g
max_ammo = 24
multiple_sprites = 1
@@ -831,7 +831,7 @@
desc = "A metal clip for holding and quickly loading two shotgun shells."
caliber = "12g"
ammo_type = /obj/item/ammo_casing/a12g
matter = list(MAT_STEEL = 1070)
matter = list(MAT_STEEL = MATERIAL_COST(0.535))
max_ammo = 2
multiple_sprites = 1
@@ -839,13 +839,13 @@
name = "ammo clip (12g buckshot)"
icon_state = "12gclipshell"
ammo_type = /obj/item/ammo_casing/a12g/pellet
matter = list(MAT_STEEL = 1070)
matter = list(MAT_STEEL = MATERIAL_COST(0.535))
/obj/item/ammo_magazine/clip/c12g/beanbag
name = "ammo clip (12g beanbag)"
icon_state = "12gclipbean"
ammo_type = /obj/item/ammo_casing/a12g/beanbag
matter = list(MAT_STEEL = 710)
matter = list(MAT_STEEL = MATERIAL_COST(0.355))
///////// .75 Gyrojet /////////
code/modules/projectiles/ammunition/magnetic.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "caseless-mag"
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 1800)
matter = list(MAT_STEEL = MATERIAL_COST(0.9))
var/remaining = 9
preserve_item = 1
code/modules/projectiles/ammunition/rounds.dm
+53 -53
View File
@@ -27,7 +27,7 @@
name = "foam dart"
desc = "It's Donk or Don't! Ages 8 and up."
projectile_type = /obj/item/projectile/bullet/foam_dart
matter = list(MAT_PLASTIC = 60)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.03))
caliber = "foam"
icon = 'icons/obj/gun_toy.dmi'
icon_state = "foamdart"
@@ -37,7 +37,7 @@
name = "riot foam dart"
desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up."
projectile_type = /obj/item/projectile/bullet/foam_dart_riot
matter = list(MAT_STEEL = 210, MAT_PLASTIC = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.105), MAT_PLASTIC = MATERIAL_COST(0.03))
icon_state = "foamdart_riot"
/*
@@ -48,12 +48,12 @@
desc = "A .357 bullet casing."
caliber = ".357"
projectile_type = /obj/item/projectile/bullet/pistol/strong
matter = list(MAT_STEEL = 210)
matter = list(MAT_STEEL = MATERIAL_COST(0.105))
/obj/item/ammo_casing/a357/bb
desc = "A .357 BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/obj/item/ammo_casing/a357/rubber
@@ -61,7 +61,7 @@
caliber = ".357"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a357/flash
desc = "A .357 flash bullet casing."
@@ -83,7 +83,7 @@
desc = "A .38 bullet casing."
caliber = ".38"
projectile_type = /obj/item/projectile/bullet/pistol
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a38/rubber
desc = "A .38 rubber bullet casing."
@@ -95,12 +95,12 @@
desc = "A .38 bullet casing fitted with a single-use ion pulse generator."
icon_state = "empcasing"
projectile_type = /obj/item/projectile/ion/small
matter = list(MAT_STEEL = 130, MAT_URANIUM = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.065), MAT_URANIUM = MATERIAL_COST(0.05))
/obj/item/ammo_casing/a38/bb
desc = "A .38 BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -111,23 +111,23 @@
desc = "A .44 bullet casing."
caliber = ".44"
projectile_type = /obj/item/projectile/bullet/pistol/strong
matter = list(MAT_STEEL = 210)
matter = list(MAT_STEEL = MATERIAL_COST(0.105))
/obj/item/ammo_casing/a44/rubber
icon_state = "r-casing"
desc = "A .44 rubber bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a44/rifle
desc = "A proprietary Hedberg-Hammarstrom .44 bullet casing designed for use in revolving rifles."
projectile_type = /obj/item/projectile/bullet/rifle/a44rifle
matter = list(MAT_STEEL = 210)
matter = list(MAT_STEEL = MATERIAL_COST(0.105))
/obj/item/ammo_casing/a44/bb
desc = "A .44 BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -138,7 +138,7 @@
desc = "A .75 gyrojet rocket sheathe."
caliber = ".75"
projectile_type = /obj/item/projectile/bullet/gyro
matter = list(MAT_STEEL = 4000)
matter = list(MAT_STEEL = MATERIAL_COST(2))
/*
* 9mm
@@ -148,12 +148,12 @@
desc = "A 9mm bullet casing."
caliber = "9mm"
projectile_type = /obj/item/projectile/bullet/pistol
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a9mm/ap
desc = "A 9mm armor-piercing bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/ap
matter = list(MAT_STEEL = 80)
matter = list(MAT_STEEL = MATERIAL_COST(0.04))
/obj/item/ammo_casing/a9mm/hp
desc = "A 9mm hollow-point bullet casing."
@@ -177,7 +177,7 @@
/obj/item/ammo_casing/a9mm/bb
desc = "A 9mm BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -188,48 +188,48 @@
desc = "A .45 bullet casing."
caliber = ".45"
projectile_type = /obj/item/projectile/bullet/pistol/medium
matter = list(MAT_STEEL = 75)
matter = list(MAT_STEEL = MATERIAL_COST(0.0375))
/obj/item/ammo_casing/a45/ap
desc = "A .45 Armor-Piercing bullet casing."
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/medium/ap
matter = list(MAT_STEEL = 50, MAT_PLASTEEL = 25)
matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_PLASTEEL = MATERIAL_COST(0.0125))
/obj/item/ammo_casing/a45/practice
desc = "A .45 practice bullet casing."
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/practice
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a45/rubber
desc = "A .45 rubber bullet casing."
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a45/flash
desc = "A .45 flash shell casing."
icon_state = "r-casing"
projectile_type = /obj/item/projectile/energy/flash
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a45/emp
name = ".45 haywire round"
desc = "A .45 bullet casing fitted with a single-use ion pulse generator."
projectile_type = /obj/item/projectile/ion/small
icon_state = "empcasing"
matter = list(MAT_STEEL = 130, MAT_URANIUM = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.065), MAT_URANIUM = MATERIAL_COST(0.05))
/obj/item/ammo_casing/a45/hp
desc = "A .45 hollow-point bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/medium/hp
matter = list(MAT_STEEL = 60, MAT_PLASTIC = 15)
matter = list(MAT_STEEL = MATERIAL_COST(0.03), MAT_PLASTIC = MATERIAL_COST(0.0075))
/obj/item/ammo_casing/a45/bb
desc = "A .45 BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -240,31 +240,31 @@
desc = "A 10mm bullet casing."
caliber = "10mm"
projectile_type = /obj/item/projectile/bullet/pistol/medium
matter = list(MAT_STEEL = 75)
matter = list(MAT_STEEL = MATERIAL_COST(0.0375))
/obj/item/ammo_casing/a10mm/practice
desc = "A 10mm practice bullet casing."
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/practice
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a10mm/rubber
desc = "A 10mm rubber bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/rubber
icon_state = "r-casing"
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
/obj/item/ammo_casing/a10mm/emp
name = "10mm haywire round"
desc = "A 10mm bullet casing fitted with a single-use ion pulse generator."
projectile_type = /obj/item/projectile/ion/small
icon_state = "empcasing"
matter = list(MAT_STEEL = 130, MAT_URANIUM = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.065), MAT_URANIUM = MATERIAL_COST(0.05))
/obj/item/ammo_casing/a10mm/bb
desc = "A 10mm BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -277,7 +277,7 @@
icon_state = "slshell"
caliber = "12g"
projectile_type = /obj/item/projectile/bullet/shotgun
matter = list(MAT_STEEL = 360)
matter = list(MAT_STEEL = MATERIAL_COST(0.18))
/obj/item/ammo_casing/a12g/pellet
name = "shotgun shell"
@@ -290,21 +290,21 @@
desc = "A blank shell."
icon_state = "blshell"
projectile_type = /obj/item/projectile/bullet/blank
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a12g/practice
name = "shotgun shell"
desc = "A practice shell."
icon_state = "pshell"
projectile_type = /obj/item/projectile/bullet/practice
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a12g/beanbag
name = "beanbag shell"
desc = "A 12 gauge beanbag shell."
icon_state = "bshell"
projectile_type = /obj/item/projectile/bullet/shotgun/beanbag
matter = list(MAT_STEEL = 180)
matter = list(MAT_STEEL = MATERIAL_COST(0.09))
//Can stun in one hit if aimed at the head, but
//is blocked by clothing that stops tasers and is vulnerable to EMP
@@ -313,7 +313,7 @@
desc = "A 12 gauge taser cartridge."
icon_state = "stunshell"
projectile_type = /obj/item/projectile/energy/electrode/stunshot
matter = list(MAT_STEEL = 360, MAT_GLASS = 720)
matter = list(MAT_STEEL = MATERIAL_COST(0.18), MAT_GLASS = MATERIAL_COST(0.36))
/obj/item/ammo_casing/a12g/stunshell/emp_act(severity, recursive)
. = ..()
@@ -328,7 +328,7 @@
desc = "A chemical shell used to signal distress or provide illumination."
icon_state = "fshell"
projectile_type = /obj/item/projectile/energy/flash/flare
matter = list(MAT_STEEL = 90, MAT_GLASS = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045), MAT_GLASS = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a12g/emp
name = "ion shell"
@@ -336,7 +336,7 @@
icon_state = "empshell"
projectile_type = /obj/item/projectile/ion
// projectile_type = /obj/item/projectile/bullet/shotgun/ion
matter = list(MAT_STEEL = 360, MAT_URANIUM = 240)
matter = list(MAT_STEEL = MATERIAL_COST(0.18), MAT_URANIUM = MATERIAL_COST(0.12))
/obj/item/ammo_casing/a12g/flechette
name = "shotgun flechette"
@@ -344,12 +344,12 @@
icon_state = "slshell"
caliber = "12g"
projectile_type = /obj/item/projectile/scatter/flechette
matter = list(MAT_STEEL = 360, MAT_PLASTEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.18), MAT_PLASTEEL = MATERIAL_COST(0.05))
/obj/item/ammo_casing/a12g/bb
desc = "A shotgun BB shell."
projectile_type = /obj/item/projectile/bullet/pellet/shotgun/bb // Shotgun
matter = list(MAT_PLASTIC = 120) // 6 pellets
matter = list(MAT_PLASTIC = MATERIAL_COST(0.06)) // 6 pellets
/*
* 7.62mm
@@ -360,23 +360,23 @@
caliber = "7.62mm"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a762
matter = list(MAT_STEEL = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.1))
/obj/item/ammo_casing/a762/ap
desc = "A 7.62mm armor-piercing bullet casing."
projectile_type = /obj/item/projectile/bullet/rifle/a762/ap
matter = list(MAT_STEEL = 300)
matter = list(MAT_STEEL = MATERIAL_COST(0.15))
/obj/item/ammo_casing/a762/practice
desc = "A 7.62mm practice bullet casing."
icon_state = "rifle-casing" // Need to make an icon for these
projectile_type = /obj/item/projectile/bullet/practice
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a762/blank
desc = "A blank 7.62mm bullet casing."
projectile_type = /obj/item/projectile/bullet/blank
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a762/hp
desc = "A 7.62mm hollow-point bullet casing."
@@ -389,7 +389,7 @@
/obj/item/ammo_casing/a762/bb
desc = "A 7.62mm BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -401,12 +401,12 @@
icon_state = "lcasing"
caliber = "14.5mm"
projectile_type = /obj/item/projectile/bullet/rifle/a145
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 500) //CHOMPedit Makes them a bit more expensive
matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_PLASTEEL = MATERIAL_COST(0.25)) //CHOMPedit Makes them a bit more expensive
/obj/item/ammo_casing/a145/highvel
desc = "A 14.5mm sabot shell."
projectile_type = /obj/item/projectile/bullet/rifle/a145/highvel
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 1000) //CHOMPedit Makes them a bit more expensive
matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_PLASTEEL = MATERIAL_COST(0.5)) //CHOMPedit Makes them a bit more expensive
/obj/item/ammo_casing/a145/spent/Initialize(mapload)
. = ..()
@@ -421,23 +421,23 @@
caliber = "5.45mm"
icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a545
matter = list(MAT_STEEL = 180)
matter = list(MAT_STEEL = MATERIAL_COST(0.09))
/obj/item/ammo_casing/a545/ap
desc = "A 5.45mm armor-piercing bullet casing."
projectile_type = /obj/item/projectile/bullet/rifle/a545/ap
matter = list(MAT_STEEL = 270)
matter = list(MAT_STEEL = MATERIAL_COST(0.135))
/obj/item/ammo_casing/a545/practice
desc = "A 5.45mm practice bullet casing."
icon_state = "rifle-casing" // Need to make an icon for these
projectile_type = /obj/item/projectile/bullet/practice
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a545/blank
desc = "A blank 5.45mm bullet casing."
projectile_type = /obj/item/projectile/bullet/blank
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
/obj/item/ammo_casing/a545/hp
desc = "A 5.45mm hollow-point bullet casing."
@@ -450,7 +450,7 @@
/obj/item/ammo_casing/a545/bb
desc = "A 5.45mm BB."
projectile_type = /obj/item/projectile/bullet/bb
matter = list(MAT_PLASTIC = 20)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.01))
caseless = TRUE
/*
@@ -462,7 +462,7 @@
caliber = "5mm caseless"
icon_state = "casing" // Placeholder. Should probably be purple.
projectile_type = /obj/item/projectile/bullet/pistol // Close enough to be comparable.
matter = list(MAT_STEEL = 180)
matter = list(MAT_STEEL = MATERIAL_COST(0.09))
caseless = 1
/obj/item/ammo_casing/a5mmcaseless/stun
@@ -479,7 +479,7 @@
icon_state = "sshell_alt"
projectile_type = /obj/item/projectile/bullet/srmrocket
caliber = "rocket"
matter = list(MAT_STEEL = 10000)
matter = list(MAT_STEEL = MATERIAL_COST(5))
/obj/item/ammo_casing/cap
name = "cap"
@@ -488,7 +488,7 @@
icon = 'icons/obj/gun_toy.dmi'
icon_state = "cap"
projectile_type = /obj/item/projectile/bullet/cap
matter = list(MAT_STEEL = 85)
matter = list(MAT_STEEL = MATERIAL_COST(0.0425))
caseless = 1
/obj/item/ammo_casing/spent // For simple hostile mobs only, so they don't cough up usable bullets when firing. This is for literally nothing else.
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -39,7 +39,7 @@
icon_state = "detective"
item_state = "gun"
slot_flags = SLOT_BELT|SLOT_HOLSTER
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
w_class = ITEMSIZE_NORMAL
throwforce = 5
throw_speed = 4
code/modules/projectiles/guns/energy/altevian_vr.dm
+3 -3
View File
@@ -7,7 +7,7 @@
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
force = 5
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
projectile_type = /obj/item/projectile/beam/meeplaser
charge_cost = 400
@@ -19,7 +19,7 @@
slot_flags = SLOT_BELT
w_class = ITEMSIZE_LARGE
force = 10
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
projectile_type = /obj/item/projectile/beam/meeplaser/strong
charge_cost = 200
@@ -68,7 +68,7 @@
slot_flags = SLOT_BACK
w_class = ITEMSIZE_HUGE
force = 10
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
projectile_type = /obj/item/projectile/scatter/ratminer
charge_cost = 400
fire_sound = 'sound/weapons/laser3.ogg'
code/modules/projectiles/guns/energy/laser.dm
+4 -4
View File
@@ -13,7 +13,7 @@
slot_flags = SLOT_BELT|SLOT_BACK
w_class = ITEMSIZE_LARGE //CHOMP Edit - huge was dumb for this.
force = 10
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
projectile_type = /obj/item/projectile/beam/midlaser
one_handed_penalty = 30
@@ -369,7 +369,7 @@
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
force = 10
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
fire_sound = 'sound/weapons/mandalorian.ogg'
projectile_type = /obj/item/projectile/beam/imperial
@@ -385,7 +385,7 @@
slot_flags = SLOT_BELT|SLOT_BACK
w_class = ITEMSIZE_LARGE
force = 15
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
projectile_type = /obj/item/projectile/beam/mininglaser
firemodes = list(
@@ -407,7 +407,7 @@
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
force = 8
matter = list(MAT_STEEL = 1500)
matter = list(MAT_STEEL = MATERIAL_COST(0.75))
projectile_type = /obj/item/projectile/beam/midlaser
/*
code/modules/projectiles/guns/energy/stun.dm
+2 -2
View File
@@ -49,7 +49,7 @@
icon_state = "crossbow"
w_class = ITEMSIZE_SMALL
item_state = "crossbow"
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
slot_flags = SLOT_BELT | SLOT_HOLSTER
silenced = 1
projectile_type = /obj/item/projectile/energy/bolt
@@ -68,7 +68,7 @@
icon_state = "crossbowlarge"
w_class = ITEMSIZE_LARGE
force = 10
matter = list(MAT_STEEL = 200000)
matter = list(MAT_STEEL = MATERIAL_COST(100))
slot_flags = SLOT_BELT
projectile_type = /obj/item/projectile/energy/bolt/large
code/modules/projectiles/guns/lasertag.dm
+1 -1
View File
@@ -36,7 +36,7 @@
icon = 'icons/obj/gun_toy.dmi'
item_state = "omnitag"
item_state = "retro"
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
projectile_type = /obj/item/projectile/beam/lasertag/omni
cell_type = /obj/item/cell/device/weapon/recharge
battery_lock = 1
code/modules/projectiles/guns/launcher/grenade_launcher.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/obj/item/grenade/chambered
var/list/grenades = new/list()
var/max_grenades = 5 //holds this + one in the chamber
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
special_handling = TRUE
var/underslung = FALSE
code/modules/projectiles/guns/launcher/syringe_gun.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "syringe-cartridge"
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
matter = list(MAT_STEEL = 125, MAT_GLASS = 375)
matter = list(MAT_STEEL = MATERIAL_COST(0.0625), MAT_GLASS = MATERIAL_COST(0.1875))
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3
force = 3
@@ -76,7 +76,7 @@
item_state = "syringegun"
w_class = ITEMSIZE_NORMAL
force = 7
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
slot_flags = SLOT_BELT | SLOT_HOLSTER
fire_sound = 'sound/weapons/empty.ogg'
code/modules/projectiles/guns/projectile.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "A gun that fires bullets."
icon_state = "revolver"
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
recoil = 1
projectile_type = /obj/item/projectile/bullet/pistol/strong //Only used for chameleon guns
code/modules/projectiles/guns/projectile/altevian_vr.dm
+2 -2
View File
@@ -22,7 +22,7 @@
caliber = ".48"
ammo_type = /obj/item/ammo_casing/sam48
mag_type = MAGAZINE
matter = list(MAT_STEEL = 240)
matter = list(MAT_STEEL = MATERIAL_COST(0.12))
max_ammo = 5
multiple_sprites = 1
@@ -30,7 +30,7 @@
desc = "A .48 bolt casing."
caliber = ".48"
projectile_type = /obj/item/projectile/bullet/sam48
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
/obj/item/projectile/bullet/sam48
fire_sound = 'sound/weapons/gunshot4.ogg'
code/modules/projectiles/guns/projectile/automatic_vr.dm
+1 -1
View File
@@ -124,7 +124,7 @@
icon = 'icons/obj/ammo_vr.dmi'
icon_state = "smg"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 1800)
matter = list(MAT_STEEL = MATERIAL_COST(0.9))
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 30
code/modules/projectiles/guns/projectile/revolver_vr.dm
+1 -1
View File
@@ -10,7 +10,7 @@
name = "magazine (.380)"
icon_state = "m92"
mag_type = MAGAZINE
matter = list(MAT_STEEL = 480)
matter = list(MAT_STEEL = MATERIAL_COST(0.24))
caliber = ".380"
ammo_type = /obj/item/ammo_casing/a380
max_ammo = 8
code/modules/projectiles/guns/projectile/smartgun.dm
+2 -2
View File
@@ -10,7 +10,7 @@
icon_override = 'icons/obj/guns/projectile/smartgun_mob.dmi'
item_state = "smartgun"
w_class = ITEMSIZE_LARGE
matter = list(MAT_STEEL = 6000, MAT_DIAMOND = 2000, MAT_URANIUM = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(3), MAT_DIAMOND = MATERIAL_COST(1), MAT_URANIUM = MATERIAL_COST(1))
recoil = 1
projectile_type = /obj/item/projectile/bullet/smartgun //Only used for chameleon guns
slot_flags = SLOT_BACK
@@ -138,7 +138,7 @@
icon = 'icons/obj/guns/projectile/smartgun_32.dmi'
icon_state = "smartgunmag"
slot_flags = SLOT_BELT
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
w_class = ITEMSIZE_SMALL
mag_type = MAGAZINE
code/modules/projectiles/guns/toy.dm
+7 -7
View File
@@ -27,7 +27,7 @@
caliber = "caps"
ammo_type = /obj/item/ammo_casing/cap
projectile_type = /obj/item/projectile/bullet/cap
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
handle_casings = null
recoil = 0 //it's a toy //CHOMP Edit
@@ -48,7 +48,7 @@
load_method = SINGLE_CASING
ammo_type = /obj/item/ammo_casing/afoam_dart
projectile_type = /obj/item/projectile/bullet/foam_dart
matter = list(MAT_PLASTIC = 2000)
matter = list(MAT_PLASTIC = MATERIAL_COST(1))
handle_casings = null
recoil = 0 //it's a toy //CHOMP Edit
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit
@@ -64,7 +64,7 @@
icon_state = "moistnugget"
item_state = "moistnugget"
max_shells = 5
matter = list(MAT_PLASTIC = 2500)
matter = list(MAT_PLASTIC = MATERIAL_COST(1.25))
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit
/*
@@ -81,7 +81,7 @@
projectile_type = /obj/item/projectile/bullet/foam_dart
caliber = "foam"
load_method = MAGAZINE
matter = list(MAT_PLASTIC = 1000)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.5))
recoil = 0 //it's a toy //CHOMP Edit
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit
@@ -132,7 +132,7 @@
projectile_type = /obj/item/projectile/bullet/foam_dart
load_method = SINGLE_CASING
max_shells = 6
matter = list(MAT_PLASTIC = 1000)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.5))
handle_casings = null
recoil = null //it's a toy
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit
@@ -179,7 +179,7 @@
item_state = "dshotgun"
max_shells = 2
w_class = ITEMSIZE_NORMAL
matter = list(MAT_PLASTIC = 1500)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.75))
/*
* SMG
@@ -196,7 +196,7 @@
magazine_type = /obj/item/ammo_magazine/mfoam_dart/smg
allowed_magazines = list(/obj/item/ammo_magazine/mfoam_dart/smg)
projectile_type = /obj/item/projectile/bullet/foam_dart
matter = list(MAT_PLASTIC = 1500)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.75))
recoil = null //it's a toy
fire_sound = 'sound/items/syringeproj.ogg' //CHOMPedit