Merge remote-tracking branch 'citadel/master' into mobility_flags

code/game/objects/items/RPD.dm

@@ -329,7 +329,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 50, 0)
 
 /obj/item/pipe_dispenser/pre_attack(atom/A, mob/user)
-	if(!user.IsAdvancedToolUser() || istype(A, /turf/open/space/transit))
+	var/turf/T = get_turf(A)
+	if(!user.IsAdvancedToolUser() || !T || istype(T, /turf/open/space/transit) || isindestructiblewall(T))
 		return ..()
 
 	//So that changing the menu settings doesn't affect the pipes already being built.
@@ -376,12 +377,16 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 			if(ATMOS_CATEGORY) //Making pipes
 				if(!can_make_pipe)
 					return ..()
+				A = T
+				if(is_type_in_typecache(recipe, GLOB.ventcrawl_machinery) && isclosedturf(A)) //wall escapism sanity check.
+					to_chat(user, "<span class='warning'>[src]'s error light flickers; there's something in the way!</span>")
+					return
 				playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
 				if (recipe.type == /datum/pipe_info/meter)
 					to_chat(user, "<span class='notice'>You start building a meter...</span>")
 					if(do_after(user, atmos_build_speed, target = A))
 						activate()
-						var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(get_turf(A))
+						var/obj/item/pipe_meter/PM = new /obj/item/pipe_meter(A)
 						PM.setAttachLayer(piping_layer)
 						if(mode&WRENCH_MODE)
 							PM.wrench_act(user, src)
@@ -391,7 +396,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 						activate()
 						var/obj/machinery/atmospherics/path = queued_p_type
 						var/pipe_item_type = initial(path.construction_type) || /obj/item/pipe
-						var/obj/item/pipe/P = new pipe_item_type(get_turf(A), queued_p_type, queued_p_dir)
+						var/obj/item/pipe/P = new pipe_item_type(A, queued_p_type, queued_p_dir)
 
 						if(queued_p_flipped && istype(P, /obj/item/pipe/trinary/flippable))
 							var/obj/item/pipe/trinary/flippable/F = P
@@ -408,7 +413,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 			if(DISPOSALS_CATEGORY) //Making disposals pipes
 				if(!can_make_pipe)
 					return ..()
-				A = get_turf(A)
+				A = T
 				if(isclosedturf(A))
 					to_chat(user, "<span class='warning'>[src]'s error light flickers; there's something in the way!</span>")
 					return
@@ -433,7 +438,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 			if(TRANSIT_CATEGORY) //Making transit tubes
 				if(!can_make_pipe)
 					return ..()
-				A = get_turf(A)
+				A = T
 				if(isclosedturf(A))
 					to_chat(user, "<span class='warning'>[src]'s error light flickers; there's something in the way!</span>")
 					return

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -308,6 +308,7 @@
 /obj/item/circuitboard/machine/thermomachine
 	name = "Thermomachine (Machine Board)"
 	desc = "You can use a screwdriver to switch between heater and freezer."
