Merge pull request #15750 from Steelpoint/M90

C20r Buff | M90 Removal
This commit is contained in:
Cheridan
2016-02-27 00:22:01 -06:00
5 changed files with 4 additions and 40 deletions

View File

@@ -75,7 +75,7 @@
/obj/item/ammo_casing/c45nostamina
desc = "A .45 bullet casing."
caliber = ".45"
projectile_type = /obj/item/projectile/bullet/weakbullet3
projectile_type = /obj/item/projectile/bullet/midbullet3
/obj/item/ammo_casing/n762
desc = "A 7.62x38mmR bullet casing."

View File

@@ -247,11 +247,11 @@
/obj/item/ammo_box/magazine/smgm45
name = "SMG magazine (.45)"
icon_state = "c20r45-20"
icon_state = "c20r45-24"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/c45
ammo_type = /obj/item/ammo_casing/c45nostamina
caliber = ".45"
max_ammo = 20
max_ammo = 24
/obj/item/ammo_box/magazine/smgm45/update_icon()
..()