diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 21b74fb6328..61143bc0cca 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -757,14 +757,13 @@
/obj/screen/alert/status_effect/bearserker_rage
name = "Bearserker Rage"
desc = "Blood flows between your fingers, and Foh'Sie roars; \"MORE BLOOD!\""
- icon_state = "blood"
+ icon_state = "bearserker"
/datum/status_effect/bearserker_rage/on_apply()
. = ..()
if(. && ishuman(owner))
var/mob/living/carbon/human/H = owner
H.physiology.stamina_mod *= 0.75
- H.physiology.heat_mod *= 0.5
add_attack_logs(owner, owner, "gained bearserker rage resistances", ATKLOG_ALL)
owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, TRUE, use_reverb = FALSE)
@@ -772,5 +771,4 @@
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
H.physiology.stamina_mod /= 0.75
- H.physiology.heat_mod /= 0.5
add_attack_logs(owner, owner, "lost bearserker rage resistances", ATKLOG_ALL)
diff --git a/code/datums/uplink_items/uplink_traitor.dm b/code/datums/uplink_items/uplink_traitor.dm
index b2a6d7c70b8..36d8651651c 100644
--- a/code/datums/uplink_items/uplink_traitor.dm
+++ b/code/datums/uplink_items/uplink_traitor.dm
@@ -419,7 +419,7 @@
Made with love, lots of spirits and lots of the other kind of spirits by the Sydnicate-affiliated cult, Children of Ursa Major."
reference = "BSP"
item = /obj/item/clothing/head/bearpelt/bearserk
- cost = 65
+ cost = 60
excludefrom = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/stealthy_tools/traitor_belt
diff --git a/code/modules/martial_arts/bearserk.dm b/code/modules/martial_arts/bearserk.dm
index 311bf97f3ef..68d2454c048 100644
--- a/code/modules/martial_arts/bearserk.dm
+++ b/code/modules/martial_arts/bearserk.dm
@@ -1,5 +1,5 @@
/datum/martial_art/bearserk
- weight = 9 // Higher weight than Krav-Maga, brute force overrules
+ weight = 8 // Only beaten out by Carp-Fu, because being able to go back to using guns when you want to is OP
name = "Rage of the Space Bear"
has_explaination_verb = TRUE
combos = list(/datum/martial_combo/bearserk/bear_jaws, /datum/martial_combo/bearserk/paw_slam, /datum/martial_combo/bearserk/smokey)
@@ -12,7 +12,7 @@
D.visible_message("[A] [atk_verb] [D]!", "[A] [atk_verb] you!")
D.apply_damage(10, BRUTE, A.zone_selected)
if(isliving(D) && D.stat != DEAD)
- A.adjustStaminaLoss(-10)
+ A.adjustStaminaLoss(-20)
add_attack_logs(A, D, "Melee attacked with martial-art [src] : Punched", ATKLOG_ALL)
return TRUE
@@ -20,7 +20,7 @@
to_chat(user, "Quelling the ursine rage for a moment, you ponder on how a Space Bear fights...")
/datum/martial_art/bearserk/explaination_footer(user)
- to_chat(user, "Most combos recover stamina and grant a stamina resistance buff, so get aggressive!")
+ to_chat(user, "All combos recover stamina and grant a stamina resistance buff, so get aggressive!")
/datum/martial_art/bearserk/teach(mob/living/carbon/human/H, make_temporary = 0)
..()
@@ -39,7 +39,9 @@
// The Pelt
/obj/item/clothing/head/bearpelt/bearserk
- armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, RAD = 0, FIRE = 10, ACID = 10)
+ strip_delay = 80
+ armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, RAD = 0, FIRE = INFINITY, ACID = 75)
+ resistance_flags = FIRE_PROOF
body_parts_covered = UPPER_TORSO|HEAD|ARMS
var/datum/martial_art/bearserk/style
@@ -56,6 +58,7 @@
style.teach(H, TRUE)
H.faction |= "russian" // Russian Hardbass Begins
H.physiology.stun_mod *= 0.80
+ ADD_TRAIT(H, TRAIT_RESISTHEAT, "bearserk")
/obj/item/clothing/head/bearpelt/bearserk/dropped(mob/user, datum/reagent/R)
..()
@@ -63,9 +66,10 @@
return
var/mob/living/carbon/human/H = user
if(H.get_item_by_slot(SLOT_HUD_HEAD) == src)
+ style.remove(H)
H.faction -= "russian" // Hardbass stops
H.physiology.stun_mod /= 0.80
- style.remove(H)
+ REMOVE_TRAIT (H, TRAIT_RESISTHEAT, "bearserk")
/obj/item/clothing/head/bearpelt/bearserk/examine(mob/user)
. = ..()
diff --git a/code/modules/martial_arts/combos/bearserk/bear_jaws.dm b/code/modules/martial_arts/combos/bearserk/bear_jaws.dm
index 44963659157..29ab6004625 100644
--- a/code/modules/martial_arts/combos/bearserk/bear_jaws.dm
+++ b/code/modules/martial_arts/combos/bearserk/bear_jaws.dm
@@ -11,7 +11,7 @@
"[user] leaps onto you and bites you like a real savage!")
target.apply_damage(20, BRUTE, user.zone_selected, sharp = TRUE)
if(isliving(target) && target.stat != DEAD)
- user.adjustStaminaLoss(-30)
+ user.adjustStaminaLoss(-60)
user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Bear Jaws", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
@@ -20,7 +20,7 @@
"[user] [atk_verb] you!")
target.apply_damage(10, BRUTE, user.zone_selected, sharp = TRUE)
if(isliving(target) && target.stat != DEAD)
- user.adjustStaminaLoss(-15)
+ user.adjustStaminaLoss(-40)
user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
add_attack_logs(user, target, "Melee attacked with martial-art [MA] : Bear Jaws", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/bearserk/paw_slam.dm b/code/modules/martial_arts/combos/bearserk/paw_slam.dm
index 0853cb1c5a9..7205a693e0b 100644
--- a/code/modules/martial_arts/combos/bearserk/paw_slam.dm
+++ b/code/modules/martial_arts/combos/bearserk/paw_slam.dm
@@ -12,7 +12,7 @@
target.apply_damage(20, BRUTE, user.zone_selected)
target.Slowed(2 SECONDS)
if(isliving(target) && target.stat != DEAD)
- user.adjustStaminaLoss(-15)
+ user.adjustStaminaLoss(-40)
user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Paw Slam", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
@@ -24,7 +24,7 @@
target.KnockDown(4 SECONDS)
target.Slowed(6 SECONDS)
if(isliving(target) && target.stat != DEAD)
- user.adjustStaminaLoss(-15)
+ user.adjustStaminaLoss(-40)
user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Paw Slam", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/combos/bearserk/smokey.dm b/code/modules/martial_arts/combos/bearserk/smokey.dm
index 27737d6cf53..6af677e470e 100644
--- a/code/modules/martial_arts/combos/bearserk/smokey.dm
+++ b/code/modules/martial_arts/combos/bearserk/smokey.dm
@@ -10,8 +10,11 @@
target.visible_message("[user] sets [target] on fire with otherwordly powers!", \
"As [user] punches you with a searing fist, these words echo in your mind; \"remember... only YOU can prevent forest fires!\"")
target.apply_damage(10, BURN, user.zone_selected)
- playsound(get_turf(user), 'sound/weapons/punch1.ogg', 25, vary = TRUE, extrarange = -1)
+ playsound(get_turf(user), 'sound/weapons/punch1.ogg', 25, TRUE, -1)
target.adjust_fire_stacks(1.5)
target.IgniteMob()
+ if(isliving(target) && target.stat != DEAD)
+ user.adjustStaminaLoss(-40)
+ user.apply_status_effect(STATUS_EFFECT_BEARSERKER_RAGE)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Smokey", ATKLOG_ALL)
return MARTIAL_COMBO_DONE
diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm
index ea5e8488e62..d3af7191459 100644
--- a/code/modules/martial_arts/sleeping_carp.dm
+++ b/code/modules/martial_arts/sleeping_carp.dm
@@ -1,6 +1,6 @@
//Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss
/datum/martial_art/the_sleeping_carp
- weight = 8
+ weight = 9
name = "The Sleeping Carp"
deflection_chance = 100
reroute_deflection = TRUE
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 272e47b89b4..e7f44d0f575 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