+	var/pipe_layer = PIPING_LAYER_DEFAULT
 	req_components = list(
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/stock_parts/micro_laser = 2,
@@ -342,8 +343,18 @@
 		build_path = initial(new_type.build_path)
 		I.play_tool_sound(src)
 		to_chat(user, "<span class='notice'>You change the circuitboard setting to \"[new_setting]\".</span>")
-	else
-		return ..()
+		return
+
+	if(I.tool_behaviour == TOOL_MULTITOOL)
+		pipe_layer = (pipe_layer >= PIPING_LAYER_MAX) ? PIPING_LAYER_MIN : (pipe_layer + 1)
+		to_chat(user, "<span class='notice'>You change the circuitboard to layer [pipe_layer].</span>")
+		return
+
+	. = ..()
+
+/obj/item/circuitboard/machine/thermomachine/examine()
+	. = ..()
+	. += "<span class='notice'>It is set to layer [pipe_layer].</span>"
 
 /obj/item/circuitboard/machine/thermomachine/heater
 	name = "Heater (Machine Board)"

code/game/objects/items/crayons.dm

@@ -427,7 +427,7 @@
 /obj/item/toy/crayon/proc/can_claim_for_gang(mob/user, atom/target)
 	// Check area validity.
 	// Reject space, player-created areas, and non-station z-levels.
-	var/area/A = get_area(target)
+	var/area/A = get_base_area(target)
 	if(!A || (!is_station_level(A.z)) || !A.valid_territory)
 		to_chat(user, "<span class='warning'>[A] is unsuitable for tagging.</span>")
 		return FALSE
@@ -461,7 +461,7 @@
 		qdel(old_marking)
 
 	var/datum/antagonist/gang/G = user.mind.has_antag_datum(/datum/antagonist/gang)
-	var/area/territory = get_area(target)
+	var/area/territory = get_base_area(target)
 
 	new /obj/effect/decal/cleanable/crayon/gang(target,G.gang,"graffiti",0,user) // Heres the gang tag.
 	to_chat(user, "<span class='notice'>You tagged [territory] for your gang!</span>")

code/game/objects/items/defib.dm

@@ -452,14 +452,15 @@
 	return TRUE
 
 /obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H)
-	if(req_defib)
-		if(defib.pullshocksafely && isliving(H.pulledby))
-			H.visible_message("<span class='danger'>The defibrillator safely discharges the excessive charge into the floor!</span>")
-	else
-		var/mob/living/M = H.pulledby
-		if(M.electrocute_act(30, src))
-			M.visible_message("<span class='danger'>[M] is electrocuted by [M.p_their()] contact with [H]!</span>")
-			M.emote("scream")
+	if(!H.pulledby || !isliving(H.pulledby))
+		return
+	if(req_defib && defib.pullshocksafely)
+		H.visible_message("<span class='danger'>The defibrillator safely discharges the excessive charge into the floor!</span>")
+		return
+	var/mob/living/M = H.pulledby
+	if(M.electrocute_act(30, src))
+		M.visible_message("<span class='danger'>[M] is electrocuted by [M.p_their()] contact with [H]!</span>")
+		M.emote("scream")
 
 /obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user)
 	if(req_defib && defib.safety)

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

@@ -93,6 +93,8 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 	var/underline_flag = TRUE //flag for underline
 
+	var/list/blocked_pdas
+
 /obj/item/pda/suicide_act(mob/living/carbon/user)
 	var/deathMessage = msg_input(user)
 	if (!deathMessage)
@@ -387,7 +389,10 @@ GLOBAL_LIST_EMPTY(PDAs)
 					for (var/obj/item/pda/P in sortNames(get_viewable_pdas()))
 						if (P == src)
 							continue
-						dat += "<li><a href='byond://?src=[REF(src)];choice=Message;target=[REF(P)]'>[P]</a>"
+						if(P.owner in blocked_pdas)
+							dat += "<li><a href='byond://?src=[REF(src)];choice=unblock_pda;target=[P.owner]'>(BLOCKED - CLICK TO UNBLOCK) [P]</a>"
+						else
+							dat += "<li><a href='byond://?src=[REF(src)];choice=Message;target=[REF(P)]'>[P]</a>"
 						if(cartridge)
 							dat += cartridge.message_special(P)
 						dat += "</li>"
@@ -646,6 +651,15 @@ GLOBAL_LIST_EMPTY(PDAs)
 			if("MessageAll")
 				send_to_all(U)
 
+			if("toggle_block")
+				toggle_blocking(usr, href_list["target"])
+
+			if("block_pda")
+				block_pda(usr, href_list["target"])
+
+			if("unblock_pda")
+				unblock_pda(usr, href_list["target"])
+
 			if("cart")
 				if(cartridge)
 					cartridge.special(U, href_list)
@@ -744,9 +758,16 @@ GLOBAL_LIST_EMPTY(PDAs)
 		message += "\nSent from my PDA"
 	// Send the signal
 	var/list/string_targets = list()
