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

code/game/objects/items/RCD.dm

@@ -242,7 +242,6 @@ RLD
 
 	var/datum/browser/popup = new(user, "rcd_access", "Access Control", 900, 500, src)
 	popup.set_content(t1)
-	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
 	popup.open()
 
 /obj/item/construction/rcd/Topic(href, href_list)

code/game/objects/items/broom.dm

@@ -28,39 +28,37 @@
 /// triggered on wield of two handed item
 /obj/item/broom/proc/on_wield(obj/item/source, mob/user)
 	to_chat(user, "<span class='notice'>You brace the [src] against the ground in a firm sweeping stance.</span>")
-	RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/sweep)
+	RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/sweep)
 
 /// triggered on unwield of two handed item
 /obj/item/broom/proc/on_unwield(obj/item/source, mob/user)
-	UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
+	UnregisterSignal(user, COMSIG_MOVABLE_PRE_MOVE)
 
 /obj/item/broom/afterattack(atom/A, mob/user, proximity)
 	. = ..()
 	if(!proximity)
 		return
-	sweep(user, A, FALSE)
+	sweep(user, A)
 
-/obj/item/broom/proc/sweep(mob/user, atom/A, moving = TRUE)
-	var/turf/target
-	if (!moving)
-		if (isturf(A))
-			target = A
-		else
-			target = A.loc
-	else
-		target = user.loc
-	if (!isturf(target))
+/obj/item/broom/proc/sweep(datum/source, atom/newLoc)
+	if(!ismob(source) || !isturf(newLoc) || (get_dist(source, newLoc) > 1))
 		return
-	if (locate(/obj/structure/table) in target.contents)
+	var/turf/target = newLoc
+	var/atom/movable/AM
+	var/sweep_dir = get_dir(source, target)
+	if(!sweep_dir)
 		return
+	for(var/i in target.contents)
+		AM = i
+		if(AM.density)		// eh good enough heuristic check
+			return
 	var/i = 0
 	for(var/obj/item/garbage in target.contents)
 		if(!garbage.anchored)
-			garbage.Move(get_step(target, user.dir), user.dir)
-		i++
-		if(i >= 20)
+			step(garbage, sweep_dir)
+		if(++i > 20)
 			break
-	if(i >= 1)
+	if(i)
 		playsound(loc, 'sound/weapons/thudswoosh.ogg', 30, TRUE, -1)
 
 /obj/item/broom/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) //bless you whoever fixes this copypasta

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/game/objects/items/devices/PDA/PDA.dm

@@ -266,7 +266,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 	var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/simple/pda)
 	assets.send(user)
 
-	var/datum/asset/spritesheet/emoji_s = get_asset_datum(/datum/asset/spritesheet/goonchat)
+	var/datum/asset/spritesheet/emoji_s = get_asset_datum(/datum/asset/spritesheet/chat)
 	emoji_s.send(user) //Already sent by chat but no harm doing this
 
 	user.set_machine(src)

code/game/objects/items/devices/PDA/cart.dm

@@ -590,7 +590,7 @@ Code:
 			var/static/list/emoji_icon_states
 			var/static/emoji_table
 			if(!emoji_table)
-				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/goonchat)
+				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 				var/list/collate = list("<br><table>")
 				for(var/emoji in sortList(icon_states(icon('icons/emoji.dmi'))))
 					var/tag = sheet.icon_tag("emoji-[emoji]")

code/game/objects/items/devices/portable_chem_mixer.dm

