Skip to content
This repository has been archived by the owner on Nov 5, 2023. It is now read-only.

Un-Nerfs the minigun + PA nerf #182

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions code/modules/clothing/suits/power_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
/obj/item/clothing/suit/armor/power_armor/proc/assign_traits(mob/user)
if(no_power) // Has no charge left
return
ADD_TRAIT(user, TRAIT_STUNIMMUNE, "PA_stun_immunity")
ADD_TRAIT(user, TRAIT_PUSHIMMUNE, "PA_push_immunity")
ADD_TRAIT(user, SPREAD_CONTROL, "PA_spreadcontrol")
ADD_TRAIT(user, TRAIT_POWER_ARMOR, "PA_worn_trait") // General effects from being in PA
Expand All @@ -85,7 +84,6 @@
remove_traits(user)

/obj/item/clothing/suit/armor/power_armor/proc/remove_traits(mob/user)
REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "PA_stun_immunity")
REMOVE_TRAIT(user, TRAIT_PUSHIMMUNE, "PA_push_immunity")
REMOVE_TRAIT(user, SPREAD_CONTROL, "PA_spreadcontrol")
REMOVE_TRAIT(user, TRAIT_POWER_ARMOR, "PA_worn_trait")
Expand Down Expand Up @@ -328,17 +326,15 @@
name = "T-45b power armor"
desc = "It's a set of early-model T-45 power armor with a custom air conditioning module and restored servomotors. Bulky, but almost as good as the real thing."
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45b
armor_block_chance = 50
deflection_chance = 10
armor_block_chance = 10

/obj/item/clothing/suit/armor/power_armor/t45d
name = "T-45d power armor"
desc = "Originally developed and manufactured for the United States Army by American defense contractor West Tek, the T-45d power armor was the first version of power armor to be successfully deployed in battle."
icon_state = "t45dpowerarmor"
item_state = "t45dpowerarmor"
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t45d
armor_block_chance = 50
deflection_chance = 10
armor_block_chance = 10

/obj/item/clothing/suit/armor/power_armor/t45d/bos
name = "Brotherhood T-45d Power Armour"
Expand All @@ -353,8 +349,7 @@
item_state = "t51bpowerarmor"
salvage_loot = list(/obj/item/stack/crafting/armor_plate = 25)
salvaged_type = /obj/item/clothing/suit/armor/heavy/salvaged_pa/t51b
armor_block_chance = 60
deflection_chance = 10
armor_block_chance = 20

/obj/item/clothing/suit/armor/power_armor/t51b/hardened
name = "Hardened T-51b power armor"
Expand All @@ -374,15 +369,13 @@
icon_state = "excavator"
item_state = "excavator"
armor_block_chance = 20
deflection_chance = 0

/obj/item/clothing/suit/armor/power_armor/advanced
name = "advanced power armor"
desc = "An advanced suit of armor typically used by the Enclave.<br>It is composed of lightweight metal alloys, reinforced with ceramic castings at key stress points.<br>Additionally, like the T-51b power armor, it includes a recycling system that can convert human waste into drinkable water, and an air conditioning system for its user's comfort."
icon_state = "advpowerarmor1"
item_state = "advpowerarmor1"
armor_block_chance = 60
deflection_chance = 15
armor_block_chance = 25

//Peacekeeper armor adjust as needed
/obj/item/clothing/suit/armor/power_armor/advanced/x02
Expand Down
3 changes: 3 additions & 0 deletions code/modules/projectiles/guns/ballistic/minigun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
force = GUN_MELEE_FORCE_PISTOL_HEAVY
weapon_weight = GUN_TWO_HAND_ONLY
draw_time = GUN_DRAW_LONG
fire_delay = GUN_FIRE_DELAY_FASTEST
burst_shot_delay = GUN_BURSTFIRE_DELAY_BASE 2
burst_size = 1
damage_multiplier = GUN_LESS_DAMAGE_T5
init_recoil = LMG_RECOIL(0.5)
init_firemodes = list(
Expand Down