-	for (var/obj/item/pda/P in targets)
-		if (P.owner && P.ownjob)  // != src is checked by the UI
+	var/list/string_blocked
+	for(var/obj/item/pda/P in targets)
+		if(owner in P.blocked_pdas)
+			LAZYADD(string_blocked, P.owner)
+			continue
+		if(P.owner && P.ownjob)  // != src is checked by the UI
 			string_targets += "[P.owner] ([P.ownjob])"
+	if(string_blocked)
+		string_blocked = english_list(string_blocked)
+		to_chat(user, "<span class='warning'>[icon2html(src, user)] The following recipients have blocked your message: [string_blocked].</span>")
 	for (var/obj/machinery/computer/message_monitor/M in targets)
 		// In case of "Reply" to a message from a console, this will make the
 		// message be logged successfully. If the console is impersonating
@@ -779,12 +800,13 @@ GLOBAL_LIST_EMPTY(PDAs)
 	tnote += "<i><b>&rarr; To [target_text]:</b></i><br>[signal.format_message()]<br>"
 	// Show it to ghosts
 	var/ghost_message = "<span class='name'>[owner] </span><span class='game say'>PDA Message</span> --> <span class='name'>[target_text]</span>: <span class='message'>[signal.format_message(TRUE)]</span>"
-	for(var/mob/M in GLOB.player_list)
-		if(isobserver(M) && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTPDA))
+	for(var/i in GLOB.dead_mob_list)
+		var/mob/M = i
+		if(M?.client && M.client.prefs.chat_toggles & CHAT_GHOSTPDA)
 			to_chat(M, "[FOLLOW_LINK(M, user)] [ghost_message]")
-	// Log in the talk log
-	user.log_talk(message, LOG_PDA, tag="PDA: [initial(name)] to [target_text]")
 	to_chat(user, "<span class='info'>Message sent to [target_text]: \"[emoji_message]\"</span>")
+	// Log in the talk log
+	user.log_talk(message, LOG_PDA, tag="PDA: [initial(name)] to [target_text] (BLOCKED:[string_blocked])")
 	if (!silent)
 		playsound(src, 'sound/machines/terminal_success.ogg', 15, 1)
 	// Reset the photo
@@ -794,8 +816,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 		last_everyone = world.time
 
 /obj/item/pda/proc/receive_message(datum/signal/subspace/pda/signal)
-	tnote += "<i><b>&larr; From <a href='byond://?src=[REF(src)];choice=Message;target=[REF(signal.source)]'>[signal.data["name"]]</a> ([signal.data["job"]]):</b></i><br>[signal.format_message()]<br>"
-
+	tnote += "<i><b>&larr; From <a href='byond://?src=[REF(src)];choice=Message;target=[REF(signal.source)]'>[signal.data["name"]]</a> ([signal.data["job"]]):</b></i> <a href='byond://?src=[REF(src)];choice=toggle_block;target=[signal.data["name"]]'>(BLOCK/UNBLOCK)</a><br>[signal.format_message()]<br>"
 	if (!silent)
 		playsound(src, 'sound/machines/twobeep.ogg', 50, 1)
 		audible_message("[icon2html(src, hearers(src))] *[ttone]*", null, 3)
@@ -814,7 +835,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 			hrefstart = "<a href='?src=[REF(L)];track=[html_encode(signal.data["name"])]'>"
 			hrefend = "</a>"
 
-		to_chat(L, "[icon2html(src)] <b>Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], </b>[signal.format_message(TRUE)] (<a href='byond://?src=[REF(src)];choice=Message;skiprefresh=1;target=[REF(signal.source)]'>Reply</a>)")
+		to_chat(L, "[icon2html(src)] <b>Message from [hrefstart][signal.data["name"]] ([signal.data["job"]])[hrefend], </b>[signal.format_message(TRUE)] (<a href='byond://?src=[REF(src)];choice=Message;skiprefresh=1;target=[REF(signal.source)]'>Reply</a>) <a href='byond://?src=[REF(src)];choice=toggle_block;target=[signal.data["name"]]'>(BLOCK/UNBLOCK)</a>")
 
 	update_icon(TRUE)
 
@@ -827,6 +848,20 @@ GLOBAL_LIST_EMPTY(PDAs)
 /obj/item/pda/proc/create_message(mob/living/U, obj/item/pda/P)
 	send_message(U,list(P))
 