@@ -0,0 +1,207 @@
+/obj/item/storage/portable_chem_mixer
+	name = "Portable Chemical Mixer"
+	desc = "A portable device that dispenses and mixes chemicals. All necessary reagents need to be supplied with beakers. A label indicates that a screwdriver is required to open it for refills. This device can be worn on a belt. The letters 'S&T' are imprinted on the side."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "portablechemicalmixer_open"
+	w_class = WEIGHT_CLASS_HUGE
+	slot_flags = ITEM_SLOT_BELT
+	custom_price = 2000
+	custom_premium_price = 2000
+
+	var/obj/item/reagent_containers/beaker = null	///Creating an empty slot for a beaker that can be added to dispense into
+	var/amount = 30	///The amount of reagent that is to be dispensed currently
+
+	var/list/dispensable_reagents = list()	///List in which all currently dispensable reagents go
+
+/obj/item/storage/portable_chem_mixer/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = 200
+	STR.max_items = 50
+	STR.insert_preposition = "in"
+	STR.can_hold = typecacheof(list(
+		/obj/item/reagent_containers/glass/beaker,
+	))
+
+/obj/item/storage/portable_chem_mixer/Destroy()
+	QDEL_NULL(beaker)
+	return ..()
+
+/obj/item/storage/portable_chem_mixer/ex_act(severity, target)
+	if(severity < 3)
+		..()
+
+/obj/item/storage/portable_chem_mixer/attackby(obj/item/I, mob/user, params)
+	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+	if (I.tool_behaviour == TOOL_SCREWDRIVER)
+		SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, !locked)
+		if (!locked)
+			update_contents()
+		if (locked)
+			replace_beaker(user)
+		update_icon()
+		I.play_tool_sound(src, 50)
+		return
+
+	else if (istype(I, /obj/item/reagent_containers) && !(I.item_flags & ABSTRACT) && I.is_open_container() && locked)
+		var/obj/item/reagent_containers/B = I
+		. = TRUE //no afterattack
+		if(!user.transferItemToLoc(B, src))
+			return
+		replace_beaker(user, B)
+		update_icon()
+		updateUsrDialog()
+		return
+
+	return ..()
+
+/**
+  * Updates the contents of the portable chemical mixer
+  *
+  * A list of dispensable reagents is created by iterating through each source beaker in the portable chemical beaker and reading its contents
+  */
+/obj/item/storage/portable_chem_mixer/proc/update_contents()
+	dispensable_reagents.Cut()
+
+	for (var/obj/item/reagent_containers/glass/beaker/B in contents)
+		var/key = B.reagents.get_master_reagent_id()
+		if (!(key in dispensable_reagents))
+			dispensable_reagents[key] = list()
+			dispensable_reagents[key]["reagents"] = list()
+		dispensable_reagents[key]["reagents"] += B.reagents
+
+	return
+
+/obj/item/storage/portable_chem_mixer/update_icon_state()
+	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+	if (!locked)
+		icon_state = "portablechemicalmixer_open"
+	else if (beaker)
+		icon_state = "portablechemicalmixer_full"
+	else
+		icon_state = "portablechemicalmixer_empty"
+
+
+/obj/item/storage/portable_chem_mixer/AltClick(mob/living/user)
+	var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+	if (!locked)
+		return ..()
+	if(!can_interact(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	replace_beaker(user)
+	update_icon()
+
+/**
+  * Replaces the beaker of the portable chemical mixer with another beaker, or simply adds the new beaker if none is in currently
+  *
+  * Checks if a valid user and a valid new beaker exist and attempts to replace the current beaker in the portable chemical mixer with the one in hand. Simply places the new beaker in if no beaker is currently loaded
+  *	Arguments:
+  * * mob/living/user							-	The user who is trying to exchange beakers
+  *	* obj/item/reagent_containers/new_beaker	-	The new beaker that the user wants to put into the device
+  */
+/obj/item/storage/portable_chem_mixer/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
+	if(!user)
+		return FALSE
+	if(beaker)
+		user.put_in_hands(beaker)
+		beaker = null
+	if(new_beaker)
+		beaker = new_beaker
+	return TRUE
+
+/obj/item/storage/portable_chem_mixer/attack_hand(mob/user)
+	if (loc != user)
+		return ..()
+	if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
+		ui_interact(user)
+		return
+
+/obj/item/storage/portable_chem_mixer/attack_self(mob/user)
+	if(loc == user)
+		var/locked = SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)
+		if (locked)
+			ui_interact(user)
+			return
+		else
+			to_chat(user, "<span class='notice'>The portable chemical mixer is currently open and its contents can be accessed.</span>")
+			return
+	return
+
+/obj/item/storage/portable_chem_mixer/MouseDrop(obj/over_object)
+	. = ..()
+	if(ismob(loc))
+		var/mob/M = loc
+		if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
+			var/obj/screen/inventory/hand/H = over_object
+			M.putItemFromInventoryInHandIfPossible(src, H.held_index)
+
+/obj/item/storage/portable_chem_mixer/ui_interact(mob/user, datum/tgui/ui)
+	ui = SStgui.try_update_ui(user, src, ui)
+	if(!ui)
+		ui = new(user, src, "PortableChemMixer", name)
+		if(user.hallucinating())
+			// to not ruin the immersion by constantly changing the fake chemicals
+			ui.set_autoupdate(FALSE)
+		ui.open()
+
+/obj/item/storage/portable_chem_mixer/ui_data(mob/user)
+	var/list/data = list()
+	data["amount"] = amount
+	data["isBeakerLoaded"] = beaker ? 1 : 0
+	data["beakerCurrentVolume"] = beaker ? beaker.reagents.total_volume : null
+	data["beakerMaxVolume"] = beaker ? beaker.volume : null
+	data["beakerTransferAmounts"] = beaker ? beaker.possible_transfer_amounts : null
+	var/chemicals[0]
+	var/is_hallucinating = user.hallucinating()
+	if(user.hallucinating())
+		is_hallucinating = TRUE
+	for(var/re in dispensable_reagents)
+		var/value = dispensable_reagents[re]
+		var/datum/reagent/temp = GLOB.chemical_reagents_list[re]
+		if(temp)
+			var/chemname = temp.name
+			var/total_volume = 0
+			for (var/datum/reagents/rs in value["reagents"])
+				total_volume += rs.total_volume
+			if(is_hallucinating && prob(5))
+				chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
+			chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name), "volume" = total_volume )))
+	data["chemicals"] = chemicals
+	var/beakerContents[0]
+	if(beaker)
+		for(var/datum/reagent/R in beaker.reagents.reagent_list)
+			beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
+	data["beakerContents"] = beakerContents
+	return data
+
+/obj/item/storage/portable_chem_mixer/ui_act(action, params)
+	if(..())
+		return
+	switch(action)
+		if("amount")
+			var/target = text2num(params["target"])
+			amount = target
+			. = TRUE
+		if("dispense")
+			var/reagent_name = params["reagent"]
+			var/datum/reagent/reagent = GLOB.name2reagent[reagent_name]
+			var/entry = dispensable_reagents[reagent]
+			if(beaker)
+				var/datum/reagents/R = beaker.reagents
+				var/actual = min(amount, 1000, R.maximum_volume - R.total_volume)
+				// todo: add check if we have enough reagent left
+				for (var/datum/reagents/source in entry["reagents"])
+					var/to_transfer = min(source.total_volume, actual)
+					source.trans_to(beaker, to_transfer)
+					actual -= to_transfer
+					if (actual <= 0)
+						break
+			. = TRUE
+		if("remove")
+			var/amount = text2num(params["amount"])
+			beaker.reagents.remove_all(amount)
+			. = TRUE
+		if("eject")
+			replace_beaker(usr)
+			update_icon()
+			. = TRUE

