cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 07:28:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Soakn't (#18647)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Reo Lozzot
2025-10-27 02:58:37 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent c42dfc3efc
commit ceb33e3e7d
56 changed files with 75 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/planet/sif.dm
+1 -5
View File
@@ -421,7 +421,6 @@ var/datum/planet/sif/planet_sif = 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(1,3)
@@ -429,10 +428,7 @@ var/datum/planet/sif/planet_sif = null
return // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head.
//Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30.
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked, used_weapon = "hail")
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, used_weapon = "hail")
if(show_message)
to_chat(H, effect_message)
code/modules/planet/virgo3b_vr.dm
+1 -5
View File
@@ -416,7 +416,6 @@ var/datum/planet/virgo3b/planet_virgo3b = 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(1,3)
@@ -424,10 +423,7 @@ var/datum/planet/virgo3b/planet_virgo3b = null
return // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head.
//Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30.
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked)
H.apply_damage(damage, BRUTE, target_zone, amount_blocked)
if(show_message)
to_chat(H, effect_message)
code/modules/planet/virgo3c_vr.dm
+1 -5
View File
@@ -406,7 +406,6 @@ var/datum/planet/virgo3c/planet_virgo3c = 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(1,3)
@@ -414,10 +413,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null
return // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head.
//Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30.
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked)
H.apply_damage(damage, BRUTE, target_zone, amount_blocked)
if(show_message)
to_chat(H, effect_message)
code/modules/planet/virgo4_vr.dm
+1 -5
View File
@@ -390,7 +390,6 @@ var/datum/planet/virgo4/planet_virgo4 = 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(1,3)
@@ -398,10 +397,7 @@ var/datum/planet/virgo4/planet_virgo4 = null
return // No need to apply damage. Hardhats are 30. They should probably protect you from hail on your head.
//Voidsuits are likewise 40, and riot, 80. Clothes are all less than 30.
if(amount_soaked >= damage)
return // No need to apply damage.
H.apply_damage(damage, BRUTE, target_zone, amount_blocked, amount_soaked)
H.apply_damage(damage, BRUTE, target_zone, amount_blocked)
if(show_message)
to_chat(H, effect_message)