shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

k

Browse Source
This commit is contained in:
kevinz000
2020-01-16 21:17:43 -07:00
parent 7bcb37c5d1
commit 2cc0e8ee6c
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/other_reagents.dm
-7
View File
@@ -459,17 +459,10 @@
M.AdjustKnockdown(10, FALSE) M.AdjustKnockdown(10, FALSE)
M.adjustStaminaLoss(15, FALSE) M.adjustStaminaLoss(15, FALSE)
else else
<<<<<<< HEAD
M.adjustToxLoss(3, FALSE) M.adjustToxLoss(3, FALSE)
M.adjustOxyLoss(2, FALSE) M.adjustOxyLoss(2, FALSE)
M.adjustStaminaLoss(10, FALSE) M.adjustStaminaLoss(10, FALSE)
holder.remove_reagent(id, 1)
=======
M.adjustToxLoss(3, 0)
M.adjustOxyLoss(2, 0)
M.adjustStaminaLoss(10, 0)
holder.remove_reagent(type, 1) holder.remove_reagent(type, 1)
>>>>>>> citadel/master
return TRUE return TRUE
//We only get 30u to start with... //We only get 30u to start with...