Merge remote-tracking branch 'upstream/master' into TGUI_Updoot

code/__DEFINES/dcs/signals.dm

@@ -32,7 +32,7 @@
 #define COMSIG_ELEMENT_DETACH "element_detach"
 
 /// sent to the component itself when unregistered from a parent
-#define COMSIG_COMPONENT_UNREGISTER_PARENT "component_unregister_parent" 
+#define COMSIG_COMPONENT_UNREGISTER_PARENT "component_unregister_parent"
 /// sent to the component itself when registered to a parent
 #define COMSIG_COMPONENT_REGISTER_PARENT "component_register_parent"
 
@@ -184,6 +184,7 @@
 //	#define HEARING_SOURCE 8
 #define COMSIG_MOVABLE_DISPOSING "movable_disposing"			//called when the movable is added to a disposal holder object for disposal movement: (obj/structure/disposalholder/holder, obj/machinery/disposal/source)
 #define COMSIG_MOVABLE_TELEPORTED "movable_teleported"			//from base of do_teleport(): (channel, turf/origin, turf/destination)
+#define COMSIG_MOVABLE_CHASM_DROP "movable_chasm_drop"			//from base of /datum/component/chasm/drop() (/datum/component/chasm)
 
 // /mind signals
 #define  COMSIG_PRE_MIND_TRANSFER "pre_mind_transfer"			//from base of mind/transfer_to() before it's done: (new_character, old_character)

code/datums/accents.dm

@@ -94,6 +94,7 @@
 
 /datum/accent/robot/modify_speech(list/speech_args)
 	speech_args[SPEECH_SPANS] = SPAN_ROBOT
+	return speech_args
 
 /datum/accent/dullahan/modify_speech(list/speech_args, datum/source, mob/living/carbon/owner)
 	if(owner)

code/datums/components/chasm.dm

@@ -76,19 +76,11 @@
 				return FALSE
 		if(M.is_flying())
 			return FALSE
-		if(ishuman(AM))
-			var/mob/living/carbon/human/H = AM
-			if(istype(H.belt, /obj/item/wormhole_jaunter))
-				var/obj/item/wormhole_jaunter/J = H.belt
-				//To freak out any bystanders
-				H.visible_message("<span class='boldwarning'>[H] falls into [parent]!</span>")
-				J.chasm_react(H)
-				return FALSE
 	return TRUE
 
 /datum/component/chasm/proc/drop(atom/movable/AM)
 	//Make sure the item is still there after our sleep
-	if(!AM || QDELETED(AM))
+	if(!AM || QDELETED(AM) || SEND_SIGNAL(AM, COMSIG_MOVABLE_CHASM_DROP, src))
 		return
 	falling_atoms[AM] = (falling_atoms[AM] || 0) + 1
 	var/turf/T = target_turf

code/datums/diseases/advance/symptoms/fire.dm

@@ -112,9 +112,9 @@ Bonus
 	symptom_delay_max = 90
 	var/chems = FALSE
 	var/explosion_power = 1
-	threshold_desc = list( "Resistance 9: Doubles the intensity of the effect, but reduces its frequency.",
-					  "Stage Speed 8: Increases explosion radius when the host is wet.",
-					  "Transmission 8: Additionally synthesizes chlorine trifluoride and napalm inside the host.")
+	threshold_desc = list("Resistance 9" = "Doubles the intensity of the effect, but reduces its frequency.",
+					  "Stage Speed 8" = "Increases explosion radius when the host is wet.",
+					  "Transmission 8" = "Additionally synthesizes chlorine trifluoride and napalm inside the host.")
 
 /datum/symptom/alkali/Start(datum/disease/advance/A)
 	if(!..())

code/game/objects/items/crayons.dm

@@ -735,7 +735,11 @@
 	if(isobj(target))
 		if(actually_paints)
 			var/list/hsl = rgb2hsl(hex2num(copytext(paint_color,2,4)),hex2num(copytext(paint_color,4,6)),hex2num(copytext(paint_color,6,8)))
