Fixes new merge conflict from patreon PR

SQL/paradise_schema.sql

@@ -140,6 +140,25 @@ CREATE TABLE `death` (
 ) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `donators`
+--
+
+DROP TABLE IF EXISTS `donators`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `donators` (
+  `patreon_name` varchar(32) NOT NULL,
+  `tier` int(2),
+  `ckey` varchar(32) COMMENT 'Manual Field',
+  `start_date` datetime,
+  `end_date` datetime,
+  `active` boolean,
+  PRIMARY KEY (`patreon_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+
 --
 -- Table structure for table `admin`
 --

SQL/paradise_schema_prefixed.sql

@@ -140,6 +140,24 @@ CREATE TABLE `SS13_death` (
 ) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
+--
+-- Table structure for table `donators`
+--
+
+DROP TABLE IF EXISTS `SS13_donators`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `donators` (
+  `patreon_name` varchar(32) NOT NULL,
+  `tier` int(2),
+  `ckey` varchar(32) COMMENT 'Manual Field',
+  `start_date` datetime,
+  `end_date` datetime,
+  `active` boolean,
+  PRIMARY KEY (`patreon_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
 --
 -- Table structure for table `SS13_admin`
 --

code/__DEFINES/misc.dm

@@ -288,5 +288,10 @@
 #define SHELTER_DEPLOY_BAD_AREA "bad area"
 #define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects"
 
+// Client donator levels
+#define DONATOR_LEVEL_NONE 0
+#define DONATOR_LEVEL_ONE 1
+#define DONATOR_LEVEL_TWO 2
+
 // The cooldown on OOC messages such as OOC, LOOC, praying and adminhelps
 #define OOC_COOLDOWN 5

code/__DEFINES/preferences.dm

@@ -24,8 +24,9 @@
 #define DISABLE_KARMA_REMINDER	4096
 #define MEMBER_PUBLIC	8192
 #define CHAT_NO_ADMINLOGS 16384
+#define DONATOR_PUBLIC	32768
 
-#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|MEMBER_PUBLIC)
+#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC)
 
 // Playtime tracking system, see jobs_exp.dm
 #define EXP_TYPE_LIVING			"Living"

code/datums/datacore.dm

@@ -150,7 +150,10 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	preview_icon.Blend(temp, ICON_OVERLAY)
 
 	//Tail
-	if(H.species.tail && H.species.flags & HAS_TAIL)
+	if(H.body_accessory && istype(H.body_accessory, /datum/body_accessory/tail))
+		temp = new/icon("icon" = H.body_accessory.icon, "icon_state" = H.body_accessory.icon_state)
+		preview_icon.Blend(temp, ICON_OVERLAY)
+	else if(H.species.tail && H.species.bodyflags & HAS_TAIL)
 		temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.species.tail]_s")
 		preview_icon.Blend(temp, ICON_OVERLAY)
 
@@ -173,6 +176,17 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 	if(H.species.bodyflags & HAS_SKIN_COLOR)
 		preview_icon.Blend(rgb(H.r_skin, H.g_skin, H.b_skin), ICON_ADD)
 
+	//Tail Markings
+	var/icon/t_marking_s
+	if(H.species.bodyflags & HAS_TAIL_MARKINGS)
+		var/tail_marking = H.m_styles["tail"]
+		var/datum/sprite_accessory/tail_marking_style = marking_styles_list[tail_marking]
+		if(tail_marking_style && tail_marking_style.species_allowed)
+			t_marking_s = new/icon("icon" = tail_marking_style.icon, "icon_state" = "[tail_marking_style.icon_state]_s")
+			t_marking_s.Blend(H.m_colours["tail"], ICON_ADD)
+			if(!(H.body_accessory && istype(H.body_accessory, /datum/body_accessory/body)))
+				preview_icon.Blend(t_marking_s, ICON_OVERLAY)
+
 	var/icon/face_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "bald_s")
 	if(!(H.species.bodyflags & NO_EYES))
 		var/icon/eyes_s = new/icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = H.species ? H.species.eyes : "eyes_s")