code/game/objects/items/devices/radio/electropack.dm

@@ -16,9 +16,6 @@
 	var/on = TRUE
 	var/shock_cooldown = FALSE
 
-	var/ui_x = 260
-	var/ui_y = 137
-
 /obj/item/electropack/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] hooks [user.p_them()]self to the electropack and spams the trigger! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (FIRELOSS)
@@ -201,17 +198,7 @@
 	else
 		return ..()
 
-/obj/item/electropack/shockcollar/ui_interact(mob/user) //note to src: use tgooey
-	var/dat = {"
-<TT>
-<B>Frequency/Code</B> for shock collar:<BR>
-Frequency:
-[format_frequency(src.frequency)]
-<A href='byond://?src=[REF(src)];set=freq'>Set</A><BR>
-Code:
-[src.code]
-<A href='byond://?src=[REF(src)];set=code'>Set</A><BR>
-</TT>"}
-	user << browse(dat, "window=radio")
-	onclose(user, "radio")
-	return
+/obj/item/electropack/ui_act(action, params)
+	if(action == "power") // DO. NOT.
+		return FALSE
+	return ..()

code/game/objects/items/devices/scanners.dm

@@ -729,10 +729,10 @@ GENETICS SCANNER
 				to_chat(user, "<span class='notice'>[target] is empty!</span>")
 
 		if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected
-			var/fusion_power = round(cached_scan_results["fusion"], 0.01)
-			var/tier = fusionpower2text(fusion_power)
+			var/instability = round(cached_scan_results["fusion"], 0.01)
+			var/tier = instability2text(instability)
 			to_chat(user, "<span class='boldnotice'>Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.</span>")
-			to_chat(user, "<span class='notice'>Power of the last fusion reaction: [fusion_power]\n This power indicates it was a [tier]-tier fusion reaction.</span>")
+			to_chat(user, "<span class='notice'>Instability of the last fusion reaction: [instability]\n This indicates it was [tier].</span>")
 	return
 
 /obj/item/analyzer/proc/scan_turf(mob/user, turf/location)
@@ -783,10 +783,10 @@ GENETICS SCANNER
 		to_chat(user, "<span class='info'>Temperature: [round(environment.return_temperature()-T0C, 0.01)] &deg;C ([round(environment.return_temperature(), 0.01)] K)</span>")
 
 		if(cached_scan_results && cached_scan_results["fusion"]) //notify the user if a fusion reaction was detected
-			var/fusion_power = round(cached_scan_results["fusion"], 0.01)
-			var/tier = fusionpower2text(fusion_power)
+			var/instability = round(cached_scan_results["fusion"], 0.01)
+			var/tier = instability2text(instability)
 			to_chat(user, "<span class='boldnotice'>Large amounts of free neutrons detected in the air indicate that a fusion reaction took place.</span>")
-			to_chat(user, "<span class='notice'>Power of the last fusion reaction: [fusion_power]\n This power indicates it was a [tier]-tier fusion reaction.</span>")
+			to_chat(user, "<span class='notice'>Instability of the last fusion reaction: [instability]\n This indicates it was [tier].</span>")
 
 /obj/item/analyzer/ranged
 	desc = "A hand-held scanner which uses advanced spectroscopy and infrared readings to analyze gases as a distance. Alt-Click to use the built in barometer function."
@@ -992,4 +992,4 @@ GENETICS SCANNER
 #undef SCANMODE_CHEMICAL
 #undef SCANMODE_WOUND
 #undef SCANNER_CONDENSED
-#undef SCANNER_VERBOSE
+#undef SCANNER_VERBOSE

code/game/objects/items/melee/misc.dm

@@ -234,6 +234,9 @@
 /obj/item/melee/rapier/attack(mob/living/target, mob/living/user)
 	. = ..()
 	if(iscarbon(target))
+		if(HAS_TRAIT(user, TRAIT_PACIFISM))
+			visible_message("<span class='warning'>[user] gently taps [target] with [src].</span>",null,null,COMBAT_MESSAGE_RANGE)
+		log_combat(user, target, "slept", src)
 		var/mob/living/carbon/H = target
 		H.Dizzy(10)
 		H.adjustStaminaLoss(30)

code/game/objects/items/weaponry.dm

@@ -291,7 +291,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
 	w_class = WEIGHT_CLASS_BULKY
-	force = 9
+	force = 7 //how much harm mode damage we do
+	var/stamina_damage_increment = 4 //how much extra damage do we do when in non-harm mode
 	throwforce = 10
 	damtype = STAMINA
 	attack_verb = list("whacked", "smacked", "struck")
@@ -342,17 +343,19 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /obj/item/melee/bokken/Initialize()
 	. = ..()
 	AddElement(/datum/element/sword_point)
+	if(!harm) //if initialised in non-harm mode, setup force accordingly
+		force = force + stamina_damage_increment
 
 /obj/item/melee/bokken/attack_self(mob/user)
 	harm = !harm
 	if(harm)
-		force -= 2
+		force -= stamina_damage_increment
 		damtype = BRUTE
 		attack_verb = list("bashed", "smashed", "attacked")
 		bare_wound_bonus = 15 // having your leg smacked by a wooden stick is probably not great for it if it's naked
 		wound_bonus = 0
 	else
-		force += 2
+		force += stamina_damage_increment
 		damtype = STAMINA
 		attack_verb = list("whacked", "smacked", "struck")
 		bare_wound_bonus = 0