Merge branch 'master' into refactor-internal-fluid-list

This commit is contained in:
Darius
2023-02-23 00:45:03 -05:00
70 changed files with 3124 additions and 239 deletions
@@ -158,3 +158,15 @@
path = /obj/item/clothing/under/performer/polychromic
loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#ffffff")
/datum/gear/uniform/stripper/security
name = "Security Stripper Outfit"
path = /obj/item/clothing/under/rank/security/stripper
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_roles = list("Security Officer", "Warden", "Head Of Security")
/datum/gear/uniform/stripper/explorer
name = "Explorer Stripper Outfit"
path = /obj/item/clothing/under/rank/cargo/miner/lavaland/stripper
subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS
restricted_roles = list("Shaft Miner")
File diff suppressed because it is too large Load Diff
@@ -1,3 +1,8 @@
/datum/preferences/update_preferences(current_version, savefile/S)
. = ..()
if(current_version < 57.01) //a
new_character_creator = TRUE
/datum/preferences/update_character(current_version, savefile/S)
. = ..()
if(current_version < 53.01)