cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 15:14:27 +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/modules/mob/living/basic/basic_mob.dm
+2 -2
View File
@@ -135,9 +135,9 @@ RESTRICT_TYPE(/mob/living/basic)
/// What can this mob break?
var/environment_smash = ENVIRONMENT_SMASH_NONE
/// Flat armour reduction, occurs after percentage armour penetration.
var/armour_penetration_flat = 0
var/armor_penetration_flat = 0
/// Percentage armour reduction, happens before flat armour reduction.
var/armour_penetration_percentage = 0
var/armor_penetration_percentage = 0
/// Damage type of a simple mob's melee attack, should it do damage.
var/melee_damage_type = BRUTE
/// Lower bound for melee attack cooldown
code/modules/mob/living/basic/mining/goldgrub/goldgrub.dm
+1 -1
View File
@@ -49,6 +49,6 @@
ore.forceMove(loc)
/mob/living/basic/mining/goldgrub/bullet_act(obj/item/projectile/P)
if(P.armour_penetration_flat + P.armour_penetration_percentage >= 100)
if(P.armor_penetration_flat + P.armor_penetration_percentage >= 100)
return ..()
visible_message("<span class='danger'>[P.name] was repelled by [name]'s girth!</span>")
code/modules/mob/living/basic/mining/hivelord.dm
+1 -1
View File
@@ -304,7 +304,7 @@
var/atom/throw_target = get_edge_target_turf(L, get_dir(src, get_step_away(L, src)))
L.throw_at(throw_target, 4, 4)
var/limb_to_hit = L.get_organ(pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG))
var/armor = L.run_armor_check(def_zone = limb_to_hit, attack_flag = MELEE, armour_penetration_percentage = 50)
var/armor = L.run_armor_check(def_zone = limb_to_hit, attack_flag = MELEE, armor_penetration_percentage = 50)
L.apply_damage(40, BRUTE, limb_to_hit, armor)
// Tendril-spawned Legion remains, the charred skeletons of those whose bodies sank into laval or fell into chasms.
code/modules/mob/living/basic/posessed_object.dm
+2 -2
View File
@@ -110,8 +110,8 @@
update_icon(UPDATE_NAME)
throwforce = possessed_item.throwforce
armour_penetration_flat = possessed_item.armour_penetration_flat
armour_penetration_percentage = possessed_item.armour_penetration_percentage
armor_penetration_flat = possessed_item.armor_penetration_flat
armor_penetration_percentage = possessed_item.armor_penetration_percentage
melee_damage_lower = max(0, possessed_item.force - 5)
melee_damage_upper = possessed_item.force + 5