Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 135608551f, reversing changes made to ce7e9ac452.
2019-11-24 03:04:13 +00:00
parent c8b206a4cf
commit 1509d9d183
186 changed files with 405 additions and 764 deletions
@@ -2299,6 +2299,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.shirt_color = shirt_color
 	character.socks_color = socks_color

+
+	character.backbag = backbag
+	character.jumpsuit_style = jumpsuit_style
+
 	var/datum/species/chosen_species
 	if(!roundstart_checks || (pref_species.id in GLOB.roundstart_races))
 		chosen_species = pref_species.type
@@ -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