+/obj/item/pda/proc/toggle_blocking(mob/user, target)
+	if(target in blocked_pdas)
+		unblock_pda(user, target)
+	else
+		block_pda(user, target)
+
+/obj/item/pda/proc/block_pda(mob/user, target)
+	to_chat(user, "<span class='notice'>[icon2html(src, user)] [target] blocked from messages. Use the messenger PDA list to unblock.</span>")
+	LAZYOR(blocked_pdas, target)
+
+/obj/item/pda/proc/unblock_pda(mob/user, target)
+	to_chat(user, "<span class='notice'>[icon2html(src, user)] [target] unblocked from messages.</span>")
+	LAZYREMOVE(blocked_pdas, target)
+
 /obj/item/pda/AltClick(mob/user)
 	. = ..()
 	if(id)
@@ -1172,4 +1207,4 @@ GLOBAL_LIST_EMPTY(PDAs)
 #undef PDA_OVERLAY_ID
 #undef PDA_OVERLAY_ITEM
 #undef PDA_OVERLAY_LIGHT
-#undef PDA_OVERLAY_PAI
+#undef PDA_OVERLAY_PAI

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

@@ -326,7 +326,7 @@ Code:
 
 			if(active1 in GLOB.data_core.general)
 				menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]<br>"
-				menu += "Sex: [active1.fields["sex"]]<br>"
+				menu += "Sex: [active1.fields["gender"]]<br>"
 				menu += "Age: [active1.fields["age"]]<br>"
 				menu += "Rank: [active1.fields["rank"]]<br>"
 				menu += "Fingerprint: [active1.fields["fingerprint"]]<br>"
@@ -370,7 +370,7 @@ Code:
 
 			if(active1 in GLOB.data_core.general)
 				menu += "Name: [active1.fields["name"]] ID: [active1.fields["id"]]<br>"
-				menu += "Sex: [active1.fields["sex"]]<br>"
+				menu += "Sex: [active1.fields["gender"]]<br>"
 				menu += "Age: [active1.fields["age"]]<br>"
 				menu += "Rank: [active1.fields["rank"]]<br>"
 				menu += "Fingerprint: [active1.fields["fingerprint"]]<br>"

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

@@ -1,6 +1,6 @@
 /obj/item/forcefield_projector
 	name = "forcefield projector"
-	desc = "An experimental device that can create several forcefields at a distance."
+	desc = "An experimental device that can create several forcefields at a short distance."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "signmaker_forcefield"
 	slot_flags = ITEM_SLOT_BELT
@@ -14,7 +14,7 @@
 	var/shield_integrity = 250
 	var/max_fields = 3
 	var/list/current_fields
-	var/field_distance_limit = 7
+	var/field_distance_limit = 2
 
 /obj/item/forcefield_projector/afterattack(atom/target, mob/user, proximity_flag)
 	. = ..()

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

@@ -26,6 +26,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	slot_flags = ITEM_SLOT_EARS
 	var/obj/item/encryptionkey/keyslot2 = null
 	dog_fashion = null
+	var/bowman = FALSE
 
 /obj/item/radio/headset/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins putting \the [src]'s antenna up [user.p_their()] nose! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer!</span>")
@@ -52,6 +53,11 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	else
 		. += "<span class='notice'>A small screen on the headset flashes, it's too small to read without holding or wearing the headset.</span>"
 
+/obj/item/radio/headset/ComponentInitialize()
+	. = ..()
+	if (bowman)
+		AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))
+
 /obj/item/radio/headset/Initialize()
 	. = ..()
 	recalculateChannels()
@@ -81,10 +87,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs."
 	icon_state = "syndie_headset"
 	item_state = "syndie_headset"
-
-/obj/item/radio/headset/syndicate/alt/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))
+	bowman = TRUE
 
 /obj/item/radio/headset/syndicate/alt/leader
 	name = "team leader headset"
@@ -112,10 +115,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	desc = "This is used by your elite security force. Protects ears from flashbangs."
 	icon_state = "sec_headset_alt"
 	item_state = "sec_headset_alt"
