Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic

2019-11-14 22:31:48 -08:00
parent 009c0b46d5 90b02db98c
commit f3c4897b48
385 changed files with 31577 additions and 134898 deletions
--- a/code/modules/client/verbs/suicide.dm
+++ b/code/modules/client/verbs/suicide.dm
@@ -49,7 +49,7 @@
 				if(!(damagetype & (BRUTELOSS | FIRELOSS | TOXLOSS | OXYLOSS) ))
 					adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))

-				death(FALSE)
+				death(FALSE, penalize = TRUE)

 				return