From f631ae70fb15a9a5ab8b9e8a56dfa602ae666b47 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 19 Jan 2023 16:58:18 -0500 Subject: [PATCH] Event Stuff Bugfix/Balance Pass - Fixes some pathing bugs on a submap - Fixes the Frontier DMR to have the correct ammo cost and firing sound - Fixes ERT voidsuits back slots - Buffs armor values of ERT and Merc voidsuits - Nerfs armor values of Heartbreaker voidsuits - Buffs armor values of Asset Protection, Combat, and Military rigs, as well as the knockoff Breacher rig - Nerfs armor values of the genuine Breacher rig --- .../modules/clothing/spacesuits/rig/suits/alien_vr.dm | 5 +++++ .../clothing/spacesuits/rig/suits/combat_vr.dm | 5 +++++ code/modules/clothing/spacesuits/rig/suits/ert_vr.dm | 2 +- code/modules/clothing/spacesuits/void/ert_vr.dm | 3 ++- code/modules/clothing/spacesuits/void/event_vr.dm | 4 ++-- code/modules/clothing/spacesuits/void/merc_vr.dm | 11 +++++++++++ code/modules/projectiles/guns/energy/pump.dm | 2 ++ maps/offmap_vr/om_ships/shelter_6.dmm | 10 ++++++---- vorestation.dme | 3 +++ 9 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 code/modules/clothing/spacesuits/rig/suits/alien_vr.dm create mode 100644 code/modules/clothing/spacesuits/rig/suits/combat_vr.dm create mode 100644 code/modules/clothing/spacesuits/void/merc_vr.dm diff --git a/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm new file mode 100644 index 00000000000..618de40a2de --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm @@ -0,0 +1,5 @@ +/obj/item/weapon/rig/breacher + armor = list(melee = 60, bullet = 50, laser = 50, energy = 10, bomb = 50, bio = 100, rad = 20) + +/obj/item/weapon/rig/breacher/fancy + armor = list(melee = 80, bullet = 80, laser = 80, energy = 40, bomb = 80, bio = 100, rad = 60) //Still a tank just not indestructable diff --git a/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm new file mode 100644 index 00000000000..9a6e81efc54 --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm @@ -0,0 +1,5 @@ +/obj/item/weapon/rig/combat + armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) + +/obj/item/weapon/rig/military + armor = list(melee = 80, bullet = 80, laser = 70, energy = 15, bomb = 80, bio = 100, rad = 50) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm index 14b1e1d98f6..4782058b3a8 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm @@ -10,4 +10,4 @@ ) /obj/item/weapon/rig/ert/assetprotection - armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60) + armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 2f10083694b..93bd09d388c 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -3,7 +3,7 @@ desc = "Utilizing cutting edge tech from Hephaestus, the Mark VII is the latest and greatest in semi-powered personal protection systems; like the civilian AutoLok suit, the Mark VII can automatically adapt to fit most species without issue via RFID tags. This significantly reduces the time required for response teams to suit up, as it eliminates the need for dedicated cycler units. It also has an integrated, unremovable helmet. Standard air tanks, suit coolers, and magboots may be installed and removed as needed." icon_state = "ertsuit" item_state = "ertsuit" - armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) + armor = list(melee = 60, bullet = 50, laser = 50,energy = 15, bomb = 50, bio = 100, rad = 100) slowdown = 0.5 siemens_coefficient = 0.5 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI,SPECIES_ALTEVIAN) //this thing can autoadapt @@ -15,6 +15,7 @@ min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 15* ONE_ATMOSPHERE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000 + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) /obj/item/clothing/suit/space/void/responseteam/command name = "Mark VII-C Emergency Response Team Commander Suit" diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index e62e53e7f3f..7b6d93e0c7d 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -240,7 +240,7 @@ default_worn_icon = 'icons/inventory/suit/mob_vr_altevian.dmi' icon_state = "rig-heartbreaker" - armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 80) + armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40) species_restricted = list(SPECIES_ALTEVIAN) no_cycle = TRUE @@ -254,7 +254,7 @@ default_worn_icon = 'icons/inventory/head/mob_vr_altevian.dmi' icon_state = "rig0-heartbreaker" - armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 80) + armor = list(melee = 70, bullet = 60, laser = 60, energy = 30, bomb = 80, bio = 100, rad = 40) species_restricted = list(SPECIES_ALTEVIAN) no_cycle = TRUE diff --git a/code/modules/clothing/spacesuits/void/merc_vr.dm b/code/modules/clothing/spacesuits/void/merc_vr.dm new file mode 100644 index 00000000000..4b730d30e24 --- /dev/null +++ b/code/modules/clothing/spacesuits/void/merc_vr.dm @@ -0,0 +1,11 @@ +/obj/item/clothing/head/helmet/space/void/merc + armor = list(melee = 70, bullet = 60, laser = 40,energy = 15, bomb = 45, bio = 100, rad = 60) + +/obj/item/clothing/suit/space/void/merc + armor = list(melee = 70, bullet = 60, laser = 40,energy = 15, bomb = 45, bio = 100, rad = 60) + +/obj/item/clothing/head/helmet/space/void/merc/fire + armor = list(melee = 50, bullet = 50, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50) + +/obj/item/clothing/suit/space/void/merc/fire + armor = list(melee = 50, bullet = 50, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50) \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm index 693ad2bb016..1f2029e6056 100644 --- a/code/modules/projectiles/guns/energy/pump.dm +++ b/code/modules/projectiles/guns/energy/pump.dm @@ -183,6 +183,8 @@ scoped_accuracy = 40 one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand. phase_power = 150 //efficient crank charger + fire_sound = null + charge_cost = 600 projectile_type = /obj/item/projectile/beam/sniper modifystate = "phrifledmr" diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index 24fff5c4c85..c07a750cd07 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -292,14 +292,16 @@ /obj/item/ammo_magazine/ammo_box/b12g, /obj/item/ammo_magazine/ammo_box/b12g, /obj/item/ammo_magazine/ammo_box/b12g, -/obj/item/weapon/storage/box/empshells/large, -/obj/item/weapon/storage/box/empshells/large, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/emp, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/item/ammo_magazine/ammo_box/b12g/beanbag, /obj/item/ammo_magazine/ammo_box/b12g/stunshell, /obj/item/ammo_magazine/ammo_box/b12g/stunshell, -/obj/item/weapon/storage/box/flashshells, -/obj/item/weapon/storage/box/flashshells, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, diff --git a/vorestation.dme b/vorestation.dme index d0bf9f13764..6cd2127159e 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2059,7 +2059,9 @@ #include "code\modules\clothing\spacesuits\rig\modules\specific\vision.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\voice.dm" #include "code\modules\clothing\spacesuits\rig\suits\alien.dm" +#include "code\modules\clothing\spacesuits\rig\suits\alien_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\combat.dm" +#include "code\modules\clothing\spacesuits\rig\suits\combat_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\light.dm" @@ -2072,6 +2074,7 @@ #include "code\modules\clothing\spacesuits\void\event.dm" #include "code\modules\clothing\spacesuits\void\event_vr.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" +#include "code\modules\clothing\spacesuits\void\merc_vr.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm" #include "code\modules\clothing\spacesuits\void\station_vr.dm"