-			if(hsl[3] < 0.25 && !istype(target, /obj/structure/window) && !istype(target, /obj/effect/decal/cleanable/crayon)) //Colors too dark are rejected
+			var/static/whitelisted = typecacheof(list(/obj/structure/window,
+										/obj/effect/decal/cleanable/crayon,
+										/obj/machinery/door/window)
+									)
+			if(hsl[3] < 0.25 && !whitelisted[target]) //Colors too dark are rejected
 				to_chat(usr, "<span class='warning'>A color that dark on an object like this? Surely not...</span>")
 				return FALSE
 

code/modules/mining/equipment/wormhole_jaunter.dm

@@ -18,6 +18,15 @@
 	SSblackbox.record_feedback("tally", "jaunter", 1, "User") // user activated
 	activate(user, TRUE)
 
+/obj/item/wormhole_jaunter/equipped(mob/user, slot)
+	. = ..()
+	if(slot == SLOT_BELT)
+		RegisterSignal(user, COMSIG_MOVABLE_CHASM_DROP, .proc/chasm_react)
+
+/obj/item/wormhole_jaunter/dropped(mob/user)
+	. = ..()
+	UnregisterSignal(user, COMSIG_MOVABLE_CHASM_DROP)
+
 /obj/item/wormhole_jaunter/proc/turf_check(mob/user)
 	var/turf/device_turf = get_turf(user)
 	if(!device_turf || is_centcom_level(device_turf.z) || is_reserved_level(device_turf.z))
@@ -71,13 +80,14 @@
 			SSblackbox.record_feedback("tally", "jaunter", 1, "EMP") // EMP accidental activation
 			activate(M)
 
