Merge branch 'master' into drag

code/controllers/subsystem/chat.dm

@@ -31,19 +31,13 @@ SUBSYSTEM_DEF(chat)
 
 	//Some macros remain in the string even after parsing and fuck up the eventual output
 	var/original_message = message
-	message = replacetext(message, "\improper", "")
-	message = replacetext(message, "\proper", "")
-	if(handle_whitespace)
-		message = replacetext(message, "\n", "<br>")
-		message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]")
-	if (trailing_newline)
-		message += "<br>"
 
 	//url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
 	//Do the double-encoding here to save nanoseconds
-	var/twiceEncoded = url_encode(url_encode(message))
+	var/twiceEncoded
 
 	if(islist(target))
+		var/sanitized_message = FALSE
 		for(var/I in target)
 			var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
 
@@ -55,6 +49,17 @@ SUBSYSTEM_DEF(chat)
 
 			if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
 				continue
+				
+			if(!sanitized_message)
+				message = replacetext(message, "\improper", "")
+				message = replacetext(message, "\proper", "")
+				if(handle_whitespace)
+					message = replacetext(message, "\n", "<br>")
+					message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]")
+				if (trailing_newline)
+					message += "<br>"
+				twiceEncoded = url_encode(url_encode(message))
+				sanitized_message = TRUE
 
 			if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
 				C.chatOutput.messageQueue += message
@@ -74,6 +79,15 @@ SUBSYSTEM_DEF(chat)
 		if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
 			return
 
+		message = replacetext(message, "\improper", "")
+		message = replacetext(message, "\proper", "")
+		if(handle_whitespace)
+			message = replacetext(message, "\n", "<br>")
+			message = replacetext(message, "\t", "[FOURSPACES][FOURSPACES]")
+		if (trailing_newline)
+			message += "<br>"
+		twiceEncoded = url_encode(url_encode(message))
+
 		if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
 			C.chatOutput.messageQueue += message
 			return

code/datums/traits/negative.dm

@@ -452,7 +452,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 	mob_trait = TRAIT_COLDBLOODED
 	gain_text = "<span class='notice'>You feel cold-blooded.</span>"
 	lose_text = "<span class='notice'>You feel more warm-blooded.</span>"
-	
+
 /datum/quirk/monophobia
 	name = "Monophobia"
 	desc = "You will become increasingly stressed when not in company of others, triggering panic reactions ranging from sickness to heart attacks."

code/modules/clothing/gloves/miscellaneous.dm

@@ -196,3 +196,15 @@
 	transfer_prints = FALSE
 	strip_mod = 5
 	strip_silence = TRUE
+
+/obj/item/clothing/gloves/evening
+	name = "evening gloves"
+	desc = "Thin, pretty gloves intended for use in regal feminine attire, but knowing Space China these are just for some maid fetish."
+	icon_state = "evening"
+	item_state = "evening"
+	strip_delay = 40
+	equip_delay_other = 20
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	strip_mod = 0.9
+	custom_price = PRICE_ALMOST_CHEAP

code/modules/clothing/head/misc.dm

@@ -446,3 +446,10 @@
 /obj/item/clothing/head/kepi/old
 	icon_state = "kepi_old"
 	desc = "A flat, white circular cap with a visor, that demands some honor from it's wearer."
+
+/obj/item/clothing/head/maid
+	name = "maid headband"
+	desc = "Maid in China."
+	icon_state = "maid"
+	item_state = "maid"
+	dynamic_hair_suffix = ""

code/modules/mining/lavaland/necropolis_chests.dm

@@ -79,9 +79,9 @@
 			new /obj/item/clothing/neck/necklace/memento_mori(src)
 		if(29)
 			if(prob(50))
-				new /obj/item/malf_upgrade
+				new /obj/item/malf_upgrade(src)
 			else
-				new /obj/item/disk/tech_disk/illegal
+				new /obj/item/disk/tech_disk/illegal(src)
 
 //KA modkit design discs
 /obj/item/disk/design_disk/modkit_disc

code/modules/vending/autodrobe.dm

@@ -84,8 +84,10 @@
 						/obj/item/clothing/suit/poncho = 1,
 						/obj/item/clothing/suit/poncho/green = 1,
 						/obj/item/clothing/suit/poncho/red = 1,
+						/obj/item/clothing/head/maid = 1,
 						/obj/item/clothing/under/costume/maid = 1,
 						/obj/item/clothing/under/rank/civilian/janitor/maid = 1,
+						/obj/item/clothing/gloves/evening = 1,
 						/obj/item/clothing/glasses/cold=1,
 						/obj/item/clothing/glasses/heat=1,
 						/obj/item/clothing/suit/whitedress = 1,

