From e9bf5b979d512e5fa1013eca7886b1c9831fdceb Mon Sep 17 00:00:00 2001 From: Erika Fox <94164348+Erikafox@users.noreply.github.com> Date: Thu, 12 Dec 2024 00:07:54 -0500 Subject: [PATCH] Continued Ammo Adjustments (#3838) ## About The Pull Request Makes AP ammo better in most cases HP ammo worse in most cases removes deagle minorly differentiates some cartridges. bullets no longer tell you their calibre, manufacturing plant, manufacturing date, the name of who fired them, and if they impacted an organ ## Why It's Good For The Game Continued experiments in the field of balance ## Changelog :cl: add: bullets now refuse to tell you their calibre del: deagle balance: most cartridges have been lightly adjusted. please say something if firing bullets feels weird. /:cl: --------- Signed-off-by: Erika Fox <94164348+Erikafox@users.noreply.github.com> --- .../objects/effects/spawners/random/exotic.dm | 2 +- .../crates_lockers/closets/secure/misc.dm | 6 +- code/modules/awaymissions/capture_the_flag.dm | 18 +---- .../clothing/outfits/ert/frontiersmen_ert.dm | 5 +- .../projectiles/ammunition/_ammo_casing.dm | 2 +- .../ammunition/ballistic/pistol.dm | 13 ---- .../projectiles/ammunition/ballistic/rifle.dm | 3 +- .../prefab_stacks/premade_pistol_stacks.dm | 8 -- .../boxes_magazines/external/pistol.dm | 10 --- .../projectiles/guns/ballistic/pistol.dm | 77 ++++++++++--------- code/modules/projectiles/projectile.dm | 4 +- code/modules/projectiles/projectile/beams.dm | 2 + .../modules/projectiles/projectile/bullets.dm | 1 + .../projectiles/projectile/bullets/lmg.dm | 1 + .../projectiles/projectile/bullets/pistol.dm | 67 ++++++++-------- .../projectile/bullets/revolver.dm | 17 ++-- .../projectiles/projectile/bullets/rifle.dm | 40 ++++++---- .../projectiles/projectile/bullets/shotgun.dm | 4 + .../projectiles/projectile/bullets/smg.dm | 31 +++++--- .../projectiles/projectile/bullets/sniper.dm | 9 ++- .../spells/spell_types/rightandwrong.dm | 1 - 21 files changed, 151 insertions(+), 170 deletions(-) diff --git a/code/game/objects/effects/spawners/random/exotic.dm b/code/game/objects/effects/spawners/random/exotic.dm index 84e4a0616c78c..4e5e5ebfb021f 100644 --- a/code/game/objects/effects/spawners/random/exotic.dm +++ b/code/game/objects/effects/spawners/random/exotic.dm @@ -63,7 +63,7 @@ loot = list( /obj/item/gun/ballistic/automatic/pistol/ringneck = 8, /obj/item/gun/ballistic/shotgun/automatic/m11 = 5, - /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/gun/ballistic/automatic/pistol/spitter, /obj/item/gun/ballistic/revolver/mateba ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm index e05bd45242302..893a86e77d96b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm @@ -11,9 +11,9 @@ new /obj/item/aicard(src) new /obj/item/assembly/flash/handheld(src) if(prob(50)) - new /obj/item/ammo_box/magazine/m50(src) - new /obj/item/ammo_box/magazine/m50(src) - new /obj/item/gun/ballistic/automatic/pistol/deagle(src) + new /obj/item/ammo_box/magazine/cm357(src) + new /obj/item/ammo_box/magazine/cm357(src) + new /obj/item/gun/ballistic/automatic/pistol/cm357(src) else new /obj/item/ammo_box/a357(src) new /obj/item/ammo_box/a357(src) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 037ae0add3e65..8761901578972 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -403,22 +403,6 @@ CTF.ctf_gear = initial(ctf_gear) CTF.respawn_cooldown = DEFAULT_RESPAWN -/obj/item/gun/ballistic/automatic/pistol/deagle/ctf - desc = "This looks like it could really hurt in melee." - force = 75 - default_ammo_type = /obj/item/ammo_box/magazine/m50/ctf - allowed_ammo_types = list( - /obj/item/ammo_box/magazine/m50/ctf, - ) - -/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped() - . = ..() - addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 1) - -/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/proc/floor_vanish() - if(isturf(loc)) - qdel(src) - /obj/item/ammo_box/magazine/m50/ctf ammo_type = /obj/item/ammo_casing/a50/ctf @@ -528,7 +512,7 @@ shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/tackler/combat id = /obj/item/card/id/away - belt = /obj/item/gun/ballistic/automatic/pistol/deagle/ctf + belt = /obj/item/gun/ballistic/automatic/pistol/cm357 l_pocket = /obj/item/ammo_box/magazine/recharge/ctf r_pocket = /obj/item/ammo_box/magazine/recharge/ctf r_hand = /obj/item/gun/ballistic/automatic/laser/ctf diff --git a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm index 56f2a677c129a..26075d4a82ad1 100644 --- a/code/modules/clothing/outfits/ert/frontiersmen_ert.dm +++ b/code/modules/clothing/outfits/ert/frontiersmen_ert.dm @@ -186,7 +186,7 @@ back = /obj/item/storage/backpack/satchel/leather suit = /obj/item/clothing/suit/armor/frontier suit_store = null - belt = /obj/item/gun/ballistic/automatic/pistol/deagle + belt = /obj/item/gun/ballistic/automatic/pistol/mauler backpack_contents = list(/obj/item/clothing/mask/gas/frontiersmen, /obj/item/ammo_box/magazine/m50=2, /obj/item/binoculars=1, /obj/item/melee/knife/survival) @@ -196,8 +196,7 @@ suit = /obj/item/clothing/suit/armor/vest/marine/frontier head = /obj/item/clothing/head/helmet/bulletproof/x11/frontier mask = /obj/item/clothing/mask/breath - belt = /obj/item/gun/ballistic/automatic/pistol/deagle/gold // daring today aren't we - + belt = /obj/item/gun/ballistic/automatic/pistol/mauler backpack = /obj/item/minigunpack satchel = /obj/item/minigunpack courierbag = /obj/item/minigunpack diff --git a/code/modules/projectiles/ammunition/_ammo_casing.dm b/code/modules/projectiles/ammunition/_ammo_casing.dm index f56c76a441649..5edadbca9567b 100644 --- a/code/modules/projectiles/ammunition/_ammo_casing.dm +++ b/code/modules/projectiles/ammunition/_ammo_casing.dm @@ -63,7 +63,7 @@ if(user.canUseTopic(src, BE_CLOSE)) name = "[initial(src.name)][(inputvalue ? " - '[inputvalue]'" : null)]" if(BB) - BB.name = "[initial(BB.name)][(inputvalue ? " - '[inputvalue]'" : null)]" + BB.bullet_identifier = "[initial(BB.bullet_identifier)][(inputvalue ? " - '[inputvalue]'" : null)]" else if(istype(attacking_item, /obj/item/ammo_box) && user.is_holding(src)) add_fingerprint(user) var/obj/item/ammo_box/ammo_box = attacking_item diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index aabc86f3c51eb..fd13eca2e3e5d 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -99,19 +99,6 @@ bullet_skin = "rubber" projectile_type = /obj/projectile/bullet/c45/rubber -// .50 AE (Desert Eagle) - -/obj/item/ammo_casing/a50AE - name = ".50 AE bullet casing" - desc = "A .50 AE bullet casing." - caliber = ".50 AE" - projectile_type = /obj/projectile/bullet/a50AE - -/obj/item/ammo_casing/a50AE/hp - name = ".50 AE hollow point bullet casing" - desc = "A .50 AE hollow point bullet casing." - projectile_type = /obj/projectile/bullet/a50AE/hp - // .22 LR (Himehabu, Pounder) /obj/item/ammo_casing/c22lr diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 8274020c88e58..4a94a01a994af 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -34,7 +34,7 @@ icon_state = "caseless" caliber = "a858" projectile_type = /obj/projectile/bullet/a858 - stack_size = 10 + stack_size = 5 /obj/item/ammo_casing/caseless/a858/trac name = "8x58mm tracker round" @@ -69,7 +69,6 @@ desc = "A 5.56x42mm CLIP rubber bullet casing." bullet_skin = "rubber" projectile_type = /obj/projectile/bullet/a556_42/rubber - stack_size = 15 // 7.62x40mm CLIP (SKM Rifles) diff --git a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm index 5a783652a7e3e..a907349a87495 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_stacks/prefab_stacks/premade_pistol_stacks.dm @@ -212,14 +212,6 @@ /obj/item/ammo_box/magazine/ammo_stack/prefilled/c45/rubber = 4) generate_items_inside(items_inside,src) -// .50 AE (Desert Eagle) - -/obj/item/ammo_box/magazine/ammo_stack/prefilled/a50AE - ammo_type = /obj/item/ammo_casing/a50AE - -/obj/item/ammo_box/magazine/ammo_stack/prefilled/a50AE/hp - ammo_type = /obj/item/ammo_casing/a50AE/hp - // .22 LR (Himehabu, Pounder) /obj/item/ammo_box/magazine/ammo_stack/prefilled/c22lr diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 6566f05606eb9..5f2b2bedef9cd 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -72,16 +72,6 @@ . = ..() icon_state = "[base_icon_state]-[ammo_count() == 1 ? 1 : round(ammo_count(),2)]" -/obj/item/ammo_box/magazine/m50 - name = "handgun magazine (.50 AE)" - desc = "An oversized, 7-round handgun magazine for the Desert Eagle handgun. These rounds do significant damage with average performance against armor." - icon_state = "deagle_mag-7" - base_icon_state = "deagle_mag" - ammo_type = /obj/item/ammo_casing/a50AE - caliber = ".50 AE" - max_ammo = 7 - multiple_sprites = AMMO_BOX_PER_BULLET - /obj/item/ammo_box/magazine/disposable name = "part of a disposable gun" desc = "You ripped out part of the gun, somehow, rendering it unusuable. I hope you're happy." diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index dd483aa4965eb..173750978af41 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -20,47 +20,48 @@ muzzleflash_iconstate = "muzzle_flash_light" -/obj/item/gun/ballistic/automatic/pistol/deagle - name = "\improper Desert Eagle" - desc = "An oversized handgun chambered in .50 AE. A true hand cannon." - icon = 'icons/obj/guns/manufacturer/frontier_import/48x32.dmi' - lefthand_file = 'icons/obj/guns/manufacturer/frontier_import/lefthand.dmi' - righthand_file = 'icons/obj/guns/manufacturer/frontier_import/righthand.dmi' - mob_overlay_icon = 'icons/obj/guns/manufacturer/frontier_import/onmob.dmi' - icon_state = "deagle" - force = 14 - default_ammo_type = /obj/item/ammo_box/magazine/m50 +/obj/item/gun/ballistic/automatic/pistol/candor + name = "\improper Candor" + desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of Hunter's Pride. Chambered in .45." + icon_state = "candor" + item_state = "hp_generic" + icon = 'icons/obj/guns/manufacturer/hunterspride/48x32.dmi' + lefthand_file = 'icons/obj/guns/manufacturer/hunterspride/lefthand.dmi' + righthand_file = 'icons/obj/guns/manufacturer/hunterspride/righthand.dmi' + mob_overlay_icon = 'icons/obj/guns/manufacturer/hunterspride/onmob.dmi' + + default_ammo_type = /obj/item/ammo_box/magazine/m45 allowed_ammo_types = list( - /obj/item/ammo_box/magazine/m50, + /obj/item/ammo_box/magazine/m45, ) - mag_display = TRUE - show_magazine_on_sprite = TRUE - fire_sound = 'sound/weapons/gun/pistol/deagle.ogg' - rack_sound = 'sound/weapons/gun/pistol/rack.ogg' + fire_sound = 'sound/weapons/gun/pistol/candor.ogg' + rack_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg' lock_back_sound = 'sound/weapons/gun/pistol/slide_lock.ogg' - bolt_drop_sound = 'sound/weapons/gun/pistol/rack.ogg' - manufacturer = MANUFACTURER_NONE - load_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg' - load_empty_sound = 'sound/weapons/gun/pistol/deagle_reload.ogg' - eject_sound = 'sound/weapons/gun/pistol/deagle_unload.ogg' - eject_empty_sound = 'sound/weapons/gun/pistol/deagle_unload.ogg' - fire_delay = 0.6 SECONDS - recoil = 2 - recoil_unwielded = 5 - recoil_backtime_multiplier = 2 - - spread = 7 - spread_unwielded = 14 - -/obj/item/gun/ballistic/automatic/pistol/deagle/gold - desc = "A gold-plated Desert Eagle folded over a million times by superior Martian gunsmiths. Uses .50 AE ammo." - icon_state = "deagleg" - item_state = "deagleg" - -/obj/item/gun/ballistic/automatic/pistol/deagle/camo - desc = "A Deagle-brand Deagle for operators operating operationally. Uses .50 AE ammo." //I hate this joke with a passion - icon_state = "deaglecamo" - item_state = "deagleg" + bolt_drop_sound = 'sound/weapons/gun/pistol/candor_cocked.ogg' + manufacturer = MANUFACTURER_HUNTERSPRIDE + load_sound = 'sound/weapons/gun/pistol/candor_reload.ogg' + load_empty_sound = 'sound/weapons/gun/pistol/candor_reload.ogg' + eject_sound = 'sound/weapons/gun/pistol/candor_unload.ogg' + eject_empty_sound = 'sound/weapons/gun/pistol/candor_unload.ogg' + show_magazine_on_sprite = TRUE + +NO_MAG_GUN_HELPER(automatic/pistol/candor) + +/obj/item/gun/ballistic/automatic/pistol/candor/factory //also give this to the srm, their candors should probably look factory fresh from how well taken care of they are + desc = "A classic semi-automatic handgun, widely popular throughout the Frontier. An engraving on the slide marks it as a product of 'Hunter's Pride Arms and Ammunition'. This example has been kept in especially good shape, and may as well be fresh out of the workshop. Chambered in .45." + item_state = "hp_generic_fresh" + +NO_MAG_GUN_HELPER(automatic/pistol/candor/factory) + +/obj/item/gun/ballistic/automatic/pistol/candor/factory/update_overlays() + . = ..() + . += "[initial(icon_state)]_factory" + +/obj/item/gun/ballistic/automatic/pistol/candor/phenex + name = "\improper HP Phenex" + desc = "A uniquely modified version of the Candor, famously created by Hunter's Pride. Named after the daemonic Phoenix of legend that the Ashen Huntsman had once slain, this hell-kissed weapon is more visually intimidating than its original counterpart, but mechanically acts the same. Chambered in .45." + icon_state = "phenex" + item_state = "hp_phenex" /obj/item/gun/ballistic/automatic/pistol/commissar name = "\improper Commissar" diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 968c3f85ebbc2..34faf6e6bd804 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -19,7 +19,8 @@ var/near_miss_sound = "" var/ricochet_sound = "" - + ///what we should call the fired bullet + var/bullet_identifier = "high velocity gnome" resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/def_zone = "" //Aiming at @@ -694,6 +695,7 @@ trajectory_ignore_forcemove = FALSE trajectory = new(starting.x, starting.y, starting.z, pixel_x, pixel_y, Angle, SSprojectiles.global_pixel_speed) last_projectile_move = world.time + name = bullet_identifier fired = TRUE SEND_SIGNAL(src, COMSIG_PROJECTILE_FIRE) if(hitscan) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index b0942a242cacd..9245d7cbd7814 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -17,6 +17,8 @@ near_miss_sound = 'sound/weapons/gun/hit/energy_miss1.ogg' ricochet_sound = 'sound/weapons/gun/hit/energy_ricochet1.ogg' + bullet_identifier = "laser" + flag = "laser" eyeblur = 2 impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 277aa5e0404e8..c6d42a41e58bf 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -18,6 +18,7 @@ near_miss_sound = "bullet_miss" ricochet_sound = "bullet_bounce" + bullet_identifier = "bullet" impact_effect_type = /obj/effect/temp_visual/impact_effect ricochets_max = 5 //should be enough to scare the shit out of someone diff --git a/code/modules/projectiles/projectile/bullets/lmg.dm b/code/modules/projectiles/projectile/bullets/lmg.dm index 5e246236fc701..635c496eaaec0 100644 --- a/code/modules/projectiles/projectile/bullets/lmg.dm +++ b/code/modules/projectiles/projectile/bullets/lmg.dm @@ -61,6 +61,7 @@ damage = 25 armour_penetration = 40 speed = BULLET_SPEED_RIFLE + bullet_identifier = "large bullet" /obj/projectile/bullet/mm712x82/ap name = "7.12x82mm armor-piercing bullet" diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index 73da54ea58195..e118bbdbe32dc 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -2,23 +2,24 @@ /obj/projectile/bullet/c22lr name = ".22LR bullet" - damage = 18 - armour_penetration = -45 + damage = 16 + armour_penetration = -40 ricochet_incidence_leeway = 20 ricochet_chance = 65 speed = BULLET_SPEED_HANDGUN + bullet_identifier = "tiny bullet" /obj/projectile/bullet/c22lr/hp - name = ".22LR bullet" - damage = 24 - armour_penetration = -65 + name = ".22LR HP bullet" + damage = 22 + armour_penetration = -50 ricochet_chance = 0 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c22lr/ap name = ".22LR armor piercing bullet" - damage = 14 - armour_penetration = -25 + damage = 15 + armour_penetration = -20 ricochet_incidence_leeway = 20 ricochet_chance = 30 speed_mod = BULLET_SPEED_AP_MOD @@ -27,12 +28,13 @@ name = ".22LR rubber bullet" damage = 4 stamina = 15 - armour_penetration = -70 + armour_penetration = -50 speed_mod = BULLET_SPEED_HV_MOD //do not do this for other rubber bullets. If you do I will come out of the woodwork and bludgeon you to death with this stick i found. ricochets_max = 8 //ding ding ding ding ricochet_incidence_leeway = 70 ricochet_chance = 130 ricochet_decay_damage = 0.8 + bullet_identifier = "tiny rubber bullet" // 9mm (Commander, SABR) @@ -41,6 +43,7 @@ damage = 20 armour_penetration = -20 speed = BULLET_SPEED_HANDGUN + bullet_identifier = "small bullet" /obj/projectile/bullet/c9mm/surplus name = "9mm surplus bullet" @@ -49,14 +52,14 @@ /obj/projectile/bullet/c9mm/ap name = "9mm armor-piercing bullet" - damage = 15 + damage = 18 armour_penetration = 20 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c9mm/hp name = "9mm hollow point bullet" - damage = 35 - armour_penetration = -50 + damage = 30 + armour_penetration = -30 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c9mm/rubber @@ -65,6 +68,7 @@ armour_penetration = -40 stamina = 30 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "small rubber bullet" // 10mm (Ringneck) @@ -73,6 +77,7 @@ damage = 25 armour_penetration = -20 speed = BULLET_SPEED_HANDGUN + bullet_identifier = "small bullet" /obj/projectile/bullet/c10mm/surplus name = "10mm surplus bullet" @@ -81,64 +86,54 @@ /obj/projectile/bullet/c10mm/ap name = "10mm armor-piercing bullet" - damage = 20 + damage = 23 armour_penetration = 20 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c10mm/hp name = "10mm hollow point bullet" - damage = 40 - armour_penetration = -50 + damage = 35 + armour_penetration = -30 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c10mm/rubber name = "10mm rubber bullet" damage = 7 - stamina = 38 - armour_penetration = -40 + stamina = 35 + armour_penetration = -30 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "small rubber bullet" // .45 (Candor, C20r) /obj/projectile/bullet/c45 name = ".45 bullet" - damage = 25 + damage = 27 armour_penetration = -20 speed = BULLET_SPEED_HANDGUN + bullet_identifier = "small bullet" /obj/projectile/bullet/c45/surplus name = ".45 surplus bullet" - damage = 20 + damage = 22 speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c45/ap name = ".45 armor-piercing bullet" - damage = 20 + damage = 25 armour_penetration = 20 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c45/hp name = ".45 hollow point bullet" - damage = 40 - armour_penetration = -50 + damage = 37 + armour_penetration = -30 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c45/rubber name = ".45 rubber bullet" damage = 7 - stamina = 38 - armour_penetration = -40 + stamina = 37 + armour_penetration = -30 speed_mod = BULLET_SPEED_RUBBER_MOD - -// .50 AE (Desert Eagle) - -/obj/projectile/bullet/a50AE - name = ".50 AE bullet" - damage = 40 - speed = BULLET_SPEED_HANDGUN - -/obj/projectile/bullet/a50AE/hp - name = ".50 AE hollow point bullet" - damage = 55 - armour_penetration = -20 - speed_mod = BULLET_SPEED_HP_MOD + bullet_identifier = "small rubber bullet" diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index 47036d5dbda99..45206fc24d7c6 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -5,6 +5,7 @@ damage = 20 armour_penetration = -20 speed = BULLET_SPEED_REVOLVER + bullet_identifier = "small bullet" /obj/projectile/bullet/c38/surplus damage = 15 @@ -32,11 +33,12 @@ ricochet_incidence_leeway = 70 ricochet_chance = 130 ricochet_decay_damage = 0.8 + bullet_identifier = "small rubber bullet" /obj/projectile/bullet/c38/dumdum name = ".38 dum-dum bullet" damage = 20 - armour_penetration = -50 + armour_penetration = -40 ricochets_max = 0 shrapnel_type = /obj/item/shrapnel/bullet/c38/dumdum @@ -75,6 +77,7 @@ damage = 30 speed = BULLET_SPEED_REVOLVER + bullet_identifier = "medium bullet" /obj/projectile/bullet/a357/match name = ".357 match bullet" @@ -94,13 +97,13 @@ speed_mod = BULLET_SPEED_HP_MOD ricochet_chance = 0 - // .45-70 Gov't (Hunting Revolver) /obj/projectile/bullet/a4570 name = ".45-70 bullet" damage = 45 //crits in 3-4 taps depending on armor speed = BULLET_SPEED_REVOLVER + bullet_identifier = "large bullet" /obj/projectile/bullet/a4570/match name = ".45-70 match bullet" @@ -116,7 +119,7 @@ /obj/projectile/bullet/a4570/hp name = ".45-70 hollow point bullet" damage = 55 - armour_penetration = -50 + armour_penetration = -10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/a4570/explosive //for extra oof @@ -134,17 +137,19 @@ name = ".44 roumain bullet" damage = 25 speed = BULLET_SPEED_REVOLVER + bullet_identifier = "small bullet" /obj/projectile/bullet/a44roum/rubber name = ".44 roumain rubber bullet" damage = 7 - stamina = 38 - armour_penetration = -20 + stamina = 40 + armour_penetration = -10 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "small rubber bullet" /obj/projectile/bullet/a44roum/hp name = ".44 roumain hollow point bullet" damage = 40 - armour_penetration = -20 + armour_penetration = -10 ricochet_chance = 0 speed_mod = BULLET_SPEED_HP_MOD diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index cc0ecd87c2f65..fb25a48dde87f 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -5,25 +5,27 @@ damage = 25 armour_penetration = 20 speed = BULLET_SPEED_RIFLE + bullet_identifier = "medium bullet" /obj/projectile/bullet/a556_42/hp name = "5.56x42mm CLIP hollow point bullet" damage = 35 - armour_penetration = 0 + armour_penetration = 10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/a556_42/ap - name = "5.56x42mm CLIP bullet" - damage = 20 + name = "5.56x42mm CLIP AP bullet" + damage = 22 armour_penetration = 40 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/a556_42/rubber - name = "5.56x42mm CLIP bullet" + name = "5.56x42mm CLIP Rubber bullet" damage = 5 stamina = 25 armour_penetration = 0 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "medium bullet" // 8x50mmR (Illestren Rifle) @@ -32,17 +34,18 @@ damage = 35 armour_penetration = 40 speed = BULLET_SPEED_RIFLE + bullet_identifier = "large bullet" /obj/projectile/bullet/a8_50r/hp name = "8x50mmR hollow point bullet" - damage = 49 - armour_penetration = 0 + damage = 50 + armour_penetration = 10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/a8_50r/match name = "8x50mmR match bullet" damage = 40 - armour_penetration = -10 + armour_penetration = 30 speed_mod = BULLET_SPEED_AP_MOD ricochets_max = 4 ricochet_chance = 80 @@ -64,16 +67,17 @@ damage = 30 armour_penetration = 20 speed = BULLET_SPEED_RIFLE + bullet_identifier = "medium bullet" /obj/projectile/bullet/a762_40/hp name = "7.62x40mm CLIP hollow point bullet" damage = 40 - armour_penetration = 0 + armour_penetration = 10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/a762_40/ap name = "7.62x40mm CLIP armor piercing bullet" - damage = 25 + damage = 27 armour_penetration = 40 speed_mod = BULLET_SPEED_AP_MOD @@ -81,37 +85,38 @@ name = "7.62x40mm CLIP rubber bullet" damage = 15 stamina = 40 - armour_penetration = 0 + armour_penetration = 10 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "medium rubber bullet" //.308 WIN (M514 & GAL DMRs) /obj/projectile/bullet/a308 name = ".308 bullet" - speed = 0.3 damage = 30 armour_penetration = 40 speed = BULLET_SPEED_RIFLE + bullet_identifier = "large bullet" /obj/projectile/bullet/a308/hp name = ".308 hollow point bullet" damage = 40 - armour_penetration = 10 + armour_penetration = 30 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/a308/ap name = ".308 armor piercing bullet" - damage = 25 + damage = 27 armour_penetration = 60 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/a308/rubber //"rubber" name = ".308 rubber bullet" - speed = 0.3 - damage = 25 - stamina = 50 - armour_penetration = 40 + damage = 20 + stamina = 40 + armour_penetration = 20 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "large rubber bullet" // .299 Eoehoma Caseless (E-40) @@ -120,3 +125,4 @@ damage = 20 armour_penetration = 10 speed = BULLET_SPEED_RIFLE + bullet_identifier = "medium bullet" diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 41a12f7eaf30d..79120cb6749ae 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -3,6 +3,7 @@ damage = 40 armour_penetration = -10 speed = BULLET_SPEED_SHOTGUN + bullet_identifier = "large slug" /obj/projectile/bullet/slug/beanbag name = "beanbag slug" @@ -70,6 +71,7 @@ icon_state = "pellet" armour_penetration = -35 speed = BULLET_SPEED_SHOTGUN + bullet_identifier = "pellet" /obj/projectile/bullet/pellet/buckshot name = "buckshot pellet" @@ -81,6 +83,7 @@ tile_dropoff = 0.15 stamina = 15 armour_penetration = -70 + bullet_identifier = "rubber pellet" /obj/projectile/bullet/pellet/rubbershot/incapacitate name = "incapacitating pellet" @@ -114,6 +117,7 @@ damage = 30 armour_penetration = -25 tile_dropoff = 3 + bullet_identifier = "massive pellet" /obj/projectile/bullet/pellet/blank name = "blank" diff --git a/code/modules/projectiles/projectile/bullets/smg.dm b/code/modules/projectiles/projectile/bullets/smg.dm index 9557f40b1e1c1..5738b0cf67f4a 100644 --- a/code/modules/projectiles/projectile/bullets/smg.dm +++ b/code/modules/projectiles/projectile/bullets/smg.dm @@ -2,18 +2,19 @@ /obj/projectile/bullet/c57x39mm name = "5.7x39mm bullet" - damage = 20 + damage = 23 speed = BULLET_SPEED_PDW + bullet_identifier = "small bullet" /obj/projectile/bullet/c57x39mm/hp name = "5.7x39mm hollow point bullet" - damage = 30 - armour_penetration = -20 + damage = 33 + armour_penetration = -10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c57x39mm/ap name = "5.7x39mm armor piercing bullet" - damage = 20 + damage = 21 armour_penetration = 20 speed_mod = BULLET_SPEED_AP_MOD @@ -22,6 +23,7 @@ damage = 5 stamina = 20 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "small rubber bullet" // 4.6x30mm (WT-550 Automatic Rifle & NT-SVG) @@ -29,27 +31,31 @@ name = "4.6x30mm bullet" damage = 20 speed = BULLET_SPEED_PDW + bullet_identifier = "small bullet" /obj/projectile/bullet/c46x30mm/recycled - damage = 17 + damage = 15 speed_mod = BULLET_SPEED_SURPLUS_MOD /obj/projectile/bullet/c46x30mm/ap name = "4.6x30mm armor-piercing bullet" - damage = 15 + damage = 18 armour_penetration = 40 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c46x30mm/hp name = "4.6x30mm bullet" - damage = 25 + damage = 30 + armour_penetration = -10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c46x30mm/rubber name = "4.6x30mm bullet" damage = 4 stamina = 20 + armour_penetration = -10 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "small rubber bullet" // 4.73x33mm caseless (Solar) @@ -57,12 +63,14 @@ name = "4.73x33mm bullet" damage = 25 armour_penetration = 20 + bullet_identifier = "small bullet" // 5.56 HITP caseless (Solare C) /obj/projectile/bullet/c556mm name = "5.56mm HITP bullet" damage = 20 + bullet_identifier = "small bullet" /obj/projectile/bullet/c556mm/surplus name = "5.56mm HITP surplus bullet" @@ -71,19 +79,20 @@ /obj/projectile/bullet/c556mm/ap name = "5.56mm HITP AP bullet" - damage = 15 - armour_penetration = 40 + damage = 19 + armour_penetration = 20 speed_mod = BULLET_SPEED_AP_MOD /obj/projectile/bullet/c556mm/hp name = "5.56mm HITP hollow point bullet" damage = 30 - armour_penetration = -50 + armour_penetration = -10 speed_mod = BULLET_SPEED_HP_MOD /obj/projectile/bullet/c556mm/rubber name = "5.56mm HITP rubber bullet" damage = 5 stamina = 30 - armour_penetration = -20 + armour_penetration = -10 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "small rubber bullet" diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm index 268d4a9aaf23a..f79361ccbc1fe 100644 --- a/code/modules/projectiles/projectile/bullets/sniper.dm +++ b/code/modules/projectiles/projectile/bullets/sniper.dm @@ -8,6 +8,7 @@ dismemberment = 50 armour_penetration = 60 var/breakthings = TRUE + bullet_identifier = "huge bullet" /obj/projectile/bullet/p50/on_hit(atom/target, blocked = 0) if(isobj(target) && (blocked != 100) && breakthings) @@ -46,6 +47,7 @@ stamina = 10 damage = 40 armour_penetration = 50 + bullet_identifier = "huge bullet" speed = BULLET_SPEED_SNIPER @@ -65,14 +67,16 @@ damage = 10 stamina = 40 speed_mod = BULLET_SPEED_RUBBER_MOD + bullet_identifier = "huge rubber bullet" // 8x58mm caseless (SG-669) /obj/projectile/bullet/a858 name = "8x58mm caseless bullet" - damage = 35 - armour_penetration = 40 + damage = 40 + armour_penetration = 45 speed = BULLET_SPEED_SNIPER + bullet_identifier = "huge bullet" /obj/projectile/bullet/a858/trac name = "8x58mm tracker" @@ -88,6 +92,7 @@ stamina = 10 armour_penetration = 40 speed = BULLET_SPEED_RIFLE + bullet_identifier = "huge bullet" /obj/projectile/bullet/a300/trac name = ".300 Tracker" diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index a5c542c819ceb..a47d8cf7c85be 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -11,7 +11,6 @@ GLOBAL_LIST_INIT(summoned_guns, list( /obj/item/gun/energy/laser, /obj/item/gun/ballistic/revolver/viper, /obj/item/gun/ballistic/revolver/detective, - /obj/item/gun/ballistic/automatic/pistol/deagle/camo, /obj/item/gun/ballistic/automatic/gyropistol, /obj/item/gun/energy/pulse, /obj/item/gun/ballistic/automatic/pistol/ringneck,