cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changes 5.56mm to 5.45mm, now 20% less stupid

Browse Source 
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
This commit is contained in:
Spades
2017-07-19 14:24:50 -04:00
parent 4f40e49e9f
commit 2e776ac645
11 changed files with 120 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/datums/autolathe/arms.dm
View File

@@ -137,19 +137,19 @@
path =/obj/item/ammo_magazine/m44 path =/obj/item/ammo_magazine/m44
hidden = 1 hidden = 1
/////// 5.56mm /////// 5.45mm
/datum/category_item/autolathe/arms/rifle_556 /datum/category_item/autolathe/arms/rifle_545
name = "rifle magazine (5.56mm)" name = "rifle magazine (5.45mm)"
path =/obj/item/ammo_magazine/m556 path =/obj/item/ammo_magazine/m545
hidden = 1 hidden = 1
/datum/category_item/autolathe/arms/rifle_556p /datum/category_item/autolathe/arms/rifle_545p
name = "rifle magazine (5.56mm practice)" name = "rifle magazine (5.45mm practice)"
path =/obj/item/ammo_magazine/m556/practice path =/obj/item/ammo_magazine/m545/practice
/datum/category_item/autolathe/arms/machinegun_556 /datum/category_item/autolathe/arms/machinegun_545
name = "machinegun box magazine (5.56)" name = "machinegun box magazine (5.56)"
path =/obj/item/ammo_magazine/m556saw path =/obj/item/ammo_magazine/m545saw
hidden = 1 hidden = 1
/////// 7.62 /////// 7.62
@@ -245,14 +245,14 @@
category = "Arms and Ammunition" category = "Arms and Ammunition"
hidden = 1 hidden = 1
/datum/category_item/autolathe/arms/rifle_556 /datum/category_item/autolathe/arms/rifle_545
name = "10rnd rifle magazine (5.56mm)" name = "10rnd rifle magazine (5.45mm)"
path =/obj/item/ammo_magazine/m556saw/empty path =/obj/item/ammo_magazine/m545saw/empty
category = "Arms and Ammunition" category = "Arms and Ammunition"
/datum/category_item/autolathe/arms/rifle_556m /datum/category_item/autolathe/arms/rifle_545m
name = "20rnd rifle magazine (5.56mm)" name = "20rnd rifle magazine (5.45mm)"
path =/obj/item/ammo_magazine/m556sawm/empty path =/obj/item/ammo_magazine/m545sawm/empty
category = "Arms and Ammunition" category = "Arms and Ammunition"
hidden = 1 hidden = 1
@@ -359,15 +359,15 @@
category = "Arms and Ammunition" category = "Arms and Ammunition"
hidden = 1 hidden = 1
*/ */
/datum/category_item/autolathe/arms/rifle_clip_556 /datum/category_item/autolathe/arms/rifle_clip_545
name = "ammo clip (5.56mm)" name = "ammo clip (5.45mm)"
path =/obj/item/ammo_magazine/clip/c556 path =/obj/item/ammo_magazine/clip/c545
category = "Arms and Ammunition" category = "Arms and Ammunition"
hidden = 1 hidden = 1
/datum/category_item/autolathe/arms/rifle_clip_556_practice /datum/category_item/autolathe/arms/rifle_clip_545_practice
name = "ammo clip (5.56mm practice)" name = "ammo clip (5.45mm practice)"
path =/obj/item/ammo_magazine/clip/c556/practice path =/obj/item/ammo_magazine/clip/c545/practice
category = "Arms and Ammunition" category = "Arms and Ammunition"
/datum/category_item/autolathe/arms/rifle_clip_762 /datum/category_item/autolathe/arms/rifle_clip_762

2
code/datums/supplypacks/munitions.dm
View File

