Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties

This commit is contained in:
Artur
2020-01-16 11:38:09 +02:00
87 changed files with 4858 additions and 4394 deletions
@@ -319,9 +319,9 @@
L.dust()
else
if(!GLOB.ratvar_awakens && L.stat == CONSCIOUS)
vitality_drained = L.adjustToxLoss(1)
vitality_drained = L.adjustToxLoss(1, forced = TRUE)
else
vitality_drained = L.adjustToxLoss(1.5)
vitality_drained = L.adjustToxLoss(1.5, forced = TRUE)
if(vitality_drained)
GLOB.clockwork_vitality += vitality_drained
else