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

Update species.dm

Browse Source
This commit is contained in:
Novacat
2020-01-23 17:14:31 -05:00
committed by GitHub
parent b2cafb7e14
commit 37f2862660
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species.dm
-4
View File
@@ -481,8 +481,4 @@
amount *= 1 - H.get_water_protection()
amount *= water_damage_mod
if(amount > 0)
<<<<<<< HEAD
H.adjustToxLoss(amount)
=======
H.adjustToxLoss(amount)
>>>>>>> b2c5524... Merge pull request #6648 from Mechoid/OhMyGodMechoid