Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system

modular_splurt/code/modules/client/loadout/backpack.dm

@@ -4,6 +4,11 @@
 	name = "Condom"
 	path = /obj/item/genital_equipment/condom
 
+/datum/gear/backpack/condom_box
+	name = "Box of Condoms"
+	path = /obj/item/storage/box/bulk_condoms
+	cost = 2
+
 /datum/gear/backpack/sounding
 	name = "Sounding rod"
 	path = /obj/item/genital_equipment/sounding

modular_splurt/code/modules/client/loadout/shoes.dm

@@ -2,7 +2,7 @@
 /datum/gear/shoes/footwraps
 	name = "Cloth Footwraps"
 	path= /obj/item/clothing/shoes/footwraps
-	
+
 /datum/gear/shoes/invisiboots
 	name = "Invisifiber Footwraps"
 	path= /obj/item/clothing/shoes/invisiboots
@@ -36,3 +36,7 @@
 
 /datum/gear/shoes/puttee
 	restricted_roles = list("Security Officer", "Warden", "Head of Security", "Brig Physician", "Blueshield")
+
+/datum/gear/shoes/highheel_sandals
+	name = "High-heel Sandals"
+	path = /obj/item/clothing/shoes/highheel_sandals

modular_splurt/code/modules/client/loadout/uniform.dm

@@ -146,3 +146,11 @@
 	path = /obj/item/clothing/under/goner/fake/poly
 	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
 	loadout_initial_colors = list("#E6E6E6")
+
+/datum/gear/uniform/leia_outfit
+	name = "Princess Leia Outfit"
+	path = /obj/item/clothing/under/misc/leia_outfit
+
+/datum/gear/uniform/performer/polychromic
+	name = "Polychromic performers one piece"
+	path = /obj/item/clothing/under/performer/polychromic

modular_splurt/code/modules/client/preferences.dm

@@ -1,12 +1,18 @@
 /datum/preferences
+	max_save_slots = DEFAULT_SAVE_SLOTS
 	var/unholypref = "No" //Goin 2 hell fo dis one
-
 	var/list/gfluid_blacklist = list() //Stuff you don't want people to cum into you
 
 /datum/preferences/New(client/C)
 	if(!GLOB.genital_fluids_list)
 		build_genital_fluids_list() //I DON'T KNOW where else to put it, ok??
 
+	//Extra saves for donators
+	max_save_slots = CONFIG_GET(number/base_save_slots)
+	if(istype(C))
+		var/extra_slots = (IS_CKEY_DONATOR_GROUP(C.key, DONATOR_GROUP_TIER_1) + IS_CKEY_DONATOR_GROUP(C.key, DONATOR_GROUP_TIER_2) + IS_CKEY_DONATOR_GROUP(C.key, DONATOR_GROUP_TIER_3)) * 10
+		max_save_slots += extra_slots
+
 	. = ..()
 
 /proc/build_genital_fluids_list()