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

Finishes fixing ammo inconsistencies

Browse Source
This commit is contained in:
Spades
2017-05-27 04:39:49 -04:00
parent 8579adcc53
commit 3ff9d441f9
17 changed files with 210 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/boxes.dm
+85 -81
View File
@@ -18,17 +18,17 @@
icon_state = "38"
caliber = "38"
matter = list(DEFAULT_WALL_MATERIAL = 360)
ammo_type = /obj/item/ammo_casing/c38
ammo_type = /obj/item/ammo_casing/a38
max_ammo = 6
multiple_sprites = 1
/obj/item/ammo_magazine/s38/rubber
name = "speedloader (.38 rubber)"
ammo_type = /obj/item/ammo_casing/c38r
ammo_type = /obj/item/ammo_casing/a38r
/obj/item/ammo_magazine/s38/emp
name = "ammunition box (.38 haywire)"
ammo_type = /obj/item/ammo_casing/c38/emp
ammo_type = /obj/item/ammo_casing/a38/emp
///////// .45 /////////
@@ -36,7 +36,7 @@
name = "pistol magazine (.45)"
icon_state = "45"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/a45
matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
caliber = ".45"
max_ammo = 7
@@ -47,29 +47,29 @@
/obj/item/ammo_magazine/m45/rubber
name = "magazine (.45 rubber)"
ammo_type = /obj/item/ammo_casing/c45r
ammo_type = /obj/item/ammo_casing/a45r
/obj/item/ammo_magazine/m45/practice
name = "magazine (.45 practice)"
ammo_type = /obj/item/ammo_casing/c45p
ammo_type = /obj/item/ammo_casing/a45p
/obj/item/ammo_magazine/m45/flash
name = "magazine (.45 flash)"
ammo_type = /obj/item/ammo_casing/c45f
ammo_type = /obj/item/ammo_casing/a45f
/obj/item/ammo_magazine/m45/ap
name = "magazine (.45 AP)"
ammo_type = /obj/item/ammo_casing/c45ap
ammo_type = /obj/item/ammo_casing/a45ap
/obj/item/ammo_magazine/box/emp/b45
name = "ammunition box (.45 haywire)"
ammo_type = /obj/item/ammo_casing/c45/emp
ammo_type = /obj/item/ammo_casing/a45/emp
/obj/item/ammo_magazine/m45uzi
name = "stick magazine (.45)"
icon_state = "uzi45"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/a45
matter = list(DEFAULT_WALL_MATERIAL = 1200)
caliber = ".45"
max_ammo = 16
@@ -82,14 +82,14 @@
name = "tommygun magazine (.45)"
icon_state = "tommy-mag"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/a45
matter = list(DEFAULT_WALL_MATERIAL = 1500)
caliber = ".45"
max_ammo = 20
/obj/item/ammo_magazine/m45tommy/ap
name = "tommygun magazine (.45 AP)"
ammo_type = /obj/item/ammo_casing/c45ap
ammo_type = /obj/item/ammo_casing/a45ap
/obj/item/ammo_magazine/m45tommy/empty
initial_ammo = 0
@@ -99,14 +99,14 @@
icon_state = "tommy-drum"
w_class = ITEMSIZE_NORMAL // Bulky ammo doesn't fit in your pockets!
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/a45
matter = list(DEFAULT_WALL_MATERIAL = 3750)
caliber = ".45"
max_ammo = 50
/obj/item/ammo_magazine/m45tommydrum/ap
name = "tommygun drum magazine (.45 AP)"
ammo_type = /obj/item/ammo_casing/c45ap
ammo_type = /obj/item/ammo_casing/a45ap
/obj/item/ammo_magazine/m45tommydrum/empty
initial_ammo = 0
@@ -116,86 +116,86 @@
icon_state = "clip_pistol"
desc = "A stripper clip for reloading .45 rounds into magazines."
caliber = ".45"
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/a45
matter = list(DEFAULT_WALL_MATERIAL = 675) // metal costs very roughly based around one .45 casing = 75 metal
max_ammo = 9
multiple_sprites = 1
/obj/item/ammo_magazine/clip/c45/rubber
name = "ammo clip (.45 rubber)"
ammo_type = /obj/item/ammo_casing/c45r
ammo_type = /obj/item/ammo_casing/a45r
/obj/item/ammo_magazine/clip/c45/practice
name = "ammo clip (.45 practice)"
ammo_type = /obj/item/ammo_casing/c45p
ammo_type = /obj/item/ammo_casing/a45p
/obj/item/ammo_magazine/clip/c45/flash
name = "ammo clip (.45 flash)"
ammo_type = /obj/item/ammo_casing/c45f
ammo_type = /obj/item/ammo_casing/a45f
///////// 9mm /////////
/obj/item/ammo_magazine/mc9mm
/obj/item/ammo_magazine/m9mm
name = "magazine (9mm)"
icon_state = "9x19p"
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
matter = list(DEFAULT_WALL_MATERIAL = 480)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 8
multiple_sprites = 1
/obj/item/ammo_magazine/mc9mm/empty
/obj/item/ammo_magazine/m9mm/empty
initial_ammo = 0
/obj/item/ammo_magazine/mc9mm/flash
ammo_type = /obj/item/ammo_casing/c9mmf
/obj/item/ammo_magazine/m9mm/flash
ammo_type = /obj/item/ammo_casing/a9mmf
/obj/item/ammo_magazine/mc9mm/rubber
/obj/item/ammo_magazine/m9mm/rubber
name = "magazine (9mm rubber)"
ammo_type = /obj/item/ammo_casing/c9mmr
ammo_type = /obj/item/ammo_casing/a9mmr
/obj/item/ammo_magazine/mc9mm/practice
/obj/item/ammo_magazine/m9mm/practice
name = "magazine (9mm practice)"
ammo_type = /obj/item/ammo_casing/c9mmp
ammo_type = /obj/item/ammo_casing/a9mmp
/obj/item/ammo_magazine/mc9mmt
/obj/item/ammo_magazine/m9mmt
name = "top mounted magazine (9mm)"
icon_state = "9mmt"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c9mm
ammo_type = /obj/item/ammo_casing/a9mm
matter = list(DEFAULT_WALL_MATERIAL = 1200)
caliber = "9mm"
max_ammo = 20
multiple_sprites = 1
/obj/item/ammo_magazine/mc9mmt/empty
/obj/item/ammo_magazine/m9mmt/empty
initial_ammo = 0
/obj/item/ammo_magazine/mc9mmt/rubber
/obj/item/ammo_magazine/m9mmt/rubber
name = "top mounted magazine (9mm rubber)"
ammo_type = /obj/item/ammo_casing/c9mmr
ammo_type = /obj/item/ammo_casing/a9mmr
/obj/item/ammo_magazine/mc9mmt/flash
/obj/item/ammo_magazine/m9mmt/flash
name = "top mounted magazine (9mm flash)"
ammo_type = /obj/item/ammo_casing/c9mmf
ammo_type = /obj/item/ammo_casing/a9mmf
/obj/item/ammo_magazine/mc9mmt/practice
/obj/item/ammo_magazine/m9mmt/practice
name = "top mounted magazine (9mm practice)"
ammo_type = /obj/item/ammo_casing/c9mmp
ammo_type = /obj/item/ammo_casing/a9mmp
/obj/item/ammo_magazine/p90
/obj/item/ammo_magazine/m9mmp90
name = "high capacity top mounted magazine (9mm armor-piercing)"
icon_state = "p90"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c9mm/ap
ammo_type = /obj/item/ammo_casing/a9mm/ap
matter = list(DEFAULT_WALL_MATERIAL = 3000)
caliber = "9mm"
max_ammo = 50
multiple_sprites = 1
/obj/item/ammo_magazine/p90/empty
/obj/item/ammo_magazine/m9mmp90/empty
initial_ammo = 0
/obj/item/ammo_magazine/clip/c9mm
@@ -203,33 +203,33 @@
icon_state = "clip_pistol"
desc = "A stripper clip for reloading 9mm rounds into magazines."
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
ammo_type = /obj/item/ammo_casing/a9mm
matter = list(DEFAULT_WALL_MATERIAL = 540) // metal costs are very roughly based around one 9mm casing = 60 metal
max_ammo = 9
multiple_sprites = 1
/obj/item/ammo_magazine/clip/c9mm/rubber
name = "ammo clip (.45 rubber)"
ammo_type = /obj/item/ammo_casing/c9mmr
ammo_type = /obj/item/ammo_casing/a9mmr
/obj/item/ammo_magazine/clip/c9mm/practice
name = "ammo clip (.45 practice)"
ammo_type = /obj/item/ammo_casing/c9mmp
ammo_type = /obj/item/ammo_casing/a9mmp
/obj/item/ammo_magazine/clip/c9mm/flash
name = "ammo clip (.45 flash)"
ammo_type = /obj/item/ammo_casing/c9mmf
ammo_type = /obj/item/ammo_casing/a9mmf
/obj/item/ammo_magazine/c9mm // Made by RnD for Prototype SMG and should probably be removed because why does it require DIAMONDS to make bullets?
/obj/item/ammo_magazine/box/c9mm // Made by RnD for Prototype SMG and should probably be removed because why does it require DIAMONDS to make bullets?
name = "ammunition Box (9mm)"
icon_state = "9mm"
origin_tech = list(TECH_COMBAT = 2)
matter = list(DEFAULT_WALL_MATERIAL = 1800)
caliber = "9mm"
ammo_type = /obj/item/ammo_casing/c9mm
ammo_type = /obj/item/ammo_casing/a9mm
max_ammo = 30
/obj/item/ammo_magazine/c9mm/empty
/obj/item/ammo_magazine/box/c9mm/empty
initial_ammo = 0
///////// 5mm /////////
@@ -270,7 +270,7 @@
/obj/item/ammo_magazine/m10mm/empty
initial_ammo = 0
/obj/item/ammo_magazine/clip/a10mm
/obj/item/ammo_magazine/clip/c10mm
name = "ammo clip (10mm)"
icon_state = "clip_pistol"
desc = "A stripper clip for reloading 5mm rounds into magazines."
@@ -288,7 +288,7 @@
/obj/item/ammo_magazine/m556
name = "magazine (5.56mm)"
icon_state = "c5.56"
icon_state = "c5.56mid"
origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE
caliber = "a556"
@@ -324,7 +324,28 @@
name = "extended magazine (5.56mm armor-piercing)"
max_ammo = 30
/obj/item/ammo_magazine/clip/a556
/obj/item/ammo_magazine/m556/small
name = "magazine (5.56)"
icon_state = "c5.56" // This icon is named wrongly. Change later.
mag_type = MAGAZINE
caliber = "a762"
matter = list(DEFAULT_WALL_MATERIAL = 900)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 10
multiple_sprites = 1
/obj/item/ammo_magazine/m556/small/empty
initial_ammo = 0
/obj/item/ammo_magazine/m556/small/practice
name = "magazine (5.56mm practice)"
ammo_type = /obj/item/ammo_casing/a556p
/obj/item/ammo_magazine/m556/small/ap
name = "magazine (7.62mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a556/ap
/obj/item/ammo_magazine/clip/c556
name = "ammo clip (5.56mm)"
icon_state = "clip_rifle"
caliber = "a556"
@@ -333,11 +354,11 @@
max_ammo = 5
multiple_sprites = 1
/obj/item/ammo_magazine/clip/a556/ap
/obj/item/ammo_magazine/clip/c556/ap
name = "rifle clip (5.56mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a556/ap
/obj/item/ammo_magazine/clip/a556/practice
/obj/item/ammo_magazine/clip/c556/practice
name = "rifle clip (5.56mm practice)"
ammo_type = /obj/item/ammo_casing/a556
@@ -376,7 +397,7 @@
/obj/item/ammo_magazine/m50/empty
initial_ammo = 0
/obj/item/ammo_magazine/clip/a50
/obj/item/ammo_magazine/clip/c50
name = "ammo clip (.50 AE)"
icon_state = "clip_pistol"
desc = "A stripper clip for reloading .50 Action Express rounds into magazines."
@@ -405,24 +426,7 @@
/obj/item/ammo_magazine/m762/empty
initial_ammo = 0
/obj/item/ammo_magazine/s762 // 's' for small!
name = "magazine (7.62mm)"
icon_state = "SVD"
mag_type = MAGAZINE
caliber = "a762"
matter = list(DEFAULT_WALL_MATERIAL = 1000)
ammo_type = /obj/item/ammo_casing/a762
max_ammo = 10
multiple_sprites = 1
/obj/item/ammo_magazine/s762/empty
initial_ammo = 0
/obj/item/ammo_magazine/s762/ap
name = "magazine (7.62mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a762/ap
/obj/item/ammo_magazine/clip/a762
/obj/item/ammo_magazine/clip/c762
name = "ammo clip (7.62mm)"
icon_state = "clip_rifle"
caliber = "a762"
@@ -431,39 +435,39 @@
max_ammo = 5
multiple_sprites = 1
/obj/item/ammo_magazine/clip/a762/ap
/obj/item/ammo_magazine/clip/c762/ap
name = "rifle clip (7.62mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a762/ap
/obj/item/ammo_magazine/clip/a762/practice
/obj/item/ammo_magazine/clip/c762/practice
name = "rifle clip (7.62mm practice)"
ammo_type = /obj/item/ammo_casing/a762p
///////// 12g /////////
/obj/item/ammo_magazine/g12
/obj/item/ammo_magazine/m12gdrum
name = "magazine (12 gauge)"
icon_state = "12g"
mag_type = MAGAZINE
caliber = "shotgun"
matter = list(DEFAULT_WALL_MATERIAL = 2200)
ammo_type = /obj/item/ammo_casing/shotgun
ammo_type = /obj/item/ammo_casing/a12g
max_ammo = 24
multiple_sprites = 1
/obj/item/ammo_magazine/g12/beanbag
/obj/item/ammo_magazine/m12gdrum/beanbag
name = "magazine (12 gauge beanbag)"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
ammo_type = /obj/item/ammo_casing/a12g/beanbag
/obj/item/ammo_magazine/g12/pellet
/obj/item/ammo_magazine/m12gdrum/pellet
name = "magazine (12 gauge pellet)"
ammo_type = /obj/item/ammo_casing/shotgun/pellet
ammo_type = /obj/item/ammo_casing/a12g/pellet
/obj/item/ammo_magazine/g12/flash
/obj/item/ammo_magazine/m12gdrum/flash
name = "magazine (12 gauge flash)"
ammo_type = /obj/item/ammo_casing/shotgun/flash
ammo_type = /obj/item/ammo_casing/a12g/flash
/obj/item/ammo_magazine/g12/empty
/obj/item/ammo_magazine/m12gdrum/empty
initial_ammo = 0
///////// .75 Gyrojet /////////
code/modules/projectiles/ammunition/bullets.dm
+24 -24
View File
@@ -13,18 +13,18 @@
caliber = "75"
projectile_type = /obj/item/projectile/bullet/gyro
/obj/item/ammo_casing/c38
/obj/item/ammo_casing/a38
desc = "A .38 bullet casing."
caliber = "38"
projectile_type = /obj/item/projectile/bullet/pistol
/obj/item/ammo_casing/c38r
/obj/item/ammo_casing/a38r
desc = "A .38 rubber bullet casing."
caliber = "38"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
/obj/item/ammo_casing/c38/emp
/obj/item/ammo_casing/a38/emp
name = ".38 haywire round"
desc = "A .38 bullet casing fitted with a single-use ion pulse generator."
icon_state = "empcasing"
@@ -35,28 +35,28 @@
* 9mm
*/
/obj/item/ammo_casing/c9mm
/obj/item/ammo_casing/a9mm
desc = "A 9mm bullet casing."
caliber = "9mm"
projectile_type = /obj/item/projectile/bullet/pistol
/obj/item/ammo_casing/c9mm/ap
/obj/item/ammo_casing/a9mm/ap
desc = "A 9mm armor-piercing bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/ap
/obj/item/ammo_casing/c9mmf
/obj/item/ammo_casing/a9mmf
desc = "A 9mm flash shell casing."
caliber = "9mm"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/energy/flash
/obj/item/ammo_casing/c9mmr
/obj/item/ammo_casing/a9mmr
desc = "A 9mm rubber bullet casing."
caliber = "9mm"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
/obj/item/ammo_casing/c9mmp
/obj/item/ammo_casing/a9mmp
desc = "A 9mm practice bullet casing."
caliber = "9mm"
icon_state = "r-casing"
@@ -73,43 +73,43 @@
* 45 ammo
*/
/obj/item/ammo_casing/c45
/obj/item/ammo_casing/a45
desc = "A .45 bullet casing."
caliber = ".45"
projectile_type = /obj/item/projectile/bullet/pistol/medium
/obj/item/ammo_casing/c45ap
/obj/item/ammo_casing/a45ap
desc = "A .45 Armor-Piercing bullet casing."
caliber = ".45"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/medium/ap
/obj/item/ammo_casing/c45p
/obj/item/ammo_casing/a45p
desc = "A .45 practice bullet casing."
caliber = ".45"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/practice
/obj/item/ammo_casing/c45r
/obj/item/ammo_casing/a45r
desc = "A .45 rubber bullet casing."
caliber = ".45"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/pistol/rubber
/obj/item/ammo_casing/c45f
/obj/item/ammo_casing/a45f
desc = "A .45 flash shell casing."
caliber = ".45"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/energy/flash
/obj/item/ammo_casing/c45/emp
/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(DEFAULT_WALL_MATERIAL = 130, "uranium" = 100)
/obj/item/ammo_casing/c45/hp
/obj/item/ammo_casing/a45/hp
desc = "A .45 hollow-point bullet casing."
projectile_type = /obj/item/projectile/bullet/pistol/medium/hollow
@@ -134,7 +134,7 @@
* Shotguns
*/
/obj/item/ammo_casing/shotgun
/obj/item/ammo_casing/a12g
name = "shotgun slug"
desc = "A 12 gauge slug."
icon_state = "slshell"
@@ -142,28 +142,28 @@
projectile_type = /obj/item/projectile/bullet/shotgun
matter = list(DEFAULT_WALL_MATERIAL = 360)
/obj/item/ammo_casing/shotgun/pellet
/obj/item/ammo_casing/a12g/pellet
name = "shotgun shell"
desc = "A 12 gauge shell."
icon_state = "gshell"
projectile_type = /obj/item/projectile/bullet/pellet/shotgun
matter = list(DEFAULT_WALL_MATERIAL = 360)
/obj/item/ammo_casing/shotgun/blank
/obj/item/ammo_casing/a12g/blank
name = "shotgun shell"
desc = "A blank shell."
icon_state = "blshell"
projectile_type = /obj/item/projectile/bullet/blank
matter = list(DEFAULT_WALL_MATERIAL = 90)
/obj/item/ammo_casing/shotgun/practice
/obj/item/ammo_casing/a12g/practice
name = "shotgun shell"
desc = "A practice shell."
icon_state = "pshell"
projectile_type = /obj/item/projectile/bullet/shotgun/practice
matter = list("metal" = 90)
/obj/item/ammo_casing/shotgun/beanbag
/obj/item/ammo_casing/a12g/beanbag
name = "beanbag shell"
desc = "A beanbag shell."
icon_state = "bshell"
@@ -172,26 +172,26 @@
//Can stun in one hit if aimed at the head, but
//is blocked by clothing that stops tasers and is vulnerable to EMP
/obj/item/ammo_casing/shotgun/stunshell
/obj/item/ammo_casing/a12g/stunshell
name = "stun shell"
desc = "A 12 gauge taser cartridge."
icon_state = "stunshell"
projectile_type = /obj/item/projectile/energy/electrode/stunshot
matter = list(DEFAULT_WALL_MATERIAL = 360, "glass" = 720)
/obj/item/ammo_casing/shotgun/stunshell/emp_act(severity)
/obj/item/ammo_casing/a12g/stunshell/emp_act(severity)
if(prob(100/severity)) BB = null
update_icon()
//Does not stun, only blinds, but has area of effect.
/obj/item/ammo_casing/shotgun/flash
/obj/item/ammo_casing/a12g/flash
name = "flash shell"
desc = "A chemical shell used to signal distress or provide illumination."
icon_state = "fshell"
projectile_type = /obj/item/projectile/energy/flash/flare
matter = list(DEFAULT_WALL_MATERIAL = 90, "glass" = 90)
/obj/item/ammo_casing/shotgun/emp
/obj/item/ammo_casing/a12g/emp
name = "ion shell"
desc = "An advanced shotgun round that creates a small EMP when it strikes a target."
icon_state = "empshell"