cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nerfs harm/disarm steppies

Browse Source 
- Reduces damage multiplier on harm steppies from 3.5 to 2.5
- Removes forcerest and halloss from disarm steppies. Replaces with weaken proc.
This commit is contained in:
Unknown
2020-08-03 18:38:51 -04:00
parent ad60bf1299
commit 1f382c6cd7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/vore/resizing/resize_vr.dm
View File

@@ -246,7 +246,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
now_pushing = 0 now_pushing = 0
forceMove(tmob.loc) forceMove(tmob.loc)
if(a_intent == I_GRAB || a_intent == I_DISARM) if(a_intent == I_GRAB || a_intent == I_DISARM)
tmob.resting = 1 tmob.Weaken(1)
var/size_damage_multiplier = size_multiplier - tmob.size_multiplier var/size_damage_multiplier = size_multiplier - tmob.size_multiplier
// This technically means that I_GRAB will set this value to the same as I_HARM, but // This technically means that I_GRAB will set this value to the same as I_HARM, but
@@ -311,7 +311,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
message_pred = STEP_TEXT_OWNER(tail.msg_owner_disarm_walk) message_pred = STEP_TEXT_OWNER(tail.msg_owner_disarm_walk)
message_prey = STEP_TEXT_PREY(tail.msg_prey_disarm_walk) message_prey = STEP_TEXT_PREY(tail.msg_prey_disarm_walk)
add_attack_logs(pred, prey, "Pinned underfoot (walk, about [damage] halloss)") add_attack_logs(pred, prey, "Pinned underfoot (walk, about [damage] halloss)")
tmob.apply_damage(damage, HALLOSS) tmob.Weaken(1) //Removed halloss because it was being abused
if(I_HURT) if(I_HURT)
message_pred = "You methodically place your foot down upon [prey]'s body, slowly applying pressure, crushing them against the floor below!" message_pred = "You methodically place your foot down upon [prey]'s body, slowly applying pressure, crushing them against the floor below!"
message_prey = "[pred] methodically places their foot upon your body, slowly applying pressure, crushing you against the floor below!" message_prey = "[pred] methodically places their foot upon your body, slowly applying pressure, crushing you against the floor below!"
@@ -319,7 +319,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
message_pred = STEP_TEXT_OWNER(tail.msg_owner_harm_walk) message_pred = STEP_TEXT_OWNER(tail.msg_owner_harm_walk)
message_prey = STEP_TEXT_PREY(tail.msg_prey_harm_walk) message_prey = STEP_TEXT_PREY(tail.msg_prey_harm_walk)
// Multiplies the above damage by 3.5. This means a min of 1.75 damage, or a max of 9.1875. damage to each limb, depending on size and RNG. // Multiplies the above damage by 3.5. This means a min of 1.75 damage, or a max of 9.1875. damage to each limb, depending on size and RNG.
calculated_damage *= 3.5 calculated_damage *= 2.5
for(var/obj/item/organ/I in prey.organs) for(var/obj/item/organ/I in prey.organs)
I.take_damage(calculated_damage, 0) I.take_damage(calculated_damage, 0)
prey.drip(3) prey.drip(3)