@@ -190,7 +204,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		// I'll want to make a species-specific proc for this sooner or later
 		// But this'll do for now
 		if(head_organ.species.name == "Slime People")
-			hair_s.Blend(rgb(H.r_skin, H.g_skin, H.b_skin, 160), ICON_ADD)
+			hair_s.Blend(rgb(H.r_skin, H.g_skin, H.b_skin, 160), ICON_AND)
 		else
 			hair_s.Blend(rgb(head_organ.r_hair, head_organ.g_hair, head_organ.b_hair), ICON_ADD)
 
@@ -378,9 +392,22 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 		else
 			clothes_s = new /icon('icons/mob/uniform.dmi', "grey_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "black"), ICON_UNDERLAY)
+
 	preview_icon.Blend(face_s, ICON_OVERLAY) // Why do we do this twice
 	if(clothes_s)
 		preview_icon.Blend(clothes_s, ICON_OVERLAY)
+	//Bus body accessories that go over clothes.
+	if(H.body_accessory && istype(H.body_accessory, /datum/body_accessory/body))
+		temp = new/icon("icon" = H.body_accessory.icon, "icon_state" = H.body_accessory.icon_state)
+		if(H.body_accessory.pixel_x_offset)
+			temp.Shift(EAST, H.body_accessory.pixel_x_offset)
+		if(H.body_accessory.pixel_y_offset)
+			temp.Shift(NORTH, H.body_accessory.pixel_y_offset)
+		if(H.species.bodyflags & HAS_SKIN_COLOR)
+			temp.Blend(rgb(H.r_skin, H.g_skin, H.b_skin), H.body_accessory.blend_mode)
+		if(t_marking_s)
+			temp.Blend(t_marking_s, ICON_OVERLAY)
+		preview_icon.Blend(temp, ICON_OVERLAY)
 	qdel(face_s)
 	qdel(clothes_s)
 

code/game/dna/dna2_helpers.dm

@@ -149,38 +149,20 @@
 		else
 			H.change_gender(MALE, 0)
 
-		var/number_head_marks = 0
-		var/number_body_marks = 0
-		var/number_tail_marks = 0
-		for(var/m in marking_styles_list)
-			var/datum/sprite_accessory/body_markings/marking = marking_styles_list[m]
-			if(marking.marking_location == "head")
-				number_head_marks++
-			else if(marking.marking_location == "body")
-				number_body_marks++
-			else if(marking.marking_location == "tail")
-				number_tail_marks++
-
 		//Head Markings
 		var/head_marks = dna.GetUIValueRange(DNA_UI_HEAD_MARK_STYLE, marking_styles_list.len)
-		if((head_marks > 0) && (head_marks <= number_head_marks))
+		if((head_marks > 0) && (head_marks <= marking_styles_list.len))
 			H.m_styles["head"] = marking_styles_list[head_marks]
 		//Body Markings
 		var/body_marks = dna.GetUIValueRange(DNA_UI_BODY_MARK_STYLE, marking_styles_list.len)
-		if((body_marks > 0) && (body_marks <= number_body_marks))
+		if((body_marks > 0) && (body_marks <= marking_styles_list.len))
 			H.m_styles["body"] = marking_styles_list[body_marks]
 		//Tail Markings
 		var/tail_marks = dna.GetUIValueRange(DNA_UI_TAIL_MARK_STYLE, marking_styles_list.len)
-		if((tail_marks > 0) && (tail_marks <= number_tail_marks))
+		if((tail_marks > 0) && (tail_marks <= marking_styles_list.len))
 			H.m_styles["tail"] = marking_styles_list[tail_marks]
 
-		H.force_update_limbs()
-		H.update_eyes()
-		H.update_hair()
-		H.update_fhair()
-		H.update_markings()
-		H.update_tail_layer()
-		H.update_head_accessory()
+		H.regenerate_icons()
 
 		return 1
 	else

code/game/gamemodes/miniantags/guardian/guardian.dm

@@ -629,7 +629,8 @@
 	spawn(600)
 		if(src)
 			stored_obj.loc = get_turf(src.loc)
-			to_chat(spawner, "<span class='danger'><B>Failure! Your trap on \the [stored_obj] didn't catch anyone this time.</B></span>")
+			if(spawner)
+				to_chat(spawner, "<span class='danger'><B>Failure! Your trap on \the [stored_obj] didn't catch anyone this time.</B></span>")
 			qdel(src)
 
 /obj/item/weapon/guardian_bomb/proc/detonate(var/mob/living/user)

code/game/machinery/cryo.dm

@@ -385,8 +385,11 @@
 				var/heal_fire = occupant.getFireLoss() ? min(efficiency, 20*(efficiency**2) / occupant.getFireLoss()) : 0
 				occupant.heal_organ_damage(heal_brute,heal_fire)
 		if(beaker && next_trans == 0)
+			var/proportion = 10 * min(1/beaker.volume, 1)
+			// Yes, this means you can get more bang for your buck with a beaker of SF vs a patch
+			// But it also means a giant beaker of SF won't heal people ridiculously fast 4 cheap
+			beaker.reagents.reaction(occupant, TOUCH, proportion)
 			beaker.reagents.trans_to(occupant, 1, 10)
-			beaker.reagents.reaction(occupant)
 	next_trans++
 	if(next_trans == 10)
 		next_trans = 0
@@ -446,7 +449,7 @@
 	set name = "Eject occupant"
 	set category = "Object"
 	set src in oview(1)
-	
+
 	if(usr == occupant)//If the user is inside the tube...
 		if(usr.stat == DEAD)
 			return
@@ -466,18 +469,18 @@
 	set name = "Move Inside"
 	set category = "Object"
 	set src in oview(1)
-	
+
 	for(var/mob/living/carbon/slime/M in range(1,usr))
 		if(M.Victim == usr)
 			to_chat(usr, "You're too busy getting your life sucked out of you.")
 			return
-			
+
 	if(stat & (NOPOWER|BROKEN))
 		return
-		
+
 	if(usr.incapacitated()) //are you cuffed, dying, lying, stunned or other
 		return
-		
+
 	put_mob(usr)
 	return
 

code/game/objects/structures/crates_lockers/crittercrate.dm

@@ -25,21 +25,12 @@
 		for(var/i = 1, i <= amount, i++)
 			new content_mob(loc)
 		already_opened = 1
-	..()
+	. = ..()
 
 /obj/structure/closet/critter/close()
 	..()
 	return 1
 
-/obj/structure/closet/critter/attack_hand(mob/user as mob)
-	src.add_fingerprint(user)
-
-	if(src.loc == user.loc)
-		to_chat(user, "<span class='notice'>It won't budge!</span>")
-		toggle()
-	else
-		toggle()
-
 /obj/structure/closet/critter/corgi
 	name = "corgi crate"
 	content_mob = /mob/living/simple_animal/pet/corgi

code/game/verbs/ooc.dm

@@ -61,16 +61,24 @@ var/global/admin_ooc_colour = "#b82e00"
 	for(var/client/C in clients)
 		if(C.prefs.toggles & CHAT_OOC)
 			var/display_name = src.key
+
 			if(prefs.unlock_content)
 				if(prefs.toggles & MEMBER_PUBLIC)
 					var/icon/byond = icon('icons/member_content.dmi', "blag")
 					display_name = "[bicon(byond)][display_name]"
+
+			if(donator_level >= DONATOR_LEVEL_ONE)
+				if((prefs.toggles & DONATOR_PUBLIC))
+					var/icon/donator = icon('icons/ooc_tag_16x.dmi', "donator")
+					display_name = "[bicon(donator)][display_name]"
+
 			if(holder)
 				if(holder.fakekey)
 					if(C.holder)
 						display_name = "[holder.fakekey]/([src.key])"
 					else
 						display_name = holder.fakekey
+
 			to_chat(C, "<font color='[display_colour]'><span class='ooc'><span class='prefix'>OOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>")
 
 /proc/toggle_ooc()

code/modules/client/client defines.dm

@@ -89,4 +89,7 @@
 
 	// Their chat window, sort of important.
 	// See /goon/code/datums/browserOutput.dm
-	var/datum/chatOutput/chatOutput
+	var/datum/chatOutput/chatOutput
+
+	// Donator stuff.
+	var/donator_level = DONATOR_LEVEL_NONE

code/modules/client/client procs.dm

@@ -305,6 +305,8 @@
 		admins += src
 		holder.owner = src
 
+	donator_check()
+
 	//preferences datum - also holds some persistant data for the client (because we may as well keep these datums to a minimum)
 	prefs = preferences_datums[ckey]
 	if(!prefs)
@@ -378,10 +380,27 @@
 	return ..()
 
 
+/client/proc/donator_check()
+	if(IsGuestKey(key))
+		return
+
+	establish_db_connection()
+	if(!dbcon.IsConnected())
+		return
+
+	//Donator stuff.
+	var/DBQuery/query_donor_select = dbcon.NewQuery("SELECT ckey, tier, active FROM `[format_table_name("donators")]` WHERE ckey = '[ckey]'")
+	query_donor_select.Execute()
+	while(query_donor_select.NextRow())
+		if(!text2num(query_donor_select.item[3]))
+			// Inactive donator.
+			donator_level = DONATOR_LEVEL_NONE
+			return
+		donator_level = text2num(query_donor_select.item[2])
+		break
 
 /client/proc/log_client_to_db()
-
-	if( IsGuestKey(src.key) )
+	if(IsGuestKey(key))
 		return
 
 	establish_db_connection()

code/modules/client/preference/loadout/loadout.dm

@@ -4,6 +4,7 @@ var/list/gear_datums = list()
 /datum/loadout_category
 	var/category = ""
 	var/list/gear = list()
+	var/donor_only = FALSE
 
 /datum/loadout_category/New(cat)
 	category = cat
@@ -33,6 +34,8 @@ var/list/gear_datums = list()
 		if(!loadout_categories[use_category])
 			loadout_categories[use_category] = new /datum/loadout_category(use_category)
 		var/datum/loadout_category/LC = loadout_categories[use_category]
+		if(initial(G.donor_only))
+			LC.donor_only = TRUE
 		gear_datums[use_name] = new geartype
 		LC.gear[use_name] = gear_datums[use_name]
 
@@ -54,6 +57,7 @@ var/list/gear_datums = list()
 	var/list/gear_tweaks = list() //List of datums which will alter the item after it has been spawned.
 	var/subtype_path = /datum/gear //for skipping organizational subtypes (optional)
 	var/subtype_cost_overlap = TRUE //if subtypes can take points at the same time
+	var/donor_only = FALSE // if it's only available to donors
 
 /datum/gear/New()
 	..()
@@ -76,4 +80,4 @@ var/list/gear_datums = list()
 	var/item = new gd.path(gd.location)
 	for(var/datum/gear_tweak/gt in gear_tweaks)
 		gt.tweak_item(item, metadata["[gt]"])
-	return item
+	return item

code/modules/client/preference/loadout/loadout_donor.dm

@@ -0,0 +1,90 @@
+/datum/gear/donor
+	donor_only = TRUE
+	sort_category = "Donor"
+	subtype_path = /datum/gear/donor
+
+/datum/gear/donor/furgloves
+	display_name = "Fur Gloves"
+	path = /obj/item/clothing/gloves/furgloves
+
+/datum/gear/donor/furboots
+	display_name = "Fur Boots"
+	path = /obj/item/clothing/shoes/furboots
+
+/datum/gear/donor/noble_boot
+	display_name = "Noble Boots"
+	path = /obj/item/clothing/shoes/fluff/noble_boot
+
+/datum/gear/donor/furcape
+	display_name = "Fur Cape"
+	path = /obj/item/clothing/suit/furcape
+	cost = 2
+
+/datum/gear/donor/furcoat
+	display_name = "Fur Coat"
+	path = /obj/item/clothing/suit/furcoat
+	cost = 2
+
+/datum/gear/donor/lord_admiral
+	display_name = "Lord Admiral Coat"
+	path = /obj/item/clothing/suit/lordadmiral
+
+/datum/gear/donor/lord_admiral_hat
+	display_name = "Lord Admiral Hat"
+	path = /obj/item/clothing/head/lordadmiralhat
+
+/datum/gear/donor/kamina
+	display_name = "Spiky Orange-tinted Shades"
+	path = /obj/item/clothing/glasses/fluff/kamina
+
+/datum/gear/donor/green
+	display_name = "Spiky Green-tinted Shades"
+	path = /obj/item/clothing/glasses/fluff/kamina/green
+
+/datum/gear/donor/hipster
+	display_name = "Hipster Glasses"
+	path = /obj/item/clothing/glasses/regular/hipster
+
+/datum/gear/donor/threedglasses
+	display_name = "Threed Glasses"
+	path = /obj/item/clothing/glasses/threedglasses
+
+/datum/gear/donor/blacksombrero
+	display_name = "Black Sombrero"
+	path = /obj/item/clothing/head/fluff/blacksombrero
+
+/datum/gear/donor/guardhelm
+	display_name = "Plastic Guard helm"
+	path = /obj/item/clothing/head/fluff/guardhelm
+
+/datum/gear/donor/goldtophat
+	display_name = "Gold-trimmed Top Hat"
+	path = /obj/item/clothing/head/fluff/goldtophat
+
+/datum/gear/donor/goldtophat/red
+	display_name = "Red Gold-trimmed Top Hat"
+	path = /obj/item/clothing/head/fluff/goldtophat/red
+
+/datum/gear/donor/goldtophat/blue
+	display_name = "Blue Gold-trimmed Top Hat"
+	path = /obj/item/clothing/head/fluff/goldtophat/blue
+
+/datum/gear/donor/mushhat
+	display_name = "Mushroom Hat"
+	path = /obj/item/clothing/head/fluff/mushhat
+
+/datum/gear/donor/furcap
+	display_name = "Fur Cap"
+	path = /obj/item/clothing/head/furcap
+
+/datum/gear/donor/mouse
+	display_name = "Mouse Headband"
+	path = /obj/item/clothing/head/kitty/mouse
+
+/datum/gear/donor/fawkes
+	display_name = "Guy Fawkes mask"
+	path = /obj/item/clothing/mask/fawkes
+
+/datum/gear/donor/noble_clothes
+	display_name = "Noble Clothes"
+	path = /obj/item/clothing/under/noble_clothes

code/modules/client/preference/preferences.dm

@@ -61,7 +61,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 #define MAX_SAVE_SLOTS 20 // Save slots for regular players
 #define MAX_SAVE_SLOTS_MEMBER 20 // Save slots for BYOND members
 
-#define MAX_GEAR_COST config.max_loadout_points
 
 #define TAB_CHAR 0
 #define TAB_GAME 1
@@ -73,6 +72,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 	var/default_slot = 1				//Holder so it doesn't default to slot 1, rather the last one used
 //	var/savefile_version = 0
 	var/max_save_slots = MAX_SAVE_SLOTS
+	var/max_gear_slots = 0
 
 	//non-preference stuff
 	var/warns = 0
@@ -213,11 +213,17 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 /datum/preferences/New(client/C)
 	b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
+
 	if(istype(C))
 		if(!IsGuestKey(C.key))
 			unlock_content = C.IsByondMember()
 			if(unlock_content)
 				max_save_slots = MAX_SAVE_SLOTS_MEMBER
+
+	max_gear_slots = config.max_loadout_points
+	if(C.donator_level >= DONATOR_LEVEL_ONE)
+		max_gear_slots += 5
+
 	var/loaded_preferences_successfully = load_preferences(C)
 	if(loaded_preferences_successfully)
 		if(load_character(C))
@@ -250,7 +256,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 
 	switch(current_tab)
 		if(TAB_CHAR) // Character Settings
-			dat += "<div class='statusDisplay' style='max-width: 128px; position: absolute; left: 150px; top: 150px'><img src=previewicon.png height=64 width=64><img src=previewicon2.png height=64 width=64></div>"
+			dat += "<div class='statusDisplay' style='max-width: 128px; position: absolute; left: 150px; top: 150px'><img src=previewicon.png class='charPreview'><img src=previewicon2.png class='charPreview'></div>"
 			dat += "<table width='100%'><tr><td width='405px' height='25px' valign='top'>"
 			dat += "<b>Name: </b>"
 			dat += "<a href='?_src_=prefs;preference=name;task=input'><b>[real_name]</b></a>"
@@ -429,6 +435,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 				dat += "<b>OOC notes:</b> <a href='?_src_=prefs;preference=metadata;task=input'><b>Edit</b></a><br>"
 			if(unlock_content)
 				dat += "<b>BYOND Membership Publicity:</b> <a href='?_src_=prefs;preference=publicity'><b>[(toggles & MEMBER_PUBLIC) ? "Public" : "Hidden"]</b></a><br>"
+			if(user.client.donator_level >= DONATOR_LEVEL_ONE)
+				dat += "<b>Donator Publicity:</b> <a href='?_src_=prefs;preference=donor_public'><b>[(toggles & DONATOR_PUBLIC) ? "Public" : "Hidden"]</b></a><br>"
 
 			dat += "<b>Randomized character slot:</b> <a href='?_src_=prefs;preference=randomslot'><b>[randomslot ? "Yes" : "No"]</b></a><br>"
 			dat += "<b>Ghost ears:</b> <a href='?_src_=prefs;preference=ghost_ears'><b>[(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]</b></a><br>"
@@ -465,14 +473,18 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 						total_cost += G.cost
 
 			var/fcolor =  "#3366CC"
-			if(total_cost < MAX_GEAR_COST)
+			if(total_cost < max_gear_slots)
 				fcolor = "#E67300"
 			dat += "<table align='center' width='100%'>"
-			dat += "<tr><td colspan=4><center><b><font color='[fcolor]'>[total_cost]/[MAX_GEAR_COST]</font> loadout points spent.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
+			dat += "<tr><td colspan=4><center><b><font color='[fcolor]'>[total_cost]/[max_gear_slots]</font> loadout points spent.</b> \[<a href='?_src_=prefs;preference=gear;clear_loadout=1'>Clear Loadout</a>\]</center></td></tr>"
 			dat += "<tr><td colspan=4><center><b>"
 
 			var/firstcat = 1
 			for(var/category in loadout_categories)
+				var/datum/loadout_category/LC = loadout_categories[category]
+				if(LC.donor_only)
+					if(user.client.donator_level < DONATOR_LEVEL_TWO) // level two donators get the donator loadout, so don't show it to anyone with less than that
+						continue
 				if(firstcat)
 					firstcat = 0
 				else
@@ -1102,6 +1114,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 			if(TG.display_name in gear)
 				gear -= TG.display_name
 			else
+				if(TG.donor_only)
+					if(user.client.donator_level < DONATOR_LEVEL_TWO) // donator items are locked to > tier 2
+						//they normally can't even get this far- but just in case of href exploits, we check them here
+						return
 				var/total_cost = 0
 				var/list/type_blacklist = list()
 				for(var/gear_name in gear)
@@ -1113,7 +1129,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 							type_blacklist += G.subtype_path
 						total_cost += G.cost
 
-				if((total_cost + TG.cost) <= MAX_GEAR_COST)
+				if((total_cost + TG.cost) <= max_gear_slots)
 					gear += TG.display_name
 
 		else if(href_list["gear"] && href_list["tweak"])
@@ -1880,6 +1896,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 					if(unlock_content)
 						toggles ^= MEMBER_PUBLIC
 
+				if("donor_public")
+					if(user.client.donator_level >= DONATOR_LEVEL_ONE)
+						toggles ^= DONATOR_PUBLIC
+
 				if("gender")
 					if(gender == MALE)
 						gender = FEMALE

code/modules/customitems/item_defines.dm

@@ -446,6 +446,11 @@
 /obj/item/clothing/head/hood/fluff/linda //Epic_Charger: Linda Clark
 	icon_state = "greenhood"
 
+/obj/item/clothing/suit/armor/shodanscoat // RazekPraxis: SHODAN
+	name = "SHODAN's Captain's Coat"
+	desc = "A black coat with gold trim and an old US Chevron printed on the back. Edgy."
+	icon_state = "shodancoat"
+
 //////////// Uniforms ////////////
 /obj/item/clothing/under/fluff/kharshai // Kharshai: Athena Castile
 	name = "Castile formal outfit"

code/modules/mob/new_player/preferences_setup.dm

@@ -291,11 +291,20 @@
 	if(current_species && (current_species.bodyflags & HAS_TAIL))
 		var/tail_icon
 		var/tail_icon_state
+		var/tail_shift_x
+		var/tail_shift_y
+		var/blend_mode = ICON_ADD
 
 		if(body_accessory)
 			var/datum/body_accessory/accessory = body_accessory_by_name[body_accessory]
 			tail_icon = accessory.icon
 			tail_icon_state = accessory.icon_state
+			if(accessory.blend_mode)
+				blend_mode = accessory.blend_mode
+			if(accessory.pixel_x_offset)
+				tail_shift_x = accessory.pixel_x_offset
+			if(accessory.pixel_y_offset)
+				tail_shift_y = accessory.pixel_y_offset
 		else
 			tail_icon = "icons/effects/species.dmi"
 			if(coloured_tail)
@@ -303,10 +312,14 @@
 			else
 				tail_icon_state = "[current_species.tail]_s"
 
-		var/icon/temp = new /icon("icon" = tail_icon, "icon_state" = tail_icon_state)
+		var/icon/temp = new/icon("icon" = tail_icon, "icon_state" = tail_icon_state)
+		if(tail_shift_x)
+			temp.Shift(EAST, tail_shift_x)
+		if(tail_shift_y)
+			temp.Shift(NORTH, tail_shift_y)
 
 		if(current_species && (current_species.bodyflags & HAS_SKIN_COLOR))
-			temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+			temp.Blend(rgb(r_skin, g_skin, b_skin), blend_mode)
 
 		if(current_species && (current_species.bodyflags & HAS_TAIL_MARKINGS))
 			var/tail_marking = m_styles["tail"]

code/modules/spacepods/spacepod.dm

@@ -141,6 +141,9 @@
 	qdel(ion_trail)
 	ion_trail = null
 	occupant_sanity_check()
+	if(pilot)
+		pilot.forceMove(get_turf(src))
+		pilot = null
 	if(passengers)
 		for(var/mob/M in passengers)
 			M.forceMove(get_turf(src))
@@ -226,29 +229,15 @@
 	health = max(0, health - damage)
 	var/percentage = (health / initial(health)) * 100
 	occupant_sanity_check()
-	if(passengers && oldhealth > health && percentage <= 25 && percentage > 0)
-		var/sound/S = sound('sound/effects/engine_alert2.ogg')
-		S.wait = 0 //No queue
-		S.channel = 0 //Any channel
-		S.volume = 50
-		for(var/mob/M in passengers)
-			M << S
-	if(passengers && oldhealth > health && !health)
-		var/sound/S = sound('sound/effects/engine_alert1.ogg')
-		S.wait = 0
-		S.channel = 0
-		S.volume = 50
-		for(var/mob/M in passengers)
-			M << S
+	if(oldhealth > health && percentage <= 25 && percentage > 0)
+		play_sound_to_riders('sound/effects/engine_alert2.ogg')
+	if(oldhealth > health && !health)
+		play_sound_to_riders('sound/effects/engine_alert1.ogg')
 	if(!health)
 		spawn(0)
-			if(passengers)
-				for(var/mob/M in passengers)
-					to_chat(M, "<span class='userdanger'>Critical damage to the vessel detected, core explosion imminent!</span>")
+			message_to_riders("<span class='userdanger'>Critical damage to the vessel detected, core explosion imminent!</span>")
 			for(var/i = 10, i >= 0; --i)
-				if(passengers)
-					for(var/mob/M in passengers)
-						to_chat(M, "<span class='warning'>[i]</span>")
+				message_to_riders("<span class='warning'>[i]</span>")
 				if(i == 0)
 					explosion(loc, 2, 4, 8)
 					qdel(src)
@@ -266,12 +255,13 @@
 	occupant_sanity_check()
 	switch(severity)
 		if(1)
-			for(var/mob/M in passengers)
-				var/mob/living/carbon/human/H = M
-				if(H)
-					H.forceMove(get_turf(src))
-					H.ex_act(severity + 1)
-					to_chat(H, "<span class='warning'>You are forcefully thrown from \the [src]!</span>")
+			if(passengers || pilot)
+				for(var/mob/M in passengers | pilot)
+					var/mob/living/carbon/human/H = M
+					if(H)
+						H.forceMove(get_turf(src))
+						H.ex_act(severity + 1)
+						to_chat(H, "<span class='warning'>You are forcefully thrown from \the [src]!</span>")
 			qdel(ion_trail)
 			qdel(src)
 		if(2)
@@ -283,27 +273,35 @@
 /obj/spacepod/emp_act(severity)
 	occupant_sanity_check()
 	cargo_hold.emp_act(severity)
-	
+
 	if(battery && battery.charge > 0)
 		battery.use((battery.charge / 2) / severity)
 	deal_damage(80 / severity)
 	if(empcounter < (40 / severity))
 		empcounter = 40 / severity
-	processing_objects.Add(src)	
-	
+	processing_objects.Add(src)
+
 	switch(severity)
 		if(1)
-			if(pilot)
-				to_chat(pilot, "<span class='warning'>The pod console flashes 'Heavy EMP WAVE DETECTED'.</span>")
-			if(passengers)
-				for(var/mob/M in passengers)
-					to_chat(M, "<span class='warning'>The pod console flashes 'Heavy EMP WAVE DETECTED'.</span>")
+			message_to_riders("<span class='warning'>The pod console flashes 'Heavy EMP WAVE DETECTED'.</span>")
 		if(2)
-			if(pilot)
-				to_chat(pilot, "<span class='warning'>The pod console flashes 'EMP WAVE DETECTED'.</span>")
-			if(passengers)
-				for(var/mob/M in passengers)
-					to_chat(M, "<span class='warning'>The pod console flashes 'EMP WAVE DETECTED'.</span>")
+			message_to_riders("<span class='warning'>The pod console flashes 'EMP WAVE DETECTED'.</span>")
+
+/obj/spacepod/proc/play_sound_to_riders(mysound)
+	if(length(passengers | pilot) == 0)
+		return
+	var/sound/S = sound(mysound)
+	S.wait = 0 //No queue
+	S.channel = 0 //Any channel
+	S.volume = 50
+	for(var/mob/M in passengers | pilot)
+		M << S
+
+/obj/spacepod/proc/message_to_riders(mymessage)
+	if(length(passengers | pilot) == 0)
+		return
+	for(var/mob/M in passengers | pilot)
+		to_chat(M, mymessage)
 
 /obj/spacepod/attackby(obj/item/W as obj, mob/user as mob, params)
 	if(user.a_intent == I_HARM)

html/browser/common.css

@@ -339,4 +339,10 @@ div.notice
 {
 	width: 100%;
 	clear: both;
+}
+.charPreview
+{
+	-ms-interpolation-mode: nearest-neighbor;
+	width: 64px;
+	height:64px;
 }

paradise.dme

@@ -1117,6 +1117,7 @@
 #include "code\modules\client\preference\loadout\loadout.dm"
 #include "code\modules\client\preference\loadout\loadout_accessories.dm"
 #include "code\modules\client\preference\loadout\loadout_cosmetics.dm"
+#include "code\modules\client\preference\loadout\loadout_donor.dm"
 #include "code\modules\client\preference\loadout\loadout_general.dm"
 #include "code\modules\client\preference\loadout\loadout_hat.dm"
 #include "code\modules\client\preference\loadout\loadout_shoes.dm"
@@ -1142,6 +1143,8 @@
 #include "code\modules\clothing\masks\gasmask.dm"
 #include "code\modules\clothing\masks\miscellaneous.dm"
 #include "code\modules\clothing\masks\voice.dm"
+#include "code\modules\clothing\patreon\glasses.dm"
+#include "code\modules\clothing\patreon\hats.dm"
 #include "code\modules\clothing\shoes\colour.dm"
 #include "code\modules\clothing\shoes\magboots.dm"
 #include "code\modules\clothing\shoes\miscellaneous.dm"