Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Erp update (headpats warning) #15

Merged
merged 2 commits into from
Feb 5, 2024
Merged

Erp update (headpats warning) #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a682b
erp update (headpats warning)
MrCastmer Feb 3, 2024
0fd6580
Merge branch 'master' into hugs-and-headpats
MrCastmer Feb 5, 2024
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
10 changes: 5 additions & 5 deletions code/modules/mob/living/carbon/carbon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,9 +470,9 @@
M.visible_message(span_notice("[M] shakes [src] trying to get [p_them()] up!"), \
span_notice("You shake [src] trying to get [p_them()] up!"))

else if(check_zone(M.zone_selected) == BODY_ZONE_L_ARM || check_zone(M.zone_selected) == BODY_ZONE_R_ARM) //Headpats are too extreme, we have to pat shoulders on yogs
M.visible_message(span_notice("[M] gives [src] a pat on the shoulder to make [p_them()] feel better!"), \
span_notice("You give [src] a pat on the shoulder to make [p_them()] feel better!"))
else if(check_zone(M.zone_selected) == BODY_ZONE_HEAD) //For the f sake, yogs, stop this. dripstation edit
M.visible_message(span_notice("[M] gives [src] a headpat to make [p_them()] feel better!"), \
span_notice("You give [src] a a headpat to make [p_them()] feel better!")) //dripstation edit

else
M.visible_message(span_notice("[M] hugs [src] to make [p_them()] feel better!"), \
Expand Down Expand Up @@ -505,7 +505,7 @@

adjust_status_effects_on_shake_up()

// adjustStaminaLoss(-10) if you want hugs to recover stamina damage, uncomment this
adjustStaminaLoss(-10) //dripstation edit, now shakes and hugs recovers stamina again
set_resting(FALSE)

playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
Expand Down Expand Up @@ -602,7 +602,7 @@
/mob/living/carbon/damage_clothes(damage_amount, damage_type = BRUTE, damage_flag = 0, def_zone)
if(damage_type != BRUTE && damage_type != BURN)
return
damage_amount *= 0.5 //0.5 multiplier for balance reason, we don't want clothes to be too easily destroyed
damage_amount *= 0.2 //0.5 multiplier for balance reason, we don't want clothes to be too easily destroyed, dripstation edited for 0.2
if(!def_zone || def_zone == BODY_ZONE_HEAD)
var/obj/item/clothing/hit_clothes
if(wear_mask)
Expand Down
Loading