-/obj/item/wormhole_jaunter/proc/chasm_react(mob/user)
-	if(user.get_item_by_slot(SLOT_BELT) == src)
-		to_chat(user, "Your [name] activates, saving you from the chasm!</span>")
-		SSblackbox.record_feedback("tally", "jaunter", 1, "Chasm") // chasm automatic activation
-		activate(user, FALSE, TRUE)
-	else
-		to_chat(user, "[src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
+/obj/item/wormhole_jaunter/proc/chasm_react(mob/source, datum/component/chasm/C)
+	to_chat(source, "Your [name] activates, saving you from the chasm!</span>")
+	SSblackbox.record_feedback("tally", "jaunter", 1, "Chasm") // chasm automatic activation
+	activate(source, FALSE, TRUE)
+	if(C)
+		var/atom/A = C.parent
+		A.visible_message("<span class='boldwarning'>[source] falls into [A]!</span>")
+	return TRUE
 
 //jaunter tunnel
 /obj/effect/portal/jaunt_tunnel

code/modules/paperwork/photocopier.dm

@@ -187,12 +187,13 @@
  */
 /obj/machinery/photocopier/proc/do_copy_loop(datum/callback/copy_cb, mob/user)
 	busy = TRUE
-	var/i
-	for(i in 1 to num_copies)
+	var/num_loops
+	for(var/i in 1 to num_copies)
 		//if(attempt_charge(src, user) & COMPONENT_OBJ_CANCEL_CHARGE)
 		//	break
 		addtimer(copy_cb, i SECONDS)
-	addtimer(CALLBACK(src, .proc/reset_busy), i SECONDS)
+		num_loops++
+	addtimer(CALLBACK(src, .proc/reset_busy), num_loops SECONDS)
 
 /**
  * Sets busy to `FALSE`. Created as a proc so it can be used in callbacks.

html/changelog.html

@@ -50,6 +50,21 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">04 September 2020</h2>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">ipcs can speak</li>
+			</ul>
+
+			<h2 class="date">03 September 2020</h2>
+			<h3 class="author">Ghommie updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Jaunters should now work with magic mirror chasming.</li>
+				<li class="bugfix">The photocopier can now print more than one copy at a time.</li>
+				<li class="bugfix">Alkali perspiration infos don't crash the Pandemic UI anymore.</li>
+				<li class="bugfix">Windoors can be actually tinted now.</li>
+			</ul>
+
 			<h2 class="date">02 September 2020</h2>
 			<h3 class="author">Putnam3145 updated:</h3>
 			<ul class="changes bgimages16">
@@ -1428,69 +1443,6 @@
 			<ul class="changes bgimages16">
 				<li class="refactor">blood_DNA["color"] is now a single variable instead of a list</li>
 			</ul>
-
-			<h2 class="date">03 July 2020</h2>
-			<h3 class="author">Arturlang updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">You can now toggle hardsuit helmets from the strip menu</li>
-			</ul>
-			<h3 class="author">Ghommie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">fixed custom speech/tongue stuff.</li>
-				<li class="balance">Lowered shaft miners' paycheck, they have other ways to make cash.</li>
-				<li class="rscadd">You can't (un)equip garments on/from obscured inventory slots anymore.</li>
-				<li class="balance">The stamina cost multiplier for swinging melee weapons against mobs has been brought back to 1 from 0.8</li>
-				<li class="balance">The stamina cost for throwing mobs now scales with their mob size variable.</li>
-			</ul>
-			<h3 class="author">LetterN updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Ported some tags from tgui-3.0 to Vending.js</li>
-				<li class="bugfix">vending icons</li>
-				<li class="bugfix">r&d icons</li>
-				<li class="bugfix">chem master icons</li>
-			</ul>
-			<h3 class="author">Onule updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">titanium wall man good</li>
-			</ul>
-			<h3 class="author">Sonic121x updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Bringback the ChemMaster pill type button.</li>
-				<li class="bugfix">Fix Technode icon.</li>
-			</ul>
-			<h3 class="author">bunny232 updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Witchhunter hat no longer obscures mask ears ,eyes, face and mouth</li>
-			</ul>
-			<h3 class="author">timothyteakettle updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">bloodpacks initialise correctly now</li>
-			</ul>
-
-			<h2 class="date">02 July 2020</h2>
-			<h3 class="author">Ghommie updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">Fixing a few issues with twohanded items.</li>
-				<li class="bugfix">Unum decks now work correctly.</li>
-				<li class="bugfix">Abductor walls are once again buildable with alien alloy.</li>
-			</ul>
-			<h3 class="author">Trilbyspaceclone updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="tweak">Makes pride and envy ruin a bit smaller!</li>
-				<li class="rscadd">Pride now has rings, lipstick wigs and silver walls/door making a nice and polished look then cyan blue walls.</li>
-				<li class="rscadd">more trash and better dagger placement on food ruin</li>
-				<li class="rscadd">Snowboim now has snowballs and toy gifts for the two skeles daw!</li>
-				<li class="tweak">Beach boim now has carp light branding beer, as well as soap!</li>
-				<li class="tweak">Greed ruin now uses nice slick walls and carpet!</li>
-				<li class="tweak">Founten ruin looks a lot better with its carpets and well maintained fluff things, but walls suffered and no longer can salvage ruined metal...</li>
-				<li class="rscadd">Alien nest has a bit more glowy floors of resin looking a bit more lived in by the drones. As well as the "door" now being see through resin rather then the thicker stuff that you cant see through</li>
-				<li class="rscadd">Pizza party has a few more gifts, some candy and snap pops yay!</li>
-				<li class="balance">Sloth ruin is about 15~ tiles shorter, has and has more fruit for a bowl. How lazy!</li>
-			</ul>
-			<h3 class="author">silicons updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="bugfix">bohbombing is a thing now</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>

html/changelogs/.all_changelog.yml

@@ -27206,3 +27206,12 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: pyroclastic anomaly client spam
   timothyteakettle:
   - rscadd: you can hide your ckey now from the roundend report
+2020-09-03:
+  Ghommie:
+  - bugfix: Jaunters should now work with magic mirror chasming.
+  - bugfix: The photocopier can now print more than one copy at a time.
+  - bugfix: Alkali perspiration infos don't crash the Pandemic UI anymore.
+  - bugfix: Windoors can be actually tinted now.
+2020-09-04:
+  timothyteakettle:
+  - bugfix: ipcs can speak