cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-29 11:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier (#4208)

Browse Source 
* Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier (#57687)

* Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier instead.

* forgot the define

* actually if this is .35 it's 10 shots again so let's do that instead wow a .1 difference DOES matter fuck our health system

* Replaces 9x19mm with 9mm, makes the PP-95 use a damage multiplier

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-17 03:21:37 +01:00
committed by GitHub
parent 06dc83efbc
commit be7f35e8de
6 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/ammunition/ballistic/pistol.dm
View File

@@ -29,7 +29,7 @@
desc = "A 10mm Magnum bullet casing. This leaves a burning trail and ignites its target." // SKYRAT EDIT
projectile_type = /obj/projectile/bullet/incendiary/c10mm
// 9mm (Makarov and Stechkin APS)
// 9mm (Makarov, Stechkin APS, PP-95)
/obj/item/ammo_casing/c9mm
// name = "9mm bullet casing" // SKYRAT EDIT: Original

8
code/modules/projectiles/ammunition/ballistic/smg.dm
View File

@@ -33,11 +33,3 @@
name = ".45 incendiary bullet casing"
desc = "A .45 bullet casing."
projectile_type = /obj/projectile/bullet/incendiary/c45
// 9x19mm (PP-95)
/obj/item/ammo_casing/c9x19mm
name = "9x19mm bullet casing"
desc = "A 9.19mm bullet casing."
caliber = CALIBER_9X19MM
projectile_type = /obj/projectile/bullet/c9x19mm

6
code/modules/projectiles/boxes_magazines/external/smg.dm vendored
View File

@@ -31,11 +31,11 @@
icon_state = "[base_icon_state]-[round(ammo_count(), 4)]"
/obj/item/ammo_box/magazine/plastikov9mm
name = "PP-95 magazine (9x19mm)"
name = "PP-95 magazine (9mm)"
icon_state = "9x19-50"
base_icon_state = "9x19"
ammo_type = /obj/item/ammo_casing/c9x19mm
caliber = CALIBER_9X19MM
ammo_type = /obj/item/ammo_casing/c9mm
caliber = CALIBER_9MM
max_ammo = 50
/obj/item/ammo_box/magazine/plastikov9mm/update_icon_state()

3
code/modules/projectiles/guns/ballistic/automatic.dm
View File

@@ -112,7 +112,7 @@
/obj/item/gun/ballistic/automatic/plastikov
name = "\improper PP-95 SMG"
desc = "An ancient 9x19mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much."
desc = "An ancient 9mm submachine gun pattern updated and simplified to lower costs, though perhaps simplified too much."
icon_state = "plastikov"
inhand_icon_state = "plastikov"
mag_type = /obj/item/ammo_box/magazine/plastikov9mm
@@ -120,6 +120,7 @@
spread = 25
can_suppress = FALSE
actions_types = list()
projectile_damage_multiplier = 0.35 //It's like 10.5 damage per bullet, it's close enough to 10 shots
mag_display = TRUE
empty_indicator = TRUE
fire_sound = 'sound/weapons/gun/smg/shot_alt.ogg'

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

@@ -35,9 +35,3 @@
name = "4.6x30mm incendiary bullet"
damage = 10
fire_stacks = 1
// 9x19mm (PP-95)
/obj/projectile/bullet/c9x19mm
name = "9x19mm bullet"
damage = 10