cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes eyestabbing not dealing a correct amount of damage (#26095)

Browse Source 
* fixes 25161

* Update code/game/objects/items.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
BiancaWilkson
2024-07-01 18:55:01 +00:00
committed by GitHub
co-authored by DGamerL
parent a7b71d465c
commit 29179cfb5e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+3 -3
View File
@@ -652,7 +652,7 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if(!eyes) // should still get stabbed in the head
var/obj/item/organ/external/head/head = H.bodyparts_by_name["head"]
if(head)
head.receive_damage(rand(10, 14), 1)
head.receive_damage(force, TRUE)
return
eyes.receive_damage(rand(3,4), 1)
if(eyes.damage >= eyes.min_bruised_damage)
@@ -670,10 +670,10 @@ GLOBAL_DATUM_INIT(welding_sparks, /mutable_appearance, mutable_appearance('icons
if(M.stat != 2)
to_chat(M, "<span class='danger'>You go blind!</span>")
var/obj/item/organ/external/affecting = H.get_organ("head")
if(istype(affecting) && affecting.receive_damage(7))
if(istype(affecting) && affecting.receive_damage(force))
H.UpdateDamageIcon()
else
M.take_organ_damage(7)
M.take_organ_damage(force)
M.AdjustEyeBlurry(rand(6 SECONDS, 8 SECONDS))
return