code/modules/vending/kinkmate.dm

@@ -6,8 +6,10 @@
 	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
 	vend_reply = "Have fun, you shameless pervert!"
 	products = list(
+				/obj/item/clothing/head/maid = 5,
 				/obj/item/clothing/under/costume/maid = 5,
 				/obj/item/clothing/under/rank/civilian/janitor/maid = 5,
+				/obj/item/clothing/gloves/evening = 5,
 				/obj/item/clothing/neck/petcollar = 5,
 				/obj/item/clothing/neck/petcollar/choker = 5,
 				/obj/item/clothing/neck/petcollar/leather = 5,

html/changelog.html

@@ -50,6 +50,34 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">23 July 2020</h2>
+			<h3 class="author">DeltaFire15 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Traits are no longer fucked</li>
+			</ul>
+			<h3 class="author">Putnam3145 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Slight optimization in chat code.</li>
+			</ul>
+			<h3 class="author">kappa-sama updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">tendril chests being empty</li>
+			</ul>
+			<h3 class="author">zeroisthebiggay updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscadd">fetish content</li>
+			</ul>
+
+			<h2 class="date">22 July 2020</h2>
+			<h3 class="author">Ludox updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="rscdel">You can no longer be brainwashed into giving birth to a fake baby</li>
+			</ul>
+			<h3 class="author">kappa-sama updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="balance">brainwashing disk has lost its cost buffs (3->5) and is role restricted once more (medical doctor/roboticist)</li>
+			</ul>
+
 			<h2 class="date">21 July 2020</h2>
 			<h3 class="author">Arturlang updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -26461,3 +26461,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - rscadd: new fried component used for frying objects
   - bugfix: various frying bugs fixed such as being able to unfry items and frying
       turfs with cold cooking oil
+2020-07-22:
+  Ludox:
+  - rscdel: You can no longer be brainwashed into giving birth to a fake baby
+  kappa-sama:
+  - balance: brainwashing disk has lost its cost buffs (3->5) and is role restricted
+      once more (medical doctor/roboticist)
+2020-07-23:
+  DeltaFire15:
+  - bugfix: Traits are no longer fucked
+  Putnam3145:
+  - tweak: Slight optimization in chat code.
+  kappa-sama:
+  - bugfix: tendril chests being empty
+  zeroisthebiggay:
+  - rscadd: fetish content

html/changelogs/AutoChangeLog-pr-12824.yml

@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes: 
-  - balance: "brainwashing disk has lost its cost buffs (3->5) and is role restricted once more (medical doctor/roboticist)"

modular_citadel/code/datums/status_effects/chems.dm

@@ -230,7 +230,7 @@
 	var/mob/living/carbon/M = owner
 
 	//chem calculations
-	if(!owner.reagents.has_reagent(/datum/chemical_reaction/fermi/enthrall))
+	if(!owner.reagents.has_reagent(/datum/reagent/fermi/enthrall))
 		if (phase < 3 && phase != 0)
 			deltaResist += 3//If you've no chem, then you break out quickly
 			if(prob(5))

modular_citadel/code/modules/client/loadout/gloves.dm

@@ -3,6 +3,11 @@
 	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/fingerless
 
+/datum/gear/evening
+	name = "Evening gloves"
+	category = SLOT_GLOVES
+	path = /obj/item/clothing/gloves/evening
+
 /datum/gear/goldring
 	name = "A gold ring"
 	category = SLOT_GLOVES
@@ -20,4 +25,4 @@
 	category = SLOT_GLOVES
 	path = /obj/item/clothing/gloves/ring/diamond
 	cost = 4
-	
+

modular_citadel/code/modules/client/loadout/head.dm

@@ -48,6 +48,11 @@
 	category = SLOT_HEAD
 	path = /obj/item/clothing/head/that
 
+/datum/gear/maidband
+	name = "Maid headband"
+	category = SLOT_HEAD
+	path= /obj/item/clothing/head/maid
+
 /datum/gear/flakhelm
 	name = "Flak Helmet"
 	category = SLOT_HEAD

strings/abductee_objectives.txt

@@ -13,7 +13,6 @@ You're throwing a huge rager. Make it as awesome as possible so the whole crew c
 The clown is not funny. You can do better! Steal his audience and make the crew laugh!
 You burn with passion for music. Share your vision. If anyone hates it, beat them on the head with your instrument!
 Go have a good conversation with the singularity/tesla/supermatter crystal. Bonus points if it responds.
-You are pregnant and soon due. Find a safe place to deliver your baby.
 Expand the station.
 So much lies undiscovered. Look deeper into the machinations of the universe.
 Climb the corporate ladder all the way to the top!