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

Phase 1 tweaks

Browse Source
This commit is contained in:
Unknown
2020-08-03 19:10:10 -04:00
parent 1f382c6cd7
commit 22c9294aa3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -243,9 +243,17 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
if(a_intent == I_HELP) // Theoretically not possible, but just in case. if(a_intent == I_HELP) // Theoretically not possible, but just in case.
return FALSE return FALSE
if(tmob.a_intent != I_HELP && prob(35))
to_chat(pred, "<span class='danger'>[prey] dodges out from under your foot!</span>")
to_chat(prey, "<span class='danger'>You narrowly avoid [pred]'s foot!</span>")
return FALSE
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)
if(tmob.a_intent = I_HELP)
tmob.resting = 1
else
tmob.Weaken(1) tmob.Weaken(1)
var/size_damage_multiplier = size_multiplier - tmob.size_multiplier var/size_damage_multiplier = size_multiplier - tmob.size_multiplier
@@ -311,7 +319,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.Weaken(1) //Removed halloss because it was being abused tmob.Weaken(2) //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 +327,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 *= 2.5 calculated_damage *= 3.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)