Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes a DIFFERENT error in welding code. #4995

Merged
merged 4 commits into from
Jan 31, 2024
Merged

Fixes a DIFFERENT error in welding code. #4995

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11f3281
fixes the ears i made ten minutes ago, oops./
cdb-is-not-good Jan 31, 2024
c973943
reduces welding damage
cdb-is-not-good Jan 31, 2024
2770413
Revert "fixes the ears i made ten minutes ago, oops./"
cdb-is-not-good Jan 31, 2024
47e18cf
lol
cdb-is-not-good Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions code/game/objects/items/weapons/tools/_tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,23 +1079,23 @@
switch(safety)
if(FLASH_PROTECTION_MINOR)
to_chat(H, SPAN_WARNING("Your eyes sting a little."))
E.take_damage(3, BURN)
E.take_damage(1, BURN)
if(E.damage > 12)
H.eye_blurry += rand(3,6)
if(FLASH_PROTECTION_MINOR)
if(FLASH_PROTECTION_MODERATE)
to_chat(H, SPAN_WARNING("The searing light burns your eyes through your insufficient protection."))
E.take_damage(rand(6, 9), BURN)
if(E.damage > 11)
E.take_damage(rand(4, 6), BURN)
E.take_damage(rand(2, 3), BURN)
if(FLASH_PROTECTION_NONE)
to_chat(H, SPAN_WARNING("Your eyes burn."))
E.take_damage(rand(8, 12), BURN)
if(E.damage > 10)
E.take_damage(rand(4, 12))
E.take_damage(rand(4, 6), BURN)
// if(E.damage > 10) as funny as this is, this isn't how anything works. You're already punished by eye-burns turniing to infections.
// E.take_damage(rand(4, 12))
if(FLASH_PROTECTION_REDUCED)
to_chat(H, SPAN_DANGER("Your equipment intensify the welder's glow. Your eyes itch and burn severely."))
H.eye_blurry += rand(12,20)
E.take_damage(rand(16, 20))
E.take_damage(rand(8, 10))
if(safety<FLASH_PROTECTION_MAJOR)
if(E.damage > 10)
to_chat(user, SPAN_WARNING("Your eyes are really starting to hurt. This can't be good for you!"))
Expand Down
Loading