@@ -156,7 +156,7 @@
contains = list( contains = list(
/obj/item/ammo_magazine/m9mmt, /obj/item/ammo_magazine/m9mmt,
/obj/item/ammo_magazine/m9mmt/rubber, /obj/item/ammo_magazine/m9mmt/rubber,
/obj/item/ammo_magazine/m556saw /obj/item/ammo_magazine/m545saw
) )
cost = 25 cost = 25
containertype = /obj/structure/closet/crate/secure containertype = /obj/structure/closet/crate/secure

36
code/datums/uplink/ammunition.dm
View File

@@ -48,21 +48,21 @@
name = "Anti-Materiel Rifle ammo box (14.5mm)" name = "Anti-Materiel Rifle ammo box (14.5mm)"
path = /obj/item/weapon/storage/box/sniperammo path = /obj/item/weapon/storage/box/sniperammo
/datum/uplink_item/item/ammo/c556 /datum/uplink_item/item/ammo/c545
name = "Rifle Magazine (5.56mm)" name = "Rifle Magazine (5.45mm)"
path = /obj/item/ammo_magazine/m556 path = /obj/item/ammo_magazine/m545
/datum/uplink_item/item/ammo/c556/ext /datum/uplink_item/item/ammo/c545/ext
name = "Rifle Magazine (5.56mm Extended)" name = "Rifle Magazine (5.45mm Extended)"
path = /obj/item/ammo_magazine/m556/ext path = /obj/item/ammo_magazine/m545/ext
/datum/uplink_item/item/ammo/c556/ap /datum/uplink_item/item/ammo/c545/ap
name = "Rifle Magazine (5.56mm AP)" name = "Rifle Magazine (5.45mm AP)"
path = /obj/item/ammo_magazine/m556/ap path = /obj/item/ammo_magazine/m545/ap
/datum/uplink_item/item/ammo/c556/ap/ext /datum/uplink_item/item/ammo/c545/ap/ext
name = "Rifle Magazine (5.56mm AP Extended)" name = "Rifle Magazine (5.45mm AP Extended)"
path = /obj/item/ammo_magazine/m556/ap/ext path = /obj/item/ammo_magazine/m545/ap/ext
/datum/uplink_item/item/ammo/c762 /datum/uplink_item/item/ammo/c762
name = "Rifle Magazine (7.62mm)" name = "Rifle Magazine (7.62mm)"
@@ -76,13 +76,13 @@
name = "SMG Magazine (10mm)" name = "SMG Magazine (10mm)"
path = /obj/item/ammo_magazine/m10mm path = /obj/item/ammo_magazine/m10mm
/datum/uplink_item/item/ammo/a556 /datum/uplink_item/item/ammo/a545
name = "Machinegun Magazine (5.56mm)" name = "Machinegun Magazine (5.45mm)"
path = /obj/item/ammo_magazine/m556saw path = /obj/item/ammo_magazine/m545saw
/datum/uplink_item/item/ammo/a556/ap /datum/uplink_item/item/ammo/a545/ap
name = "Machinegun Magazine (5.56mm AP)" name = "Machinegun Magazine (5.45mm AP)"
path = /obj/item/ammo_magazine/m556saw/ap path = /obj/item/ammo_magazine/m545saw/ap
/datum/uplink_item/item/ammo/g12 /datum/uplink_item/item/ammo/g12
name = "12g Shotgun Ammo Box (Slug)" name = "12g Shotgun Ammo Box (Slug)"

7
code/datums/uplink/visible_weapons.dm
View File

@@ -66,15 +66,10 @@
path = /obj/item/weapon/gun/projectile/automatic/c20r path = /obj/item/weapon/gun/projectile/automatic/c20r
/datum/uplink_item/item/visible_weapons/assaultrifle /datum/uplink_item/item/visible_weapons/assaultrifle
name = "Assault Rifle (7.62mm)" name = "Assault Rifle (5.45mm)"
item_cost = 75 item_cost = 75
path = /obj/item/weapon/gun/projectile/automatic/sts35 path = /obj/item/weapon/gun/projectile/automatic/sts35
/*/datum/uplink_item/item/visible_weapons/bullpuprifle
name = "Assault Rifle (5.56mm)"
item_cost = 7
path = /obj/item/weapon/gun/projectile/automatic/carbine
*/
/datum/uplink_item/item/visible_weapons/combatshotgun /datum/uplink_item/item/visible_weapons/combatshotgun
name = "Combat Shotgun" name = "Combat Shotgun"
item_cost = 75 item_cost = 75

