cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes british spelling of armor from armor_penetration vars (#30104)

Browse Source 
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
This commit is contained in:
kyunkyunkyun
2025-09-01 09:27:52 +05:00
committed by GitHub
parent 3216ab1c00
commit 626eaaeb79
65 changed files with 152 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/parry.dm
+6 -6
View File
@@ -101,18 +101,18 @@
if(time_since_parry > parry_time_out_time)
return
var/armour_penetration_percentage = 0
var/armour_penetration_flat = 0
var/armor_penetration_percentage = 0
var/armor_penetration_flat = 0
if(isitem(hitby))
var/obj/item/I = hitby
armour_penetration_percentage = I.armour_penetration_percentage
armour_penetration_flat = I.armour_penetration_flat
armor_penetration_percentage = I.armor_penetration_percentage
armor_penetration_flat = I.armor_penetration_flat
if(armour_penetration_flat + armour_penetration_percentage >= 100)
if(armor_penetration_flat + armor_penetration_percentage >= 100)
return
var/stamina_damage = stamina_coefficient * (((time_since_parry / parry_time_out_time) + armour_penetration_percentage / 100) * (damage + armour_penetration_flat)) + stamina_constant
var/stamina_damage = stamina_coefficient * (((time_since_parry / parry_time_out_time) + armor_penetration_percentage / 100) * (damage + armor_penetration_flat)) + stamina_constant
if(!no_parry_sound)
var/sound_to_play