-
-/obj/item/radio/headset/headset_sec/alt/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))
+	bowman = TRUE
 
 /obj/item/radio/headset/headset_eng
 	name = "engineering radio headset"
@@ -161,10 +161,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	desc = "The headset of the boss. Protects ears from flashbangs."
 	icon_state = "com_headset_alt"
 	item_state = "com_headset_alt"
-
-/obj/item/radio/headset/heads/captain/alt/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))
+	bowman = TRUE
 
 /obj/item/radio/headset/heads/rd
 	name = "\proper the research director's headset"
@@ -183,10 +180,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs."
 	icon_state = "com_headset_alt"
 	item_state = "com_headset_alt"
-
-/obj/item/radio/headset/heads/hos/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))
+	bowman = TRUE
 
 /obj/item/radio/headset/heads/ce
 	name = "\proper the chief engineer's headset"
@@ -258,10 +252,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	icon_state = "cent_headset_alt"
 	item_state = "cent_headset_alt"
 	keyslot = null
-
-/obj/item/radio/headset/headset_cent/alt/ComponentInitialize()
-	. = ..()
-	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))
+	bowman = TRUE
 
 /obj/item/radio/headset/ai
 	name = "\proper Integrated Subspace Transceiver "
@@ -273,7 +264,11 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 
 /obj/item/radio/headset/attackby(obj/item/W, mob/user, params)
 	user.set_machine(src)
-
+	if (istype(W,/obj/item/headsetupgrader))
+		if (!bowman)
+			to_chat(user,"<span class='notice'>You upgrade [src].</span>")
+			bowmanize()
+			qdel(W)
 	if(istype(W, /obj/item/screwdriver))
 		if(keyslot || keyslot2)
 			for(var/ch_name in channels)
@@ -341,3 +336,24 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 		use_command = !use_command
 		to_chat(user, "<span class='notice'>You toggle high-volume mode [use_command ? "on" : "off"].</span>")
 		return TRUE
+
+/obj/item/radio/headset/proc/bowmanize()
+	cut_overlays()
+	var/icon/yeas = icon(icon,icon_state)
+	icon_state = "antenna_alt"
+	var/mutable_appearance/center = mutable_appearance(icon,"center_alt")
+	center.color = yeas.GetPixel(15,18)
+	var/mutable_appearance/centeralt = mutable_appearance(icon,"centeralt_alt")
+	centeralt.color = yeas.GetPixel(14,22)
+	var/mutable_appearance/centercenter = mutable_appearance(icon,"centercenter_alt")
+	centercenter.color = yeas.GetPixel(13,19)
+	var/mutable_appearance/centerpixel = mutable_appearance(icon,"centerpixel_alt")
+	centerpixel.color = yeas.GetPixel(13,21)
+	add_overlay(center)
+	add_overlay(centeralt)
+	add_overlay(centercenter)
+	add_overlay(centerpixel)
+	name = replacetext(name,"headset", "bowman headset")
+	desc = "[desc] Protects ears from flashbangs."
+	bowman = TRUE
+	AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS))

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

@@ -251,3 +251,9 @@ effective or pretty fucking useless.
 	else
 		GLOB.active_jammers -= src
 	update_icon()
+
+/obj/item/headsetupgrader
+	name = "headset upgrader"
+	desc = "A tool that can be used to upgrade a normal headset to be able to protect from flashbangs."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "headset_upgrade"

code/game/objects/items/grenades/grenade.dm

@@ -93,9 +93,8 @@
 		var/obj/item/I = loc
 		I.grenade_prime_react(src)
 
-
-/obj/item/grenade/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/screwdriver))
+/obj/item/grenade/tool_act(mob/living/user, obj/item/I, tool_behaviour)
+	if(tool_behaviour == TOOL_SCREWDRIVER)
 		switch(det_time)
 			if ("1")
 				det_time = 10

code/game/objects/items/handcuffs.dm

@@ -310,6 +310,7 @@
 	trap_damage = 0
 	item_flags = DROPDEL
 	flags_1 = NONE