98
code/modules/projectiles/ammunition/magazines.dm
View File

@@ -288,97 +288,97 @@
name = "ammunition box (10mm haywire)" name = "ammunition box (10mm haywire)"
ammo_type = /obj/item/ammo_casing/a10mm/emp ammo_type = /obj/item/ammo_casing/a10mm/emp
///////// 5.56mm ///////// ///////// 5.45mm /////////
/obj/item/ammo_magazine/m556 /obj/item/ammo_magazine/m545
name = "magazine (5.56mm)" name = "magazine (5.45mm)"
icon_state = "m556" icon_state = "m545"
origin_tech = list(TECH_COMBAT = 2) origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE mag_type = MAGAZINE
caliber = "5.56mm" caliber = "5.45mm"
matter = list(DEFAULT_WALL_MATERIAL = 1800) matter = list(DEFAULT_WALL_MATERIAL = 1800)
ammo_type = /obj/item/ammo_casing/a556 ammo_type = /obj/item/ammo_casing/a545
max_ammo = 20 max_ammo = 20
multiple_sprites = 1 multiple_sprites = 1
/obj/item/ammo_magazine/m556/ext /obj/item/ammo_magazine/m545/ext
name = "extended magazine (5.56mm)" name = "extended magazine (5.45mm)"
matter = list(DEFAULT_WALL_MATERIAL = 2700) matter = list(DEFAULT_WALL_MATERIAL = 2700)
max_ammo = 30 max_ammo = 30
/obj/item/ammo_magazine/m556/empty /obj/item/ammo_magazine/m545/empty
initial_ammo = 0 initial_ammo = 0
/obj/item/ammo_magazine/m556/ext/empty /obj/item/ammo_magazine/m545/ext/empty
initial_ammo = 0 initial_ammo = 0
/obj/item/ammo_magazine/m556/practice /obj/item/ammo_magazine/m545/practice
name = "magazine (5.56mm practice)" name = "magazine (5.45mm practice)"
ammo_type = /obj/item/ammo_casing/a556p ammo_type = /obj/item/ammo_casing/a545p
/obj/item/ammo_magazine/m556/practice/ext /obj/item/ammo_magazine/m545/practice/ext
name = "extended magazine (5.56mm practice)" name = "extended magazine (5.45mm practice)"
max_ammo = 30 max_ammo = 30
/obj/item/ammo_magazine/m556/ap /obj/item/ammo_magazine/m545/ap
name = "magazine (5.56mm armor-piercing)" name = "magazine (5.45mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a556/ap ammo_type = /obj/item/ammo_casing/a545/ap
/obj/item/ammo_magazine/m556/ap/ext /obj/item/ammo_magazine/m545/ap/ext
name = "extended magazine (5.56mm armor-piercing)" name = "extended magazine (5.45mm armor-piercing)"
max_ammo = 30 max_ammo = 30
/obj/item/ammo_magazine/m556/small /obj/item/ammo_magazine/m545/small
name = "reduced magazine (5.56mm)" name = "reduced magazine (5.45mm)"
icon_state = "m556-small" icon_state = "m545-small"
matter = list(DEFAULT_WALL_MATERIAL = 900) matter = list(DEFAULT_WALL_MATERIAL = 900)
max_ammo = 10 max_ammo = 10
/obj/item/ammo_magazine/m556/small/empty /obj/item/ammo_magazine/m545/small/empty
initial_ammo = 0 initial_ammo = 0
/obj/item/ammo_magazine/m556/small/practice /obj/item/ammo_magazine/m545/small/practice
name = "magazine (5.56mm practice)" name = "magazine (5.45mm practice)"
ammo_type = /obj/item/ammo_casing/a556p ammo_type = /obj/item/ammo_casing/a545p
/obj/item/ammo_magazine/m556/small/ap /obj/item/ammo_magazine/m545/small/ap
name = "magazine (5.56mm armor-piercing)" name = "magazine (5.45mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a556/ap ammo_type = /obj/item/ammo_casing/a545/ap
/obj/item/ammo_magazine/clip/c556 /obj/item/ammo_magazine/clip/c545
name = "ammo clip (5.56mm)" name = "ammo clip (5.45mm)"
icon_state = "clip_rifle" icon_state = "clip_rifle"
caliber = "5.56mm" caliber = "5.45mm"
ammo_type = /obj/item/ammo_casing/a556 ammo_type = /obj/item/ammo_casing/a545
matter = list(DEFAULT_WALL_MATERIAL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal matter = list(DEFAULT_WALL_MATERIAL = 450) // metal costs are very roughly based around one 10mm casing = 180 metal
max_ammo = 5 max_ammo = 5
multiple_sprites = 1 multiple_sprites = 1
/obj/item/ammo_magazine/clip/c556/ap /obj/item/ammo_magazine/clip/c545/ap
name = "rifle clip (5.56mm armor-piercing)" name = "rifle clip (5.45mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a556/ap ammo_type = /obj/item/ammo_casing/a545/ap
/obj/item/ammo_magazine/clip/c556/practice /obj/item/ammo_magazine/clip/c545/practice
name = "rifle clip (5.56mm practice)" name = "rifle clip (5.45mm practice)"
ammo_type = /obj/item/ammo_casing/a556 ammo_type = /obj/item/ammo_casing/a545
/obj/item/ammo_magazine/m556saw /obj/item/ammo_magazine/m545saw
name = "magazine box (5.56mm)" name = "magazine box (5.45mm)"
icon_state = "a556" icon_state = "a545"
origin_tech = list(TECH_COMBAT = 2) origin_tech = list(TECH_COMBAT = 2)
mag_type = MAGAZINE mag_type = MAGAZINE
caliber = "5.56mm" caliber = "5.45mm"
matter = list(DEFAULT_WALL_MATERIAL = 10000) matter = list(DEFAULT_WALL_MATERIAL = 10000)
ammo_type = /obj/item/ammo_casing/a556 ammo_type = /obj/item/ammo_casing/a545
w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!! w_class = ITEMSIZE_NORMAL // This should NOT fit in your pocket!!
max_ammo = 50 max_ammo = 50
multiple_sprites = 1 multiple_sprites = 1
/obj/item/ammo_magazine/m556saw/ap /obj/item/ammo_magazine/m545saw/ap
name = "magazine box (5.56mm armor-piercing)" name = "magazine box (5.45mm armor-piercing)"
ammo_type = /obj/item/ammo_casing/a556/ap ammo_type = /obj/item/ammo_casing/a545/ap
/obj/item/ammo_magazine/m556saw/empty /obj/item/ammo_magazine/m545saw/empty
initial_ammo = 0 initial_ammo = 0
///////// .44 Magnum ///////// ///////// .44 Magnum /////////

32
code/modules/projectiles/ammunition/rounds.dm
View File

@@ -270,33 +270,33 @@
matter = list(DEFAULT_WALL_MATERIAL = 1250) matter = list(DEFAULT_WALL_MATERIAL = 1250)
/* /*
* 5.56mm * 5.45mm
*/ */
/obj/item/ammo_casing/a556 /obj/item/ammo_casing/a545
desc = "A 5.56mm bullet casing." desc = "A 5.45mm bullet casing."
caliber = "5.56mm" caliber = "5.45mm"
icon_state = "rifle-casing" icon_state = "rifle-casing"
projectile_type = /obj/item/projectile/bullet/rifle/a556 projectile_type = /obj/item/projectile/bullet/rifle/a545
/obj/item/ammo_casing/a556/ap /obj/item/ammo_casing/a545/ap
desc = "A 5.56mm armor-piercing bullet casing." desc = "A 5.45mm armor-piercing bullet casing."
projectile_type = /obj/item/projectile/bullet/rifle/a556/ap projectile_type = /obj/item/projectile/bullet/rifle/a545/ap
/obj/item/ammo_casing/a556p /obj/item/ammo_casing/a545p
desc = "A 5.56mm practice bullet casing." desc = "A 5.45mm practice bullet casing."
caliber = "5.56mm" caliber = "5.45mm"
icon_state = "rifle-casing" // Need to make an icon for these icon_state = "rifle-casing" // Need to make an icon for these
projectile_type = /obj/item/projectile/bullet/rifle/practice projectile_type = /obj/item/projectile/bullet/rifle/practice
/obj/item/ammo_casing/a556/blank /obj/item/ammo_casing/a545/blank
desc = "A blank 5.56mm bullet casing." desc = "A blank 5.45mm bullet casing."
projectile_type = /obj/item/projectile/bullet/blank projectile_type = /obj/item/projectile/bullet/blank
matter = list(DEFAULT_WALL_MATERIAL = 90) matter = list(DEFAULT_WALL_MATERIAL = 90)
/obj/item/ammo_casing/a556/hp /obj/item/ammo_casing/a545/hp
desc = "A 5.56mm hollow-point bullet casing." desc = "A 5.45mm hollow-point bullet casing."
projectile_type = /obj/item/projectile/bullet/rifle/a556/hollow projectile_type = /obj/item/projectile/bullet/rifle/a545/hollow
/* /*
* Misc * Misc

20
code/modules/projectiles/guns/projectile/automatic.dm
View File

@@ -51,17 +51,17 @@
/obj/item/weapon/gun/projectile/automatic/sts35 /obj/item/weapon/gun/projectile/automatic/sts35
name = "assault rifle" name = "assault rifle"
desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.56mm rounds. This one is unmarked." desc = "The rugged STS-35 is a durable automatic weapon of a make popular on the frontier worlds. Uses 5.45mm rounds. This one is unmarked."
icon_state = "arifle" icon_state = "arifle"
item_state = null item_state = null
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE
force = 10 force = 10
caliber = "5.56mm" caliber = "5.45mm"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4) origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
load_method = MAGAZINE load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/m556 magazine_type = /obj/item/ammo_magazine/m545
allowed_magazines = list(/obj/item/ammo_magazine/m556) allowed_magazines = list(/obj/item/ammo_magazine/m545)
one_handed_penalty = 4 one_handed_penalty = 4
@@ -73,7 +73,7 @@
/obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands) /obj/item/weapon/gun/projectile/automatic/sts35/update_icon(var/ignore_inhands)
..() ..()
if(istype(ammo_magazine,/obj/item/ammo_magazine/m556/small)) if(istype(ammo_magazine,/obj/item/ammo_magazine/m545/small))
icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite. icon_state = "arifle-small" // If using the small magazines, use the small magazine sprite.
else else
icon_state = (ammo_magazine)? "arifle" : "arifle-empty" icon_state = (ammo_magazine)? "arifle" : "arifle-empty"
@@ -111,7 +111,6 @@
force = 10 force = 10
caliber = "7.62mm" caliber = "7.62mm"
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3) origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 3)
ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore?
fire_sound = 'sound/weapons/Gunshot.ogg' fire_sound = 'sound/weapons/Gunshot.ogg'
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
load_method = MAGAZINE load_method = MAGAZINE
@@ -181,14 +180,13 @@
force = 10 force = 10
slot_flags = 0 slot_flags = 0
max_shells = 50 max_shells = 50
caliber = "5.56mm" caliber = "5.45mm"
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2) origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 2)
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
ammo_type = "/obj/item/ammo_casing/a556" // Is this really needed anymore?
fire_sound = 'sound/weapons/machinegun.ogg' fire_sound = 'sound/weapons/machinegun.ogg'
load_method = MAGAZINE load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/m556saw magazine_type = /obj/item/ammo_magazine/m545saw
allowed_magazines = list(/obj/item/ammo_magazine/m556saw, /obj/item/ammo_magazine/m556) allowed_magazines = list(/obj/item/ammo_magazine/m545saw, /obj/item/ammo_magazine/m545)
one_handed_penalty = 6 one_handed_penalty = 6
@@ -345,7 +343,7 @@
/obj/item/weapon/gun/projectile/automatic/carbine // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start. /obj/item/weapon/gun/projectile/automatic/carbine // Admin abuse assault rifle. ToDo: Make this less shit. Maybe remove its autofire, and make it spawn with only 10 rounds at start.
name = "assault carbine" name = "assault carbine"
desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.56mm rounds." desc = "The bullpup configured GP3000 is a lightweight, compact, military-grade assault rifle produced by Gurov Projectile Weapons LLC. It is sold almost exclusively to standing armies. The serial number on this one has been scratched off. Uses 5.45mm rounds."
icon_state = "bullpup" icon_state = "bullpup"
item_state = "bullpup" item_state = "bullpup"
w_class = ITEMSIZE_LARGE w_class = ITEMSIZE_LARGE

2
code/modules/projectiles/guns/projectile/boltaction.dm
View File

@@ -19,7 +19,7 @@
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial /obj/item/weapon/gun/projectile/shotgun/pump/rifle/ceremonial
name = "ceremonial bolt-action rifle" name = "ceremonial bolt-action rifle"
desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 5.56mm rounds." desc = "A bolt-action rifle with a heavy, high-quality wood stock that has a beautiful finish. Clearly not intended to be used in combat. Uses 7.62mm rounds."
ammo_type = /obj/item/ammo_casing/a762/blank ammo_type = /obj/item/ammo_casing/a762/blank
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin /obj/item/weapon/gun/projectile/shotgun/pump/rifle/mosin

2
code/modules/projectiles/guns/projectile/pistol.dm
View File

@@ -268,7 +268,7 @@
/obj/item/ammo_casing/a12g/stunshell = "12g", /obj/item/ammo_casing/a12g/stunshell = "12g",
/obj/item/ammo_casing/a12g/flash = "12g", /obj/item/ammo_casing/a12g/flash = "12g",
/obj/item/ammo_casing/a762 = "7.62mm", /obj/item/ammo_casing/a762 = "7.62mm",
/obj/item/ammo_casing/a556 = "5.56mm" /obj/item/ammo_casing/a545 = "5.45mm"
) )
/obj/item/weapon/gun/projectile/pirate/New() /obj/item/weapon/gun/projectile/pirate/New()

6
code/modules/projectiles/projectile/bullets.dm
View File

@@ -209,14 +209,14 @@
armor_penetration = -50 armor_penetration = -50
penetrating = 0 penetrating = 0
/obj/item/projectile/bullet/rifle/a556 /obj/item/projectile/bullet/rifle/a545
damage = 25 damage = 25
/obj/item/projectile/bullet/rifle/a556/ap /obj/item/projectile/bullet/rifle/a545/ap
damage = 20 damage = 20
armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds. armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds.
/obj/item/projectile/bullet/rifle/a556/hollow /obj/item/projectile/bullet/rifle/a545/hollow
damage = 35 damage = 35
armor_penetration = -50 armor_penetration = -50
penetrating = 0 penetrating = 0

BIN
icons/obj/ammo.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB