mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-04 06:23:19 +00:00
Reverts ammo change, fixes P90
This commit is contained in:
@@ -305,7 +305,7 @@
|
||||
icon_state = "p90smg"
|
||||
item_state = "p90"
|
||||
w_class = 3
|
||||
caliber = "5mm"
|
||||
caliber = "9mm"
|
||||
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
|
||||
slot_flags = SLOT_BELT // ToDo: Belt sprite.
|
||||
fire_sound = 'sound/weapons/Gunshot_light.ogg'
|
||||
|
||||
@@ -177,17 +177,17 @@
|
||||
penetrating = 1
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a762
|
||||
damage = 35
|
||||
damage = 25
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a762/ap
|
||||
damage = 30
|
||||
damage = 20
|
||||
armor_penetration = 50 // At 40 or more armor, this will do more damage than standard rounds.
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a556
|
||||
damage = 25
|
||||
damage = 35
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a556/ap
|
||||
damage = 20
|
||||
damage = 30
|
||||
armor_penetration = 50 // At 30 or more armor, this will do more damage than standard rounds.
|
||||
|
||||
/obj/item/projectile/bullet/rifle/a145
|
||||
|
||||
@@ -38,7 +38,6 @@ changes:
|
||||
- rscadd: "All magazines and ammunitions can now be produced with the autolathe."
|
||||
- maptweak: "New bullpup SMG is available in armory area on CentCom level."
|
||||
- tweak: "Revolvers now use 6 shots. Finally."
|
||||
- tweak: "5.56 now does less damage, 7.62 does more, because previously it was backwards which made no sense."
|
||||
- tweak: "Most guns that didn't use magazines before for some reason (such as the Uzi) now use magazines."
|
||||
- tweak: "All casings now update icons if they have been spent."
|
||||
- tweak: "Corrects Pulse Rifle charge cost consistency."
|
||||
|
||||
Reference in New Issue
Block a user