cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 21:57:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Removes Armorsoak (#11879)

Browse Source 
Co-authored-by: Reo Lozzot <84661000+ReoDaProtovali@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-11-02 20:00:44 -05:00
committed by GitHub
co-authored by Reo Lozzot Cameron Lennox
parent 5a67ca234c
commit 5e918deded
81 changed files with 131 additions and 744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/planet/sif.dm
+3 -15
View File
@@ -135,17 +135,13 @@
var/target_zone = pick(BP_ALL)
var/amount_blocked = H.run_armor_check(target_zone, "bio")
var/amount_soaked = H.get_armor_soak(target_zone, "bio")
var/damage = rand(1,5)
if(amount_blocked >= 40)
return
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BURN, target_zone, amount_blocked, amount_soaked, used_weapon = "acidic rain")
H.apply_damage(damage, BURN, target_zone, amount_blocked, used_weapon = "acidic rain")
if(show_message)
to_chat(H, effect_message)
@@ -168,17 +164,13 @@
var/target_zone = pick(BP_ALL)
var/amount_blocked = H.run_armor_check(target_zone, "melee")
var/amount_soaked = H.get_armor_soak(target_zone, "melee")
var/damage = rand(1,2)
if(amount_blocked >= 10)
return
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "sand")
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, used_weapon = "sand")
if(show_message)
to_chat(H, effect_message)
@@ -394,17 +386,13 @@
var/target_zone = pick(BP_ALL)
var/amount_blocked = L.run_armor_check(target_zone, "melee")
var/amount_soaked = L.get_armor_soak(target_zone, "melee")
var/damage = rand(10,30) //Ow
if(amount_blocked >= 30)
return
if(amount_soaked >= damage)
return // No need to apply damage.
L.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "rain bludgoning")
L.apply_damage(damage, BRUTE, target_zone, amount_blocked, used_weapon = "rain bludgoning")
L.Weaken(3)
if(show_message)
to_chat(L, effect_message)
modular_chomp/code/modules/planet/tyr.dm
+3 -15
View File
@@ -170,17 +170,13 @@ var/datum/planet/tyr/planet_tyr = null
var/target_zone = pick(BP_ALL)
var/amount_blocked = H.run_armor_check(target_zone, "bio")
var/amount_soaked = H.get_armor_soak(target_zone, "bio")
var/damage = rand(1,1)
if(amount_blocked >= 40)
return
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BURN, target_zone, amount_blocked, amount_soaked, used_weapon = "burning ash")
H.apply_damage(damage, BURN, target_zone, amount_blocked, used_weapon = "burning ash")
if(show_message)
to_chat(H, effect_message)
@@ -207,17 +203,13 @@ var/datum/planet/tyr/planet_tyr = null
var/target_zone = pick(BP_ALL)
var/amount_blocked = H.run_armor_check(target_zone, "melee")
var/amount_soaked = H.get_armor_soak(target_zone, "melee")
var/damage = rand(2,2)
if(amount_blocked >= 10)
return
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "sand")
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, used_weapon = "sand")
if(show_message)
to_chat(H, effect_message)
@@ -247,17 +239,13 @@ var/datum/planet/tyr/planet_tyr = null
var/target_zone = pick(BP_ALL)
var/amount_blocked = H.run_armor_check(target_zone, "melee")
var/amount_soaked = H.get_armor_soak(target_zone, "melee")
var/damage = rand(5,5)
if(amount_blocked >= 40)
return
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "sand")
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, used_weapon = "sand")
if(show_message)
to_chat(H, effect_message)