+	breakouttime = 50
 
 /obj/item/restraints/legcuffs/beartrap/energy/New()
 	..()

code/game/objects/items/stacks/sheets/glass.dm

@@ -10,7 +10,15 @@
  */
 GLOBAL_LIST_INIT(glass_recipes, list ( \
 	new/datum/stack_recipe("directional window", /obj/structure/window/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
-	new/datum/stack_recipe("fulltile window", /obj/structure/window/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
+	new/datum/stack_recipe("fulltile window", /obj/structure/window/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
+	null, \
+	new/datum/stack_recipe_list("glass working bases", list( \
+		new/datum/stack_recipe("chem dish", /obj/item/glasswork/glass_base/dish, 10), \
+		new/datum/stack_recipe("lens", /obj/item/glasswork/glass_base/glass_lens, 15), \
+		new/datum/stack_recipe("spout flask", /obj/item/glasswork/glass_base/spouty, 20), \
+		new/datum/stack_recipe("small bulb flask", /obj/item/glasswork/glass_base/flask_small, 5), \
+		new/datum/stack_recipe("large bottle flask", /obj/item/glasswork/glass_base/flask_large, 15), \
+	)), \
 ))
 
 /obj/item/stack/sheet/glass
@@ -26,6 +34,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 	grind_results = list(/datum/reagent/silicon = 20)
 	point_value = 1
 	tableVariant = /obj/structure/table/glass
+	shard_type = /obj/item/shard
 
 /obj/item/stack/sheet/glass/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to slice [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -93,6 +102,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/plasmaglass
 	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
 	tableVariant = /obj/structure/table/plasmaglass
+	shard_type = /obj/item/shard/plasma
 
 /obj/item/stack/sheet/plasmaglass/fifty
 	amount = 50
@@ -120,7 +130,9 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
 	else
 		return ..()
 
-
+/obj/item/stack/sheet/plasmaglass/on_solar_construction(obj/machinery/power/solar/S)
+	S.obj_integrity *= 1.2
+	S.efficiency *= 1.2
 
 /*
  * Reinforced glass sheets
@@ -145,11 +157,15 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/rglass
 	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
 	point_value = 4
+	shard_type = /obj/item/shard
 
 /obj/item/stack/sheet/rglass/attackby(obj/item/W, mob/user, params)
 	add_fingerprint(user)
 	..()
 
+/obj/item/stack/sheet/rglass/on_solar_construction(obj/machinery/power/solar/S)
+	S.obj_integrity *= 2
+
 /obj/item/stack/sheet/rglass/cyborg
 	materials = list()
 	var/datum/robot_energy_storage/glasource
@@ -188,6 +204,11 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
 	merge_type = /obj/item/stack/sheet/plasmarglass
 	grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10, /datum/reagent/iron = 10)
 	point_value = 23
+	shard_type = /obj/item/shard/plasma
+
+/obj/item/stack/sheet/plasmarglass/on_solar_construction(obj/machinery/power/solar/S)
+	S.obj_integrity *= 2.2
+	S.efficiency *= 1.2
 
 /obj/item/stack/sheet/plasmarglass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.prglass_recipes
@@ -207,6 +228,11 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/titaniumglass
+	shard_type = /obj/item/shard
+
+/obj/item/stack/sheet/titaniumglass/on_solar_construction(obj/machinery/power/solar/S)
+	S.obj_integrity *= 2.5
+	S.efficiency *= 1.5
 
 /obj/item/stack/sheet/titaniumglass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.titaniumglass_recipes
@@ -226,11 +252,16 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
 	resistance_flags = ACID_PROOF
 	merge_type = /obj/item/stack/sheet/plastitaniumglass
+	shard_type = /obj/item/shard
 
 /obj/item/stack/sheet/plastitaniumglass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.plastitaniumglass_recipes
 	return ..()
 
+/obj/item/stack/sheet/titaniumglass/on_solar_construction(obj/machinery/power/solar/S)
+	S.obj_integrity *= 2
+	S.efficiency *= 2
+
 /obj/item/shard
 	name = "shard"
 	desc = "A nasty looking shard of glass."

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -277,6 +277,9 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	recipes = GLOB.wood_recipes
 	return ..()
 
+/obj/item/stack/sheet/mineral/wood/twenty
+	amount = 20
+
 /obj/item/stack/sheet/mineral/wood/fifty
 	amount = 50
 
@@ -782,3 +785,4 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
 	merge_type = /obj/item/stack/sheet/cotton/durathread
 	pull_effort = 70
 	loom_result = /obj/item/stack/sheet/durathread
+

code/game/objects/items/stacks/sheets/sheets.dm

@@ -15,4 +15,15 @@
 	var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity
 	var/is_fabric = FALSE //is this  a valid material for the loom?
 	var/loom_result //result from pulling on the loom
-	var/pull_effort = 0 //amount of delay when pulling on the loom
+	var/pull_effort = 0 //amount of delay when pulling on the loom
+	var/shard_type // the shard debris typepath left over by solar panels and windows etc.
+
+/**
+  * Called on the glass sheet upon solar construction (duh):
+  * Different glass sheets can modify different stas/vars, such as obj_integrity or efficiency
+  * and possibly extra effects if you wish to code them.
+  * Keep in mind the solars' max_integrity is set equal to the obj_integrity later,
+  * so you won't have to do so here.
+  */
+/obj/item/stack/sheet/proc/on_solar_construction(/obj/machinery/power/solar/S)
+	return

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -233,39 +233,111 @@
 	turf_type = /turf/open/floor/carpet/royalblue
 	tableVariant = /obj/structure/table/wood/fancy/royalblue
 
+/obj/item/stack/tile/carpet/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/black/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/black/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/black/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/blackred/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/blackred/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/blackred/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/monochrome/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/monochrome/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/monochrome/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/blue/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/blue/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/blue/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/cyan/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/cyan/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/cyan/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/green/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/green/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/green/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/orange/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/orange/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/orange/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/purple/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/purple/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/purple/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/red/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/red/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/red/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/royalblack/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/royalblack/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/royalblack/fifty
 	amount = 50
 
+/obj/item/stack/tile/carpet/royalblue/ten
+	amount = 10
+
+/obj/item/stack/tile/carpet/royalblue/twenty
+	amount = 20
+
 /obj/item/stack/tile/carpet/royalblue/fifty
 	amount = 50
 

code/game/objects/items/storage/toolbox.dm

@@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	desc = replacetext(desc, "robust", "safe")
 	desc = replacetext(desc, "heavier", "bouncier")
 	DISABLE_BITFIELD(flags_1, CONDUCT_1)
-	materials = null
+	materials = typelist("materials", null)
 	damtype = STAMINA
 	force += 3 //to compensate the higher stamina K.O. threshold compared to actual health.
 	throwforce += 3
@@ -317,8 +317,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	flags_1 = null
 	materials = null
 	damtype = STAMINA
-	force = 17
-	throwforce = 17
+	force = 15
+	throwforce = 15
 	attack_verb = list("robusted", "bounced")
 	can_rubberify = FALSE //we are already the future.
 

code/game/objects/items/twohanded.dm

@@ -25,8 +25,8 @@
  */
 /obj/item/twohanded
 	var/wielded = 0
-	var/force_unwielded = 0
-	var/force_wielded = 0
+	var/force_unwielded // default to null, the number force will be set to on unwield()
+	var/force_wielded // same as above but for wield()
 	var/wieldsound = null
 	var/unwieldsound = null
 	var/slowdown_wielded = 0
@@ -73,7 +73,7 @@
 		to_chat(user, "<span class='warning'>You don't have enough intact hands.</span>")
 		return
 	wielded = 1
-	if(force_wielded)
+	if(!isnull(force_wielded))
 		force = force_wielded
 	name = "[name] (Wielded)"
 	update_icon()
@@ -738,7 +738,7 @@
 	on = !on
 	to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
 	force = on ? force_on : initial(force)
-	throwforce = on ? force_on : initial(force)
+	throwforce = on ? force_on : force
 	icon_state = "chainsaw_[on ? "on" : "off"]"
 	var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
 	butchering.butchering_enabled = on