Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware

code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm

@@ -91,7 +91,7 @@
 		target.Stun(40) //Utterly useless without this, its okay since there are so many checks to go through
 		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 45) //So you cant rotate with combat mode, plus fancy status alert
 
-	if(do_mob(user, target, 40, 0, TRUE, extra_checks=CALLBACK(src, .proc/ContinueActive, user, target)))
+	if(do_mob(user, target, 40, 0, TRUE, extra_checks = CALLBACK(src, .proc/ContinueActive, user, target)))
 		PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!
 		var/power_time = 90 + level_current * 12
 		target.apply_status_effect(STATUS_EFFECT_MESMERIZE, power_time + 80)

code/modules/client/message.dm

@@ -2,8 +2,9 @@ GLOBAL_LIST_EMPTY(clientmessages)
 
 /proc/addclientmessage(var/ckey, var/message)
 	ckey = ckey(ckey)
-	if (!ckey || !message)
+	if(!ckey || !message)
 		return
-	if (!(ckey in GLOB.clientmessages))
-		GLOB.clientmessages[ckey] = list()
-	GLOB.clientmessages[ckey] += message
+	var/list/L = GLOB.clientmessages[ckey]
+	if(!L)
+		GLOB.clientmessages[ckey] = L = list()
+	L += message

code/modules/keybindings/bindings_client.dm

@@ -25,7 +25,7 @@
 		else
 			log_admin("Client [ckey] was just autokicked for flooding keysends; likely abuse but potentially lagspike.")
 			message_admins("Client [ckey] was just autokicked for flooding keysends; likely abuse but potentially lagspike.")
-			QDEL_IN(src, 1)
+			qdel(src)
 			return
 
 	///Check if the key is short enough to even be a real key

code/modules/mob/dead/new_player/sprite_accessories/snouts.dm

@@ -244,6 +244,10 @@
 	name = "Shark"
 	icon_state = "shark"
 
+/datum/sprite_accessory/mam_snouts/hshark
+	name = "hShark"
+	icon_state = "hshark"
+
 /datum/sprite_accessory/mam_snouts/toucan
 	name = "Toucan"
 	icon_state = "toucan"

code/modules/research/rdconsole.dm

@@ -833,8 +833,8 @@ Nothing else in the console has ID requirements.
 	for(var/i in 1 to length(ui))
 		if(!findtextEx(ui[i], RDSCREEN_NOBREAK))
 			ui[i] += "<br>"
-		ui[i] = replacetextEx(ui[i], RDSCREEN_NOBREAK, "")
-	return ui.Join("")
+	. = ui.Join("")
+	return replacetextEx(., RDSCREEN_NOBREAK, "")
 
 /obj/machinery/computer/rdconsole/Topic(raw, ls)
 	if(..())

code/modules/vending/autodrobe.dm

@@ -131,6 +131,12 @@
 					/obj/item/clothing/suit/drfreeze_coat = 1,
 					/obj/item/clothing/suit/gothcoat = 2,
 					/obj/item/clothing/under/draculass = 1,
+					/obj/item/clothing/under/christmas/christmasmaler = 3,
+					/obj/item/clothing/under/christmas/christmasmaleg = 3,
+					/obj/item/clothing/under/christmas/christmasfemaler = 3,
+					/obj/item/clothing/under/christmas/christmasfemaleg = 3,
+					/obj/item/clothing/head/christmashat = 3,
+					/obj/item/clothing/head/christmashatg = 3,
 					/obj/item/clothing/under/drfreeze = 1)    //End of Cit Changes
 	refill_canister = /obj/item/vending_refill/autodrobe
 

code/modules/vending/clothesmate.dm

@@ -123,15 +123,19 @@
 					/obj/item/clothing/ears/headphones = 10,
 					/obj/item/clothing/suit/apron/purple_bartender = 4,
 					/obj/item/clothing/under/rank/bartender/purple = 4,
+					/* Commenting out until next Christmas or made automatic
 					/obj/item/clothing/under/christmas/christmasmaler = 3,
 					/obj/item/clothing/under/christmas/christmasmaleg = 3,
 					/obj/item/clothing/under/christmas/christmasfemaler = 3,
 					/obj/item/clothing/under/christmas/christmasfemaleg = 3,
+					*/
 					/obj/item/clothing/suit/hooded/wintercoat/christmascoatr = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/christmascoatg = 3,
 					/obj/item/clothing/suit/hooded/wintercoat/christmascoatrg = 3,
+					/*Commenting out until next Christmas or made automatic
 					/obj/item/clothing/head/christmashat = 3,
 					/obj/item/clothing/head/christmashatg = 3,
+					*/
 					/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
 					/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
 					/obj/item/clothing/shoes/winterboots/santaboots = 3,