Merge branch 'master' into clockcultrework_v2

code/game/objects/buckling.dm

@@ -14,6 +14,9 @@
 	if(.)
 		return
 	if(can_buckle && has_buckled_mobs())
+		if(ishuman(src)) //prevent people from unbuckling fireman-carried/piggybacked people unless on disarm or harm intents
+			if(act_intent == INTENT_HELP || act_intent == INTENT_GRAB)
+				return
 		if(buckled_mobs.len > 1)
 			var/unbuckled = input(user, "Who do you wish to unbuckle?","Unbuckle Who?") as null|mob in buckled_mobs
 			if(user_unbuckle_mob(unbuckled,user))

code/game/objects/effects/blessing.dm

@@ -24,4 +24,4 @@
 
 /obj/effect/blessing/proc/block_cult_teleport(datum/source, channel, turf/origin, turf/destination)
 	if(channel == TELEPORT_CHANNEL_CULT)
-		return COMPONENT_BLOCK_TELEPORT
+		return COMPONENT_BLOCK_TELEPORT

code/game/objects/effects/decals/cleanable.dm

@@ -1,6 +1,13 @@
 /obj/effect/decal/cleanable
 	gender = PLURAL
 	layer = ABOVE_NORMAL_TURF_LAYER
+	/// Is this kind of cleanable decal persistent
+	var/persistent = FALSE
+	/// Can we stack multiple in one tile?
+	var/persistence_allow_stacking = FALSE
+	/// Are we deleted by turf changes?
+	var/wiped_by_floor_change = FALSE
+
 	var/list/random_icon_states = null
 	var/blood_state = "" //I'm sorry but cleanable/blood code is ass, and so is blood_DNA
 	var/bloodiness = 0 //0-100, amount of blood in this decal, used for making footprints and affecting the alpha of bloody footprints
@@ -29,9 +36,21 @@
 
 	addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, beauty)), 0)
 
+/**
+ * A data list is passed into this.
+ * This should return null to skip saving, or the type of data to save. Type must be /cleanable.
+ */
+/obj/effect/decal/cleanable/proc/PersistenceSave(list/data)
+	return type
+
+/**
+ * Loads from a data list.
+ */
+/obj/effect/decal/cleanable/proc/PersistenceLoad(list/data)
+	return
+
 /obj/effect/decal/cleanable/proc/replace_decal(obj/effect/decal/cleanable/C) // Returns true if we should give up in favor of the pre-existing decal
-	if(mergeable_decal)
-		qdel(C)
+	return mergeable_decal
 
 /obj/effect/decal/cleanable/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/reagent_containers/glass) || istype(W, /obj/item/reagent_containers/food/drinks))

code/game/objects/effects/decals/cleanable/aliens.dm

@@ -74,4 +74,4 @@
 
 /obj/effect/decal/cleanable/blood/xtracks/Initialize()
 	add_blood_DNA(list("UNKNOWN DNA" = "X*"))
-	. = ..()
+	. = ..()

code/game/objects/effects/decals/cleanable/gibs.dm

@@ -6,6 +6,7 @@
 	random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
 	mergeable_decal = FALSE
 	bloodiness = 0				//This isn't supposed to be bloody.
+	persistent = TRUE
 	var/body_colors = "#e3ba84"	//a default color just in case.
 	var/gibs_reagent_id = /datum/reagent/liquidgibs
 	var/gibs_bloodtype = "A+"
@@ -31,6 +32,10 @@
 	flesh.color = body_colors
 	add_overlay(flesh)
 
+/obj/effect/decal/cleanable/blood/gibs/PersistenceSave(list/data)
+	. = ..()
+	return /obj/effect/decal/cleanable/blood/gibs/old
+
 /obj/effect/decal/cleanable/blood/gibs/ex_act(severity, target)
 	return
 
@@ -159,6 +164,10 @@
 	. = ..()
 	update_icon()
 
+/obj/effect/decal/cleanable/blood/gibs/slime/PersistenceSave(list/data)
+	. = ..()
+	return type
+
 /obj/effect/decal/cleanable/blood/gibs/slime/update_icon()
 	add_atom_colour(body_colors, FIXED_COLOUR_PRIORITY)
 	cut_overlays()
@@ -198,6 +207,10 @@
 	. = ..()
 	update_icon()
 
+/obj/effect/decal/cleanable/blood/gibs/synth/PersistenceSave(list/data)
+	. = ..()
+	return type
+
 //IPCs
 /obj/effect/decal/cleanable/blood/gibs/ipc
 	desc = "They look sharp yet oozing."
@@ -209,6 +222,10 @@
 	. = ..()
 	update_icon()
 
+/obj/effect/decal/cleanable/blood/gibs/ipc/PersistenceSave(list/data)
+	. = ..()
+	return type
+
 /obj/effect/decal/cleanable/blood/gibs/ipc/update_icon()
 	add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
 	cut_overlays()

code/game/objects/effects/decals/cleanable/humans.dm

@@ -8,12 +8,18 @@
 	bloodiness = BLOOD_AMOUNT_PER_DECAL
 	color = BLOOD_COLOR_HUMAN //default so we don't have white splotches everywhere.
 	beauty = -100
+	persistent = TRUE
+	var/fixed_color = FALSE
 
 /obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
+	if(C.fixed_color)
+		qdel(C)
+		return FALSE
 	if (C.blood_DNA)
 		blood_DNA |= C.blood_DNA
+	qdel(C)
 	update_icon()
-	..()
+	return FALSE
 
 /obj/effect/decal/cleanable/blood/transfer_blood_dna()
 	..()
@@ -24,7 +30,22 @@
 	update_icon()
 
 /obj/effect/decal/cleanable/blood/update_icon()
-	color = blood_DNA_to_color()
+	. = ..()
+	if(!fixed_color)
+		add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
+
+/obj/effect/decal/cleanable/blood/PersistenceSave(list/data)
+	. = ..()
+	data["color"] = color
+
+/obj/effect/decal/cleanable/blood/PersistenceLoad(list/data)
+	. = ..()
+	if(data["color"])
+		fixed_color = TRUE
+		add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
+	name = "dried blood"
+	desc = "Looks like it's been here a while. Eew"
+	bloodiness = 0
 
 /obj/effect/decal/cleanable/blood/old
 	name = "dried blood"
@@ -38,6 +59,7 @@
 
 /obj/effect/decal/cleanable/blood/splats
 	random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
+	persistence_allow_stacking = TRUE
 
 /obj/effect/decal/cleanable/blood/splatter
 	random_icon_states = list("splatter1", "splatter2", "splatter3", "splatter4", "splatter5")
@@ -48,16 +70,43 @@
 	random_icon_states = null
 	beauty = -50
 
+/obj/effect/decal/cleanable/blood/tracks/PersistenceSave(list/data)
+	. = ..()
+	data["dir"] = dir
+
+/obj/effect/decal/cleanable/blood/tracks/PersistenceLoad(list/data)
+	. = ..()
+	if(data["dir"])
+		setDir(text2num(data["dir"]))
+
 /obj/effect/decal/cleanable/trail_holder //not a child of blood on purpose
 	name = "blood"
 	icon_state = "ltrails_1"
 	desc = "Your instincts say you shouldn't be following these."
 	random_icon_states = null
 	beauty = -50
+	persistent = TRUE
+	persistence_allow_stacking = TRUE
 	var/list/existing_dirs = list()
+	var/fixed_color = FALSE
+
+/obj/effect/decal/cleanable/trail_holder/PersistenceSave(list/data)
+	. = ..()
+	data["dir"] = dir
+	data["color"] = color
+
+/obj/effect/decal/cleanable/trail_holder/PersistenceLoad(list/data)
+	. = ..()
+	if(data["dir"])
+		setDir(text2num(data["dir"]))
+	if(data["color"])
+		fixed_color = TRUE
+		add_atom_colour(data["color"], FIXED_COLOUR_PRIORITY)
 
 /obj/effect/decal/cleanable/trail_holder/update_icon()
-	color = blood_DNA_to_color()
+	. = ..()
+	if(!fixed_color)
+		add_atom_colour(blood_DNA_to_color(), FIXED_COLOUR_PRIORITY)
 
 /obj/effect/cleanable/trail_holder/Initialize()
 	. = ..()
@@ -84,8 +133,19 @@
 	var/entered_dirs = 0
 	var/exited_dirs = 0
 	blood_state = BLOOD_STATE_BLOOD //the icon state to load images from
+	persistent = TRUE
+	persistence_allow_stacking = TRUE
 	var/list/shoe_types = list()
 
+/obj/effect/decal/cleanable/blood/footprints/PersistenceSave(list/data)
+	. = ..()
+	data["dir"] = dir
+
+/obj/effect/decal/cleanable/blood/footprints/PersistenceLoad(list/data)
+	. = ..()
+	if(data["dir"])
+		setDir(text2num(data["dir"]))
+
 /obj/effect/decal/cleanable/blood/footprints/Crossed(atom/movable/O)
 	if(ishuman(O))
 		var/mob/living/carbon/human/H = O
@@ -143,7 +203,7 @@
 		return
 	if(color != C.color)
 		return
-	..()
+	return ..()
 
 /obj/effect/decal/cleanable/blood/footprints/can_bloodcrawl_in()
 	if((blood_state != BLOOD_STATE_OIL) && (blood_state != BLOOD_STATE_NOT_BLOODY))

code/game/objects/effects/decals/cleanable/misc.dm

@@ -12,6 +12,8 @@
 	icon_state = "ash"
 	mergeable_decal = FALSE
 	beauty = -50
+	persistent = TRUE
+	persistence_allow_stacking = TRUE
 
 /obj/effect/decal/cleanable/ash/Initialize()
 	. = ..()
@@ -38,6 +40,8 @@
 	icon = 'icons/obj/shards.dmi'
 	icon_state = "tiny"
 	beauty = -100
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/glass/Initialize()
 	. = ..()
@@ -53,10 +57,33 @@
 	name = "dirt"
 	desc = "Someone should clean that up."
 	icon_state = "dirt"
+	alpha = 127
 	canSmoothWith = list(/obj/effect/decal/cleanable/dirt, /turf/closed/wall, /obj/structure/falsewall)
 	smooth = SMOOTH_FALSE
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 	beauty = -75
+	mergeable_decal = TRUE
+	persistent = TRUE
+	wiped_by_floor_change = TRUE
+
+/obj/effect/decal/cleanable/dirt/Initialize(mapload)
+	. = ..()
+	alpha = CONFIG_GET(number/dirt_alpha_starting)
+
+/obj/effect/decal/cleanable/dirt/proc/dirty(strength = 1)
+	if(alpha < 255)
+		alpha += strength
+		if(alpha > 255)
+			alpha = 255
+
+/obj/effect/decal/cleanable/dirt/PersistenceSave(list/data)
+	. = ..()
+	data["alpha"] = alpha
+
+/obj/effect/decal/cleanable/dirt/PersistenceLoad(list/data)
+	. = ..()
+	if(data["alpha"])
+		alpha = text2num(data["alpha"])
 
 /obj/effect/decal/cleanable/dirt/Initialize()
 	. = ..()
@@ -94,6 +121,8 @@
 	light_color = LIGHT_COLOR_GREEN
 	icon_state = "greenglow"
 	beauty = -300
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/greenglow/Initialize(mapload)
 	. = ..()
@@ -122,6 +151,8 @@
 	icon_state = "molten"
 	mergeable_decal = FALSE
 	beauty = -150
+	persistent = TRUE
+	persistence_allow_stacking = TRUE
 
 /obj/effect/decal/cleanable/molten_object/large
 	name = "big gooey grey mass"
@@ -136,6 +167,7 @@
 	icon_state = "vomit_1"
 	random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
 	beauty = -150
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/vomit/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	if(ishuman(user))
@@ -151,6 +183,10 @@
 			reagents.trans_to(H, reagents.total_volume)
 			qdel(src)
 
+/obj/effect/decal/cleanable/vomit/PersistenceSave(list/data)
+	. = ..()
+	return /obj/effect/decal/cleanable/vomit/old
+
 /obj/effect/decal/cleanable/vomit/old
 	name = "crusty dried vomit"
 	desc = "You try not to look at the chunks, and fail."
@@ -166,12 +202,16 @@
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
 	beauty = -100
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/plant_smudge
 	name = "plant smudge"
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_plant")
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/egg_smudge
 	name = "smashed egg"
@@ -179,6 +219,8 @@
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/pie_smudge //honk
 	name = "smashed pie"
@@ -186,6 +228,8 @@
 	gender = NEUTER
 	icon = 'icons/effects/tomatodecal.dmi'
 	random_icon_states = list("smashed_pie")
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/chem_pile
 	name = "chemical pile"
@@ -193,6 +237,8 @@
 	gender = NEUTER
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "ash"
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/shreds
 	name = "shreds"
@@ -200,6 +246,8 @@
 	icon_state = "shreds"
 	gender = PLURAL
 	mergeable_decal = FALSE
+	mergeable_decal = TRUE
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/shreds/ex_act(severity, target)
 	if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion.
@@ -222,6 +270,8 @@
 	desc = "The herpes of arts and crafts."
 	icon = 'icons/effects/atmospherics.dmi'
 	gender = NEUTER
+	mergeable_decal = TRUE
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/glitter/pink
 	name = "pink glitter"
@@ -247,3 +297,5 @@
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "xfloor1"
 	random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
+	mergeable_decal = TRUE
+	persistent = TRUE

code/game/objects/effects/decals/cleanable/robots.dm

@@ -11,6 +11,7 @@
 	bloodiness = BLOOD_AMOUNT_PER_DECAL
 	mergeable_decal = FALSE
 	beauty = -50
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/robot_debris/Initialize(mapload, list/datum/disease/diseases)
 	. = ..()
@@ -52,6 +53,7 @@
 	blood_state = BLOOD_STATE_OIL
 	bloodiness = BLOOD_AMOUNT_PER_DECAL
 	beauty = -100
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/oil/Initialize()
 	. = ..()
@@ -61,8 +63,10 @@
 /obj/effect/decal/cleanable/oil/streak
 	random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5")
 	beauty = -50
+	persistent = TRUE
 
 /obj/effect/decal/cleanable/oil/slippery
+	persistent = FALSE
 
 /obj/effect/decal/cleanable/oil/slippery/Initialize()
 	AddComponent(/datum/component/slippery, 80, (NO_SLIP_WHEN_WALKING | SLIDE))

code/game/objects/effects/decals/crayon.dm

@@ -5,6 +5,8 @@
 	icon_state = "rune1"
 	plane = ABOVE_WALL_PLANE //makes the graffiti visible over a wall.
 	gender = NEUTER
+	persistent = TRUE
+	persistence_allow_stacking = TRUE
 	mergeable_decal = FALSE
 	var/do_icon_rotate = TRUE
 	var/rotation = 0
@@ -29,3 +31,35 @@
 	if(main)
 		paint_colour = main
 	add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
+
+/obj/effect/decal/cleanable/crayon/PersistenceSave(list/data)
+	. = ..()
+	if(icon != initial(icon))	// no support for alticons yet, awful system anyways
+		return null
+	data["icon_state"] = icon_state
+	data["paint_color"] = paint_colour
+	if(do_icon_rotate)
+		data["rotation"] = rotation
+	data["name"] = name
+	if(pixel_x != initial(pixel_x))
+		data["pixel_x"] = pixel_x
+	if(pixel_y != initial(pixel_y))
+		data["pixel_y"] = pixel_y
+
+/obj/effect/decal/cleanable/crayon/PersistenceLoad(list/data)
+	. = ..()
+	if(data["name"])
+		name = data["name"]
+	if(do_icon_rotate && data["rotation"])
+		var/matrix/M = matrix()
+		M.Turn(text2num(data["rotation"]))
+		transform = M
+	if(data["paint_color"])
+		paint_colour = data["paint_color"]
+		add_atom_colour(paint_colour, FIXED_COLOUR_PRIORITY)
+	if(data["icon_state"])
+		icon_state = data["icon_state"]
+	if(data["pixel_x"])
+		pixel_x = data["pixel_x"]
+	if(data["pixel_y"])
+		pixel_y = data["pixel_y"]

code/game/objects/effects/decals/turfdecal/tilecoloring.dm

@@ -235,4 +235,4 @@
 	icon_state = "trimline_corner_fill"
 
 /obj/effect/turf_decal/trimline/neutral/filled/end
-	icon_state = "trimline_end_fill"
+	icon_state = "trimline_end_fill"

code/game/objects/effects/mines.dm

@@ -16,7 +16,7 @@
 		return
 	. = ..()
 
-	if(AM.movement_type & FLYING)
+	if(AM.movement_type & FLYING || iseffect(AM))
 		return
 
 	triggermine(AM)

code/game/objects/effects/spawners/traps.dm

@@ -7,4 +7,4 @@
 	..()
 	var/new_type = pick(subtypesof(/obj/structure/trap) - typesof(/obj/structure/trap/ctf))
 	new new_type(get_turf(src))
-	return INITIALIZE_HINT_QDEL
+	return INITIALIZE_HINT_QDEL

code/game/objects/items/chromosome.dm

@@ -89,4 +89,4 @@
 
 /obj/item/chromosome/reinforcer/apply(datum/mutation/human/HM)
 	HM.mutadone_proof = TRUE
-	..()
+	..()

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

@@ -297,6 +297,10 @@
 	name = "Mining Shuttle (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/mining
 
+/obj/item/circuitboard/computer/mining_shuttle/common
+	name = "Lavaland Shuttle (Computer Board)"
+	build_path = /obj/machinery/computer/shuttle/mining/common
+
 /obj/item/circuitboard/computer/snow_taxi
 	name = "Snow Taxi (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/snow_taxi

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

@@ -253,6 +253,12 @@
 		/obj/item/stack/sheet/glass = 1)
 	def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
 
+/obj/item/circuitboard/machine/colormate
+	name = "Colormate (Machine Board)"
+	build_path = /obj/machinery/gear_painter
+	req_components = list()
+	def_components = list()
+
 /obj/item/circuitboard/machine/vendor
 	name = "Custom Vendor (Machine Board)"
 	desc = "You can turn the \"brand selection\" dial using a screwdriver."

code/game/objects/items/control_wand.dm

@@ -100,4 +100,4 @@
 
 #undef WAND_OPEN
 #undef WAND_BOLT
-#undef WAND_EMERGENCY
+#undef WAND_EMERGENCY

code/game/objects/items/credit_holochip.dm

@@ -80,6 +80,17 @@
 		to_chat(user, "<span class='notice'>You insert the credits into [src].</span>")
 		update_icon()
 		qdel(H)
+	if(istype(I, /obj/item/card/id))
+		var/obj/item/card/id/ID = I
+		if(!ID.registered_account)
+			to_chat(user, "<span class='warning'>[ID] doesn't have a linked account to deposit into!</span>")
+			return
+		for(var/obj/item/holochip/money in src.loc.contents)
+			ID.attackby(money, user)
+		for(var/obj/item/stack/spacecash/money in src.loc.contents)
+			ID.attackby(money, user)
+		for(var/obj/item/coin/money in src.loc.contents)
+			ID.attackby(money, user)
 
 /obj/item/holochip/AltClick(mob/user)
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))

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

@@ -91,4 +91,4 @@
 	return ..()
 
 /obj/effect/abstract/sync_holder/AllowDrop()
-	return TRUE //no dropping spaghetti out of your spacetime pocket
+	return TRUE //no dropping spaghetti out of your spacetime pocket

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

@@ -29,4 +29,4 @@
 			if(uses == 0)
 				icon_state = "glue_used"
 				name = "empty bottle of super glue"
-			return
+			return

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

@@ -62,4 +62,4 @@
 	name = "clown's megaphone"
 	desc = "Something that should not exist."
 	icon_state = "megaphone-clown"
-	voicespan = list(SPAN_CLOWN)
+	voicespan = list(SPAN_CLOWN)

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

@@ -21,13 +21,13 @@
 	force = 5
 	w_class = WEIGHT_CLASS_SMALL
 	tool_behaviour = TOOL_MULTITOOL
+	item_flags = SURGICAL_TOOL
 	throwforce = 0
 	throw_range = 7
 	throw_speed = 3
 	custom_materials = list(/datum/material/iron=50, /datum/material/glass=20)
 	var/obj/machinery/buffer // simple machine buffer for device linkage
 	toolspeed = 1
-	tool_behaviour = TOOL_MULTITOOL
 	usesound = 'sound/weapons/empty.ogg'
 	var/datum/integrated_io/selected_io = null  //functional for integrated circuits.
 	var/mode = 0

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

@@ -18,6 +18,7 @@
 /obj/item/paicard/Initialize()
 	SSpai.pai_card_list += src
 	add_overlay("pai-off")
+	AddElement(/datum/element/bed_tuckable, 6, -5, 90)
 	return ..()
 
 /obj/item/paicard/Destroy()

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

@@ -18,8 +18,8 @@
 	else
 		if(zero_amount())
 			return
-		chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) in list("airlock","firelock","fire alarm","air alarm","APC")
-		if(zero_amount())
+		chosen_circuit = input("What type of circuit would you like to remove?", "Choose a Circuit Type", chosen_circuit) as null|anything in list("airlock","firelock","fire alarm","air alarm","APC")
+		if(zero_amount() || !chosen_circuit || !in_range(src,user))
 			return
 		switch(chosen_circuit)
 			if("airlock")

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

@@ -16,9 +16,9 @@ GLOBAL_LIST_EMPTY(power_sinks)
 	throw_speed = 1
 	throw_range = 2
 	custom_materials = list(/datum/material/iron=750)
-	var/drain_rate = 1600000	// amount of power to drain per tick
+	var/drain_rate = 2000000	// amount of power to drain per tick. Currently 2MJ.
 	var/power_drained = 0 		// has drained this much power
-	var/max_power = 1e10		// maximum power that can be drained before exploding
+	var/max_power = 2000000000		// maximum power that can be drained before exploding. Currently 2GJ. About 17 minutes to explode at the max rate.
 	var/mode = 0		// 0 = off, 1=clamped (off), 2=operating
 	var/admins_warned = FALSE // stop spam, only warn the admins once that we are about to boom
 
@@ -155,5 +155,5 @@ GLOBAL_LIST_EMPTY(power_sinks)
 
 	if(power_drained >= max_power)
 		STOP_PROCESSING(SSobj, src)
-		explosion(src.loc, 4,8,16,32)
+		explosion(src.loc, 3,7,14,28)
 		qdel(src)

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

@@ -155,7 +155,7 @@ GENETICS SCANNER
 	if(oxy_loss > 10)
 		msg += "\n\t<span class='info'><span class='alert'>[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.</span>"
 	if(tox_loss > 10)
-		msg += "\n\t<span class='alert'>[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.</span>"
+		msg += "\n\t<span class='alert'>[tox_loss > 50 ? "Severe" : "Minor"] amount of [HAS_TRAIT(M, TRAIT_ROBOTIC_ORGANISM) ? "system corruption" : "toxin damage"] detected.</span>"
 	if(M.getStaminaLoss())
 		msg += "\n\t<span class='alert'>Subject appears to be suffering from fatigue.</span>"
 		if(advanced)
@@ -182,7 +182,7 @@ GENETICS SCANNER
 							<td style='width: 90px;'><font color='#0000CC'>Damage:</font></td>\
 							<td style='width: 55px;'><font color='red'><b>Brute</b></font></td>\
 							<td style='width: 45px;'><font color='orange'><b>Burn</b></font></td>\
-							<td style='width: 45px;'><font color='green'><b>Toxin</b></font></td>\
+							<td style='width: 45px;'><font color='green'><b>[HAS_TRAIT(C, TRAIT_ROBOTIC_ORGANISM) ? "Corruption" :"Toxin"]</b></font></td>\
 							<td style='width: 90px;'><font color='purple'><b>Suffocation</b></font></td></tr>\
 							<tr><td><font color='#0000CC'>Overall:</font></td>\
 							<td><font color='red'>[brute_loss]</font></td>\
@@ -628,9 +628,9 @@ GENETICS SCANNER
 	var/turf/location = get_turf(user)
 	if(!istype(location))
 		return
-	
+
 	scan_turf(user, location)
-	
+
 /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens
 	. = ..()
 

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

@@ -264,6 +264,30 @@ effective or pretty fucking useless.
 		GLOB.active_jammers -= src
 	update_icon()
 
+/*portable turret*/
+/obj/item/storage/toolbox/emergency/turret
+	desc = "You feel a strange urge to hit this with a wrench."
+
+/obj/item/storage/toolbox/emergency/turret/PopulateContents()
+	new /obj/item/screwdriver(src)
+	new /obj/item/wrench(src)
+	new /obj/item/weldingtool(src)
+	new /obj/item/crowbar(src)
+	new /obj/item/analyzer(src)
+	new /obj/item/wirecutters(src)
+
+/obj/item/storage/toolbox/emergency/turret/attackby(obj/item/I, mob/living/user, params)
+    if(I.tool_behaviour == TOOL_WRENCH && user.a_intent == INTENT_HARM)
+        user.visible_message("<span class='danger'>[user] bashes [src] with [I]!</span>", \
+            "<span class='danger'>You bash [src] with [I]!</span>", null, COMBAT_MESSAGE_RANGE)
+        playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1)
+        var/obj/machinery/porta_turret/syndicate/pod/toolbox/turret = new(get_turf(loc))
+        turret.faction = list("[REF(user)]")
+        qdel(src)
+        return
+
+    ..()
+
 /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."

code/game/objects/items/gift.dm

@@ -8,13 +8,14 @@
  * Gifts
  */
 
-/var/static/blacklisted_items = typecacheof(list(
+GLOBAL_LIST_INIT(gift_item_blacklist, typecacheof(list(
 	/obj/effect,
 	/obj/belly,
 	/obj/mafia_game_board,
 	/obj/docking_port,
 	/obj/shapeshift_holder,
-	/obj/screen))
+	/obj/screen
+	)))
 
 GLOBAL_LIST_EMPTY(possible_gifts)
 
@@ -103,7 +104,7 @@ GLOBAL_LIST_EMPTY(possible_gifts)
 		var/list/gift_types_list = subtypesof(/obj/item)
 		for(var/V in gift_types_list)
 			var/obj/item/I = V
-			if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, blacklisted_items)))
+			if((!initial(I.icon_state)) || (!initial(I.item_state)) || (initial(I.item_flags) & ABSTRACT) || (is_type_in_typecache(I, GLOB.gift_item_blacklist)))
 				gift_types_list -= V
 		GLOB.possible_gifts = gift_types_list
 	var/gift_type = pick(GLOB.possible_gifts)

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

@@ -19,6 +19,7 @@
 	var/boom_sizes = list(0, 0, 3)
 	var/can_attach_mob = FALSE
 	var/full_damage_on_mobs = FALSE
+	var/can_gib_mobs = FALSE
 
 /obj/item/grenade/plastic/Initialize()
 	. = ..()
@@ -72,7 +73,7 @@
 			explosion(get_step(T, aim_dir), boom_sizes[1], boom_sizes[2], boom_sizes[3])
 		else
 			explosion(location, boom_sizes[1], boom_sizes[2], boom_sizes[3])
-	if(ismob(target))
+	if(ismob(target) && can_gib_mobs)
 		var/mob/M = target
 		M.gib()
 	qdel(src)

code/game/objects/items/handcuffs.dm

@@ -377,10 +377,3 @@
 	hitsound = 'sound/weapons/taserhit.ogg'
 	w_class = WEIGHT_CLASS_SMALL
 	breakouttime = 60
-
-/obj/item/restraints/legcuffs/bola/energy/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
-	if(iscarbon(hit_atom))
-		var/obj/item/restraints/legcuffs/beartrap/B = new /obj/item/restraints/legcuffs/beartrap/energy/cyborg(get_turf(hit_atom))
-		B.Crossed(hit_atom)
-		qdel(src)
-	..()

code/game/objects/items/implants/implant_chem.dm

@@ -96,4 +96,4 @@
 	if(implant?.imp_in)
 		qdel(implant)
 	else
-		return ..()
+		return ..()

code/game/objects/items/implants/implant_radio.dm

@@ -66,4 +66,4 @@
 
 /obj/item/implanter/radio/syndicate
 	name = "implanter (internal syndicate radio)"
-	imp_type = /obj/item/implant/radio/syndicate
+	imp_type = /obj/item/implant/radio/syndicate

code/game/objects/items/implants/implant_track.dm

@@ -73,4 +73,4 @@
 /obj/item/implantcase/track
 	name = "implant case - 'Tracking'"
 	desc = "A glass case containing a tracking implant."
-	imp_type = /obj/item/implant/tracking
+	imp_type = /obj/item/implant/tracking

code/game/objects/items/implants/implanter.dm

@@ -77,4 +77,4 @@
 
 /obj/item/implanter/hijack
 	name = "implanter (hijack)"
-	imp_type = /obj/item/implant/hijack
+	imp_type = /obj/item/implant/hijack

code/game/objects/items/kitchen.dm

@@ -175,7 +175,7 @@
 
 /obj/item/kitchen/knife/combat/survival/knuckledagger/Initialize()
 	. = ..()
-	AddComponent(/datum/component/butchering, 50, 120, 5) // it's good for butchering stuff
+	AddComponent(/datum/component/butchering, 30, 130, 20) // it's good for butchering stuff
 
 /obj/item/kitchen/knife/combat/survival/knuckledagger/ui_action_click(mob/user, actiontype)
 	light_on = !light_on
@@ -189,6 +189,11 @@
 	else
 		set_light(0)
 
+/obj/item/kitchen/knife/combat/survival/knuckledagger/update_overlays()
+	. = ..()
+	if(light_on)
+		. += "[icon_state]_lit"
+
 /obj/item/kitchen/knife/combat/bone
 	name = "bone dagger"
 	item_state = "bone_dagger"

code/game/objects/items/miscellaneous.dm

@@ -1,17 +1,3 @@
-/obj/item/caution
-	desc = "Caution! Wet Floor!"
-	name = "wet floor sign"
-	icon = 'icons/obj/janitor.dmi'
-	icon_state = "caution"
-	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
-	force = 1
-	throwforce = 3
-	throw_speed = 2
-	throw_range = 5
-	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("warned", "cautioned", "smashed")
-
 /obj/item/choice_beacon
 	name = "choice beacon"
 	desc = "Hey, why are you viewing this?!! Please let Centcom know about this odd occurance."
@@ -52,7 +38,8 @@
 
 /obj/item/choice_beacon/proc/spawn_option(atom/choice,mob/living/M)
 	var/obj/new_item = create_choice_atom(choice, M)
-	var/obj/structure/closet/supplypod/bluespacepod/pod = new()
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+	var/obj/structure/closet/supplypod/bluespacepod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets just have it in the pod storage zone for a really short time because we don't want it in nullspace
 	pod.explosionSize = list(0,0,0,0)
 	new_item.forceMove(pod)
 	var/msg = "<span class='danger'>After making your selection, you notice a strange target on the ground. It might be best to step back!</span>"

code/game/objects/items/mop.dm

@@ -24,13 +24,17 @@
 	create_reagents(mopcap, NONE, NO_REAGENTS_VALUE)
 
 
-/obj/item/mop/proc/clean(turf/A)
+/obj/item/mop/proc/clean(turf/A, mob/user)
 	if(reagents.has_reagent(/datum/reagent/water, 1) || reagents.has_reagent(/datum/reagent/water/holywater, 1) || reagents.has_reagent(/datum/reagent/consumable/ethanol/vodka, 1) || reagents.has_reagent(/datum/reagent/space_cleaner, 1))
 		SEND_SIGNAL(A, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
 		A.clean_blood()
+		var/cleaned_something = FALSE
 		for(var/obj/effect/O in A)
 			if(is_cleanable(O))
+				cleaned_something = TRUE
 				qdel(O)
+		if(cleaned_something && user && user.client)
+			user.client.increment_progress("janitor", 1)
 	reagents.reaction(A, TOUCH, 10)	//Needed for proper floor wetting.
 	reagents.remove_any(1)			//reaction() doesn't use up the reagents
 
@@ -59,7 +63,7 @@
 		if(!L.UseStaminaBuffer(stamusage, warn = TRUE))
 			return
 		user.visible_message("[user] cleans \the [T] with [src].", "<span class='notice'>You clean \the [T] with [src].</span>")
-		clean(T)
+		clean(T, user)
 		user.DelayNextAction(CLICK_CD_MELEE)
 		user.do_attack_animation(T, used_item = src)
 		playsound(T, "slosh", 50, 1)

code/game/objects/items/plushes.dm

@@ -33,6 +33,8 @@
 	//--end of love :'(--
 
 	var/snowflake_id					//if we set from a config snowflake plushie.
+	/// wrapper, do not use, read only
+	var/__ADMIN_SET_TO_ID
 	var/can_random_spawn = TRUE			//if this is FALSE, don't spawn this for random plushies.
 
 /obj/item/toy/plush/random_snowflake/Initialize(mapload, set_snowflake_id)
@@ -46,6 +48,7 @@
 /obj/item/toy/plush/Initialize(mapload, set_snowflake_id)
 	. = ..()
 	AddComponent(/datum/component/squeak, squeak_override)
+	AddElement(/datum/element/bed_tuckable, 6, -5, 90)
 
 	//have we decided if Pinocchio goes in the blue or pink aisle yet?
 	if(gender == NEUTER)
@@ -112,10 +115,21 @@
 
 	return ..()
 
+/obj/item/toy/plush/vv_get_var(var_name)
+	if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID))
+		return debug_variable("__ADMIN: SET SNOWFLAKE ID", snowflake_id, 0, src)
+	return ..()
+
+/obj/item/toy/plush/vv_edit_var(var_name, var_value)
+	if(var_name == NAMEOF(src, __ADMIN_SET_TO_ID))
+		return set_snowflake_from_config(var_value)
+	return ..()
+
 /obj/item/toy/plush/proc/set_snowflake_from_config(id)
 	var/list/configlist = CONFIG_GET(keyed_list/snowflake_plushies)
 	var/list/jsonlist = configlist[id]
-	ASSERT(jsonlist)
+	if(!jsonlist)
+		return FALSE
 	jsonlist = json_decode(jsonlist)
 	if(jsonlist["inherit_from"])
 		var/path = text2path(jsonlist["inherit_from"])
@@ -151,6 +165,7 @@
 		var/datum/component/squeak/S = GetComponent(/datum/component/squeak)
 		S?.override_squeak_sounds = squeak_override
 	snowflake_id = id
+	return TRUE
 
 /obj/item/toy/plush/handle_atom_del(atom/A)
 	if(A == grenade)

code/game/objects/items/puzzle_pieces.dm

@@ -137,8 +137,7 @@
 		AM.anchored = TRUE
 		flick("laserbox_burn", AM)
 		trigger()
-		sleep(15)
-		qdel(AM)
+		QDEL_IN(src, 15)
 
 // snowflake code until undertile elements
 /obj/item/pressure_plate/hologrid/hide()

code/game/objects/items/religion.dm

@@ -321,4 +321,4 @@
 	desc = "A rusted claymore, once at the heart of a powerful scottish clan struck down and oppressed by tyrants, it has been passed down the ages as a symbol of defiance."
 	force = 15
 	block_chance = 30
-	armour_penetration = 5
+	armour_penetration = 5

code/game/objects/items/robot/robot_parts.dm

@@ -326,6 +326,9 @@
 	else if(istype(W, /obj/item/borg/upgrade/ai))
 		var/obj/item/borg/upgrade/ai/M = W
 		if(check_completion())
+			if(!chest.cell)
+				to_chat(user, "<span class='warning'>The endoskeleton still needs a power cell!</span>")
+				return
 			if(!isturf(loc))
 				to_chat(user, "<span class='warning'>You cannot install[M], the frame has to be standing on the ground to be perfectly precise!</span>")
 				return
@@ -346,7 +349,6 @@
 				O.lawupdate = FALSE
 				O.make_laws()
 
-
 			O.cell = chest.cell
 			chest.cell.forceMove(O)
 			chest.cell = null
@@ -392,6 +394,7 @@
 			created_name = new_name
 		else
 			created_name = ""
+		log_game("[key_name(usr)] renamed [src] ([REF(src)]) to [created_name].")
 
 	else if(href_list["Master"])
 		forced_ai = select_active_ai(usr)

code/game/objects/items/robot/robot_upgrades.dm

@@ -80,6 +80,7 @@ as performing this in action() will cause the upgrade to end up in the borg inst
 	desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
 	icon_state = "cyborg_upgrade2"
 	require_module = 1
+	var/obj/effect/proc_holder/silicon/cyborg/vtecControl/VC
 
 /obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
@@ -91,12 +92,14 @@ as performing this in action() will cause the upgrade to end up in the borg inst
 
 		//R.speed = -2 // Gotta go fast.
         //Citadel change - makes vtecs give an ability rather than reducing the borg's speed instantly
-		R.AddAbility(new/obj/effect/proc_holder/silicon/cyborg/vtecControl)
+		VC = new /obj/effect/proc_holder/silicon/cyborg/vtecControl
+		R.AddAbility(VC)
 		R.cansprint = 0
 
 /obj/item/borg/upgrade/vtec/deactivate(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if (.)
+		R.RemoveAbility(VC)
 		R.speed = initial(R.speed)
 		R.cansprint = 1
 

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

@@ -33,6 +33,20 @@
 	. = ..()
 	update_desc()
 
+/obj/item/stack/spacecash/attackby(obj/item/W, mob/user, params)
+	. = ..()
+	if(istype(W, /obj/item/card/id))
+		var/obj/item/card/id/ID = W
+		if(!ID.registered_account)
+			to_chat(user, "<span class='warning'>[ID] doesn't have a linked account to deposit into!</span>")
+			return
+		for(var/obj/item/holochip/money in src.loc.contents)
+			ID.attackby(money, user)
+		for(var/obj/item/stack/spacecash/money in src.loc.contents)
+			ID.attackby(money, user)
+		for(var/obj/item/coin/money in src.loc.contents)
+			ID.attackby(money, user)
+
 /obj/item/stack/spacecash/c1
 	icon_state = "spacecash"
 	singular_name = "one credit bill"

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

@@ -173,11 +173,11 @@
 					 "<span class='italics'>You hear cutting.</span>")
 		use(2)
 	else if(I.is_drainable() && I.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine))
-		if(!I.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine, 10))
+		if(!I.reagents.has_reagent(/datum/reagent/space_cleaner/sterilizine, 5))
 			to_chat(user, "<span class='warning'>There's not enough sterilizine in [I] to sterilize [src]!</span>")
 			return
-		user.visible_message("<span class='notice'>[user] pours the contents of [I] onto [src], sterilizing it.</span>", "<span class='notice'>You pour the contents of [I] onto [src], sterilizing it.</span>")
-		I.reagents.remove_reagent(/datum/reagent/space_cleaner/sterilizine, 10)
+		user.visible_message("<span class='notice'>[user] sterilizes [src] with the contents of [I].</span>", "<span class='notice'>You pour the contents of [I] onto [src], sterilizing it.</span>")
+		I.reagents.remove_reagent(/datum/reagent/space_cleaner/sterilizine, 5)
 		new /obj/item/stack/medical/gauze/adv/one(user.drop_location())
 		use(1)
 	else
@@ -187,6 +187,9 @@
 	user.visible_message("<span class='suicide'>[user] begins tightening \the [src] around [user.p_their()] neck! It looks like [user.p_they()] forgot how to use medical supplies!</span>")
 	return OXYLOSS
 
+/obj/item/stack/medical/gauze/one
+	amount = 1
+
 /obj/item/stack/medical/gauze/improvised
 	name = "improvised gauze"
 	singular_name = "improvised gauze"
@@ -204,8 +207,9 @@
 	heal_brute = 6
 	self_delay = 45
 	other_delay = 15
-	absorption_rate = 0.4
-	absorption_capacity = 6
+	absorption_rate = 0.5
+	absorption_capacity = 12
+	splint_factor = 0.15
 
 /obj/item/stack/medical/gauze/adv/one
 	amount = 1

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

@@ -388,4 +388,4 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 
 /obj/item/shard/plasma/alien
 	name = "alien shard"
-	desc = "A nasty looking shard of advanced alloy glass."
+	desc = "A nasty looking shard of advanced alloy glass."

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

@@ -253,7 +253,6 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
 	new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
 	new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
-	new/datum/stack_recipe("training bokken", /obj/item/melee/bokken, 10, time = 15),\
 	null, \
 	new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
@@ -388,6 +387,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("mining satchel", /obj/item/storage/bag/ore, 4), \
 	new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \
 	new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \
+	new/datum/stack_recipe("material bag", /obj/item/storage/bag/material, 4), \
+	new/datum/stack_recipe("construction bag", /obj/item/storage/bag/construction, 4), \
 	null, \
 	new/datum/stack_recipe("string", /obj/item/weaponcrafting/string, 1, time = 10), \
 	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
@@ -793,7 +794,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 10, time = 10, one_per_turf = 1, on_floor = 1), \
 	new /datum/stack_recipe("duct", /obj/item/stack/ducts,1), \
 	new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/glass_base/laserpointer_shell, 30), \
-	new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
+	new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
 
 /obj/item/stack/sheet/plastic
 	name = "plastic"

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

@@ -457,6 +457,9 @@
 	STR.display_numerical_stacking = FALSE
 	STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
 
+/*
+Bag for holding materials
+*/
 /obj/item/storage/bag/material
 	name = "material pouch"
 	desc = "A pouch for sheets and RCD ammunition that manages to hang where you would normally put things in your pocket."
@@ -474,3 +477,24 @@
 	STR.max_items = 2
 	STR.display_numerical_stacking = TRUE
 	STR.can_hold = typecacheof(list(/obj/item/rcd_ammo, /obj/item/stack/sheet))
+
+/*
+ *  Construction bag (for engineering, holds stock parts and electronics)
+ */
+
+/obj/item/storage/bag/construction
+	name = "construction bag"
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "construction_bag"
+	desc = "A bag for storing small construction components."
+	w_class = WEIGHT_CLASS_TINY
+	resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/construction/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_combined_w_class = 100
+	STR.max_items = 50
+	STR.max_w_class = WEIGHT_CLASS_SMALL
+	STR.insert_preposition = "in"
+	STR.can_hold = typecacheof(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics,/obj/item/wallframe/camera))

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

@@ -802,7 +802,8 @@
 		. += "<span class='notice'>Alt-click it to quickly draw the blade.</span>"
 
 /obj/item/storage/belt/sabre/PopulateContents()
-	new starting_sword(src)
+	if(starting_sword)
+		new starting_sword(src)
 
 /obj/item/storage/belt/sabre/rapier
 	name = "rapier sheath"
@@ -853,8 +854,8 @@
 /obj/item/storage/belt/sabre/twin
 	name = "twin sheath"
 	desc = "Two sheaths. One is capable of holding a katana (or bokken) and the other a wakizashi. You could put two wakizashis in if you really wanted to. Now you can really roleplay as a samurai."
-	icon_state = "twinsheath"
-	item_state = "quiver" //this'll do.
+	icon_state = "2sheath"
+	item_state = "katana" //this'll do.
 	w_class = WEIGHT_CLASS_BULKY
 	fitting_swords = list(/obj/item/melee/smith/wakizashi, /obj/item/melee/smith/twohand/katana, /obj/item/melee/bokken)
 	starting_sword = null
@@ -864,6 +865,43 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_items = 2
 	STR.max_w_class = WEIGHT_CLASS_BULKY + WEIGHT_CLASS_NORMAL //katana and waki.
+	STR.max_combined_w_class = 7
+
+/obj/item/melee/smith/twohand/katana/on_exit_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/twin/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/unsheath.ogg', 25, 1)
+	. = ..()
+
+/obj/item/melee/smith/twohand/katana/on_enter_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/twin/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/sheath.ogg', 25, 1)
+	. = ..()
+
+/obj/item/melee/smith/wakizashi/on_exit_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/twin/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/unsheath.ogg', 25, 1)
+	. = ..()
+
+/obj/item/melee/smith/wakizashi/on_enter_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/twin/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/sheath.ogg', 25, 1)
+	. = ..()
+
+/obj/item/melee/bokken/on_exit_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/twin/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/unsheath.ogg', 25, 1)
+	. = ..()
+
+/obj/item/melee/bokken/on_enter_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/twin/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/sheath.ogg', 25, 1)
+	. = ..()
 
 /obj/item/storage/belt/plant
 	name = "botanical belt"

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

@@ -17,9 +17,6 @@
 
 /obj/item/storage/fancy
 	icon = 'icons/obj/food/containers.dmi'
-	icon_state = "donutbox6"
-	name = "donut box"
-	desc = "Mmm. Donuts."
 	resistance_flags = FLAMMABLE
 	var/icon_type = "donut"
 	var/spawn_type = null
@@ -59,18 +56,22 @@
 	fancy_open = TRUE
 	update_icon()
 
+#define DONUT_INBOX_SPRITE_WIDTH 3
+
 /*
  * Donut Box
  */
 
 /obj/item/storage/fancy/donut_box
-	icon = 'icons/obj/food/containers.dmi'
-	icon_state = "donutbox6"
-	icon_type = "donut"
 	name = "donut box"
+	desc = "Mmm. Donuts."
+	icon = 'icons/obj/food/donut.dmi'
+	icon_state = "donutbox_inner"
+	icon_type = "donut"
 	spawn_type = /obj/item/reagent_containers/food/snacks/donut
 	fancy_open = TRUE
 	custom_price = PRICE_NORMAL
+	appearance_flags = KEEP_TOGETHER
 
 /obj/item/storage/fancy/donut_box/ComponentInitialize()
 	. = ..()
@@ -78,6 +79,36 @@
 	STR.max_items = 6
 	STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donut))
 
+/obj/item/storage/fancy/donut_box/PopulateContents()
+	. = ..()
+	update_icon()
+
+/obj/item/storage/fancy/donut_box/update_icon_state()
+	if(fancy_open)
+		icon_state = "donutbox_inner"
+	else
+		icon_state = "donutbox"
+
+/obj/item/storage/fancy/donut_box/update_overlays()
+	. = ..()
+
+	if (!fancy_open)
+		return
+
+	var/donuts = 0
+
+	for (var/_donut in contents)
+		var/obj/item/reagent_containers/food/snacks/donut/donut = _donut
+		if (!istype(donut))
+			continue
+
+		. += image(icon = initial(icon), icon_state = donut.in_box_sprite(), pixel_x = donuts * DONUT_INBOX_SPRITE_WIDTH)
+		donuts += 1
+
+	. += image(icon = initial(icon), icon_state = "donutbox_top")
+
+#undef DONUT_INBOX_SPRITE_WIDTH
+
 /*
  * Egg Box
  */

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

@@ -103,6 +103,39 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 /obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents()
 	return
 
+/obj/item/storage/toolbox/mechanical/old/clean // the assistant traitor toolbox, damage scales with TC inside
+	name = "toolbox"
+	desc = "An old, blue toolbox. It menaces with a sickening miasma of robust energies. You sure about this, Brain?"
+	icon_state = "toolbox_blue_clean"
+	force = 19
+	throwforce = 22
+	wound_bonus = 0
+	bare_wound_bonus = 10
+
+/obj/item/storage/toolbox/mechanical/old/clean/proc/calc_damage()
+	var/power = 0
+	for (var/obj/item/stack/telecrystal/TC in GetAllContents())
+		power += TC.amount
+	force = 19 + power
+	throwforce = 22 + power
+
+/obj/item/storage/toolbox/mechanical/old/clean/attack(mob/target, mob/living/user)
+	calc_damage() // one damage for one telecrystal equals about thirty seven(?) damage if you pour ALL your tc
+	..()
+
+/obj/item/storage/toolbox/mechanical/old/clean/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+	calc_damage()
+	..()
+	
+/obj/item/storage/toolbox/mechanical/old/clean/PopulateContents()
+	new /obj/item/screwdriver(src)
+	new /obj/item/wrench(src)
+	new /obj/item/weldingtool(src)
+	new /obj/item/crowbar(src)
+	new /obj/item/wirecutters(src)
+	new /obj/item/multitool(src)
+	new /obj/item/clothing/gloves/color/yellow(src)
+
 /obj/item/storage/toolbox/electrical
 	name = "electrical toolbox"
 	icon_state = "yellow"

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

@@ -520,3 +520,9 @@
 	new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
 	new /obj/item/lighter(src)
 
+/obj/item/storage/box/syndie_kit/scarp
+
+/obj/item/storage/box/syndie_kit/scarp/PopulateContents()
+	new /obj/item/book/granter/martial/carp(src)
+	new /obj/item/clothing/suit/hooded/carp_costume(src)
+	new /obj/item/staff/bostaff(src)

code/game/objects/items/tanks/tank_types.dm

@@ -198,4 +198,4 @@
 
 /obj/item/tank/internals/methyl_bromide/populate_gas()
 	air_contents.set_moles(/datum/gas/methyl_bromide, (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
-	return
+	return

code/game/objects/items/tools/crowbar.dm

@@ -8,6 +8,7 @@
 	usesound = 'sound/items/crowbar.ogg'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
+	item_flags = SURGICAL_TOOL
 	force = 5
 	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
@@ -107,4 +108,4 @@
 	icon = 'icons/obj/advancedtools.dmi'
 	usesound = 'sound/weapons/sonic_jackhammer.ogg'
 	icon_state = "crowbar"
-	toolspeed = 0.2
+	toolspeed = 0.2

code/game/objects/items/tools/screwdriver.dm

@@ -8,6 +8,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
+	item_flags = SURGICAL_TOOL
 	force = 5
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 5

code/game/objects/items/tools/weldingtool.dm

@@ -9,6 +9,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
+	item_flags = SURGICAL_TOOL
 	force = 3
 	throwforce = 5
 	hitsound = "swing_hit"
@@ -22,14 +23,15 @@
 	resistance_flags = FIRE_PROOF
 
 	var/self_fueling = FALSE //Do we refill ourselves or not
-	var/nextrefueltick = 0 // How long it takes before we get a new fuel unit
+	var/nextrefueltick = 0 //When is the next tick we refuel?
+	var/refueling_interval = 10	//Every how many processing ticks does this refuel? (1 = every processing tick)
 
 	custom_materials = list(/datum/material/iron=70, /datum/material/glass=30)
 	var/welding = 0 	//Whether or not the welding tool is off(0), on(1) or currently welding(2)
 	var/status = TRUE 		//Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower)
 	var/max_fuel = 20 	//The max amount of fuel the welder can hold
 	var/change_icons = 1
-	var/can_off_process = 0
+	var/can_off_process = FALSE
 	var/light_intensity = 2 //how powerful the emitted light is when used.
 	var/progress_flash_divisor = 10
 	var/burned_fuel_for = 0	//when fuel was last removed
@@ -65,6 +67,14 @@
 		. += "[initial(icon_state)]-on"
 
 /obj/item/weldingtool/process()
+	//This handles refueling. Its looking at how much fuel the tool has and comparing that to how much it holds
+	//This then looks if the refuel tick has come based on world time.
+	//Then looks if we refuel ourselves or not.
+
+	if(self_fueling && get_fuel() < max_fuel && nextrefueltick <= world.time)
+		nextrefueltick = world.time + refueling_interval
+		reagents.add_reagent(/datum/reagent/fuel, 1)
+
 	switch(welding)
 		if(0)
 			force = 3
@@ -85,14 +95,6 @@
 	//This is to start fires. process() is only called if the welder is on.
 	open_flame()
 
-	//This handles refueling. Its looking at how much fuel the tool has and comparing that to how much it holds
-	//This then looks if the refuel tick has come based on world time.
-	//Then looks if we refuel ourselves or not.
-
-	if(get_fuel() < max_fuel && nextrefueltick < world.time && self_fueling)
-		nextrefueltick = world.time + 10
-		reagents.add_reagent(/datum/reagent/fuel, 1)
-
 /obj/item/weldingtool/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (FIRELOSS)
@@ -366,7 +368,7 @@
 	custom_materials = list(/datum/material/iron=70, /datum/material/glass=120)
 	change_icons = 0
 	self_fueling = TRUE
-	can_off_process = 1
+	can_off_process = TRUE
 	light_intensity = 1
 	toolspeed = 0.5
 
@@ -374,6 +376,7 @@
 	name = "brass welding tool"
 	desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch."
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	refueling_interval = 5
 	icon_state = "clockwelder"
 	item_state = "brasswelder"
 
@@ -383,16 +386,20 @@
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "welder"
 	self_fueling = TRUE
+	can_off_process = TRUE
+	refueling_interval = 1
 	toolspeed = 0.1
 	light_intensity = 0
 	change_icons = 0
 
 /obj/item/weldingtool/advanced
 	name = "advanced welding tool"
-	desc = "A modern welding tool combined with an alien welding tool, it never runs out of fuel and works almost as fast."
+	desc = "A modern welding tool combined with an alien welding tool, it almost never runs out of fuel and works nearly as fast."
 	icon = 'icons/obj/advancedtools.dmi'
 	icon_state = "welder"
 	self_fueling = TRUE
+	can_off_process = TRUE
+	refueling_interval = 2
 	toolspeed = 0.2
 	light_intensity = 0
 	change_icons = 0

code/game/objects/items/tools/wirecutters.dm

@@ -8,6 +8,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
+	item_flags = SURGICAL_TOOL
 	force = 6
 	throw_speed = 3
 	throw_range = 7
@@ -148,4 +149,4 @@
 	icon = 'icons/obj/advancedtools.dmi'
 	icon_state = "cutters"
 	toolspeed = 0.2
-	random_color = FALSE
+	random_color = FALSE

code/game/objects/items/tools/wrench.dm

@@ -7,6 +7,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	flags_1 = CONDUCT_1
 	slot_flags = ITEM_SLOT_BELT
+	item_flags = SURGICAL_TOOL
 	force = 5
 	throwforce = 7
 	w_class = WEIGHT_CLASS_SMALL
@@ -128,4 +129,4 @@
 	icon = 'icons/obj/advancedtools.dmi'
 	icon_state = "wrench"
 	usesound = 'sound/effects/empulse.ogg'
-	toolspeed = 0.2
+	toolspeed = 0.2

code/game/objects/items/weaponry.dm

@@ -296,8 +296,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 = 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
+	force = 10 //how much harm mode damage we do
+	var/stamina_damage_increment = 5 //how much extra damage do we do when in non-harm mode
 	throwforce = 10
 	damtype = STAMINA
 	attack_verb = list("whacked", "smacked", "struck")
@@ -310,11 +310,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	var/quick_parry = FALSE // false = default parry, true = really small parry window
 	item_flags = ITEM_CAN_PARRY
 	block_parry_data = /datum/block_parry_data/bokken
+	var/default_parry_data = /datum/block_parry_data/bokken
+	var/quick_parry_data = /datum/block_parry_data/bokken/quick_parry
 	bare_wound_bonus = 0
 	wound_bonus = 0
 
 /datum/block_parry_data/bokken // fucked up parry data, emphasizing quicker, shorter parries
-	parry_stamina_cost = 8 // be wise about when you parry, though, else you won't be able to fight enough to make it count
+	parry_stamina_cost = 10 // be wise about when you parry, though, else you won't be able to fight enough to make it count
 	parry_time_windup = 0
 	parry_time_active = 10 // small parry window
 	parry_time_spindown = 0
@@ -330,11 +332,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	)
 	parry_failed_stagger_duration = 3 SECONDS
 	parry_data = list(
-		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25
+		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 10*2.5 = 25, 11*2.5 = 27.5, 12*2.5 = 30, 13*2.5 = 32.5
 	)
 
 /datum/block_parry_data/bokken/quick_parry // emphasizing REALLY SHORT PARRIES
-	parry_stamina_cost = 6 // still more costly than most parries, but less than a full bokken parry
+	parry_stamina_cost = 8 // still more costly than most parries, but less than a full bokken parry
 	parry_time_active = 5 // REALLY small parry window
 	parry_time_perfect = 2.5 // however...
 	parry_time_perfect_leeway = 2 // the entire time, the parry is perfect
@@ -371,9 +373,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	. = ..()
 	quick_parry = !quick_parry
 	if(quick_parry)
-		block_parry_data = /datum/block_parry_data/bokken/quick_parry
+		block_parry_data = quick_parry_data
 	else
-		block_parry_data = /datum/block_parry_data/bokken
+		block_parry_data = default_parry_data
 	to_chat(user, "<span class='notice'>[src] is now [quick_parry ? "emphasizing shorter parries, forcing you to riposte or be staggered" : "emphasizing longer parries, with a shorter window to riposte but more forgiving parries"].</span>")
 
 /obj/item/melee/bokken/attackby(obj/item/I, mob/living/user, params)
@@ -410,23 +412,76 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	if(burnt)
 		. += " Burned into the \"blade\" is [burned_in]."
 
+/obj/item/melee/bokken/steelwood
+	name = "steelwood bokken"
+	desc = "A misnomer of sorts, this is effectively a blunt katana made from steelwood, a dense organic wood derived from steelcaps. Why steelwood? Druids can use it. Duh."
+	icon_state = "bokken_steel"
+	item_state = "bokken_steel"
+	force = 12 
+	stamina_damage_increment = 3
+
+/obj/item/melee/bokken/waki
+	name = "wakizashi bokken"
+	desc = "A space-Japanese training sword made of wood and shaped like a wakizashi."
+	icon_state = "wakibokken"
+	item_state = "wakibokken"
+	slot_flags = ITEM_SLOT_BELT
+	w_class = WEIGHT_CLASS_NORMAL
+	force = 6 
+	stamina_damage_increment = 4
+	block_parry_data = /datum/block_parry_data/bokken/waki
+	default_parry_data = /datum/block_parry_data/bokken/waki
+	quick_parry_data = /datum/block_parry_data/bokken/waki/quick_parry
+
+/datum/block_parry_data/bokken/waki // weaker parries than the bigger variant, but cheaper and faster recovery, like quick parry
+	parry_stamina_cost = 4
+	parry_time_windup = 0
+	parry_time_active = 6
+	parry_time_spindown = 0
+	parry_time_perfect = 1.5
+	parry_time_perfect_leeway = 1
+	parry_imperfect_falloff_percent = 7.5
+	parry_efficiency_to_counterattack = 120
+	parry_efficiency_considered_successful = 65	
+	parry_efficiency_perfect = 120
+	parry_efficiency_perfect_override = list(
+		TEXT_ATTACK_TYPE_PROJECTILE = 30,
+	)
+	parry_failed_stagger_duration = 2 SECONDS
+	parry_data = list(
+		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 1.5, // 6*1.5 = 9, 7*1.5 = 10.5, 8*1.5 = 12, 9*1.5 = 13.5
+	)
+
+/datum/block_parry_data/bokken/waki/quick_parry //For the parry spammer in you
+	parry_stamina_cost = 2 // Slam that parry button
+	parry_time_active = 2.5
+	parry_time_perfect = 1 
+	parry_time_perfect_leeway = 1
+	parry_failed_stagger_duration = 1 SECONDS
+	parry_failed_clickcd_duration = 1 SECONDS 
+
+/datum/block_parry_data/bokken/waki/quick_parry/proj
+	parry_efficiency_perfect_override = list()
+
+/obj/item/melee/bokken/waki/steelwood
+	name = "wakizashi steelwood bokken"
+	desc = "A misnomer of sorts, this is effectively a blunt wakizashi made from steelwood, a dense organic wood derived from steelcaps. Why steelwood? Druids can use it. Duh."
+	icon_state = "wakibokken_steel"
+	item_state = "wakibokken_steel"
+	force = 8 
+	stamina_damage_increment = 2
+
 /obj/item/melee/bokken/debug
 	name = "funny debug parrying stick"
 	desc = "if you see this you've fucked up somewhere my good man"
 	block_parry_data = /datum/block_parry_data/bokken/debug
-
-/obj/item/melee/bokken/debug/AltClick(mob/user)
-	quick_parry = !quick_parry
-	if(quick_parry)
-		block_parry_data = /datum/block_parry_data/bokken/quick_parry/debug
-	else
-		block_parry_data = /datum/block_parry_data/bokken/debug
-	to_chat(user, "<span class='notice'>[src] is now [quick_parry ? "emphasizing shorter parries, forcing you to riposte or be staggered" : "emphasizing longer parries, with a shorter window to riposte but more forgiving parries"].</span>")
+	default_parry_data = /datum/block_parry_data/bokken/debug
+	quick_parry_data = /datum/block_parry_data/bokken/quick_parry/debug
 
 /datum/block_parry_data/bokken/debug
 	parry_efficiency_perfect_override = list()
 	parry_data = list(
-		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25
+		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 10*2.5 = 25, 11*2.5 = 27.5, 12*2.5 = 30, 13*2.5 = 32.5
 		PARRY_DISARM_ATTACKER = TRUE,
 		PARRY_KNOCKDOWN_ATTACKER = 10,
 		PARRY_STAGGER_ATTACKER = 10,
@@ -436,13 +491,63 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 /datum/block_parry_data/bokken/quick_parry/debug
 	parry_efficiency_perfect_override = list()
 	parry_data = list(
-		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 7*2.5 = 17.5, 8*2.5 = 20, 9*2.5 = 22.5, 10*2.5 = 25
+		PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 2.5, // 10*2.5 = 25, 11*2.5 = 27.5, 12*2.5 = 30, 13*2.5 = 32.5
 		PARRY_DISARM_ATTACKER = TRUE,
 		PARRY_KNOCKDOWN_ATTACKER = 10,
 		PARRY_STAGGER_ATTACKER = 10,
 		PARRY_DAZE_ATTACKER = 10,
 		)
 
+/// BOKKEN CRAFTNG PIECES
+
+/obj/item/bokken_blade
+	name = "training bokken wooden blade"
+	desc = "The blade piece of a bokken katana."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "bokken"
+	item_state = "bone_dagger"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/bokken_steelblade
+	name = "training bokken steelwood blade"
+	desc = "The blade piece of a steelwood bokken katana."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "bokken_steel"
+	item_state = "switchblade_ext"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/wakibokken_blade
+	name = "training bokken wooden wakizashi blade"
+	desc = "The blade piece of a bokken wakizashi."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "wakibokken"
+	item_state = "bone_dagger"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/wakibokken_steelblade
+	name = "training bokken steelwood wakizashi blade"
+	desc = "The blade piece of a steelwood bokken katana."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "wakibokken_steel"
+	item_state = "switchblade_ext"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/bokken_hilt
+	name = "training bokken hilt"
+	desc = "The hilt piece of a bokken. This hilt is appropriate for any potential blade length or material."
+	icon = 'icons/obj/smith.dmi'
+	icon_state = "bokken_hilt"
+	item_state = "bone_dagger"
+	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
 
 /obj/item/wirerod
 	name = "wired rod"

code/game/objects/obj_defense.dm

@@ -109,7 +109,7 @@
 		return
 	user.do_attack_animation(src)
 	. = take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user), armor_penetration)
-	user.DelayNextAction()
+	user.DelayNextAction(CLICK_CD_MELEE)
 
 /obj/attack_alien(mob/living/carbon/alien/humanoid/user)
 	if(attack_generic(user, 60, BRUTE, "melee", 0))

code/game/objects/structures/barsigns.dm

@@ -271,6 +271,11 @@
 	icon = "the_lightbulb"
 	desc = "A cafe popular among moths and moffs. Once shut down for a week after the bartender used mothballs to protect her spare uniforms."
 
+/datum/barsign/goose
+	name = "The Loose Goose"
+	icon = "goose"
+	desc = "Drink till you puke and/or break the laws of reality!"
+
 /datum/barsign/cybersylph
 	name = "Cyber Sylph's"
 	icon = "cybersylph"

code/game/objects/structures/beds_chairs/bed.dm

@@ -40,6 +40,16 @@
 	if(istype(W, /obj/item/wrench) && !(flags_1&NODECONSTRUCT_1))
 		W.play_tool_sound(src)
 		deconstruct(TRUE)
+	else if(istype(W, /obj/item/bedsheet))
+		if(user.transferItemToLoc(W, drop_location()))
+			to_chat(user, "<span class='notice'>You make \the [src] with [W].</span>")
+			W.pixel_x = 0
+			W.pixel_y = 0
+	else if(istype(W, /obj/item/disk/nuclear))
+		if(user.transferItemToLoc(W, drop_location()))
+			to_chat(user, "<span class='notice'>You tuck little disky into bed. Good night disky.</span>")
+			W.pixel_x = 6 //make sure they reach the pillow
+			W.pixel_y = -6
 	else
 		return ..()
 

code/game/objects/structures/bedsheet_bin.dm

@@ -22,6 +22,10 @@ LINEN BINS
 	dog_fashion = /datum/dog_fashion/head/ghost
 	var/list/dream_messages = list("white")
 
+/obj/item/bedsheet/Initialize(mapload)
+	. = ..()
+	AddElement(/datum/element/bed_tuckable, 0, 0, 0)
+
 /obj/item/bedsheet/attack(mob/living/M, mob/user)
 	if(!attempt_initiate_surgery(src, M, user))
 		..()
@@ -243,7 +247,7 @@ LINEN BINS
 
 /obj/item/bedsheet/random/Initialize()
 	..()
-	var/type = pick(typesof(/obj/item/bedsheet) - list(/obj/item/bedsheet/random, /obj/item/bedsheet/chameleon))
+	var/type = pick(typesof(/obj/item/bedsheet) - (list(/obj/item/bedsheet/random, /obj/item/bedsheet/chameleon) + typesof(/obj/item/bedsheet/unlockable)))
 	new type(loc)
 	return INITIALIZE_HINT_QDEL
 
@@ -257,9 +261,32 @@ LINEN BINS
 	chameleon_action = new(src)
 	chameleon_action.chameleon_type = /obj/item/bedsheet
 	chameleon_action.chameleon_name = "Bedsheet"
-	chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/bedsheet/chameleon, /obj/item/bedsheet/random), only_root_path = TRUE)
+	chameleon_action.chameleon_blacklist = typecacheof(list(/obj/item/bedsheet/chameleon, /obj/item/bedsheet/random, /obj/item/bedsheet/unlockable), only_root_path = FALSE)
 	chameleon_action.initialize_disguises()
 
+//unlockable bedsheets
+/obj/item/bedsheet/unlockable
+	name = "unlockable bedsheet"
+	desc = "this shouldn't be here!"
+
+//janitor: clean 100 messes with mop as janitor
+/obj/item/bedsheet/unlockable/janitor
+	name = "janitor bedsheet"
+	desc = "A white bedsheet, with a warning sign on the front."
+	icon_state = "sheetjanitor"
+
+//cook: use microwave 100 times properly (contents must make one good item) as cook
+/obj/item/bedsheet/unlockable/cook
+	name = "cook bedsheet"
+	desc = "A grey bedsheet, with a microwave on the front."
+	icon_state = "sheetcook"
+
+//miner: redeem 100,000 mining points
+/obj/item/bedsheet/unlockable/miner
+	name = "miner bedsheet"
+	desc = "A red and black bedsheet. It seems to be made with goliath hide."
+	icon_state = "sheetminer"
+
 //bedsheet bin
 /obj/structure/bedsheetbin
 	name = "linen bin"

code/game/objects/structures/chess.dm

@@ -73,4 +73,4 @@
 /obj/structure/chess/blackking
 	name = "\improper Black King"
 	desc = "A black king chess piece. It can move one tile in any direction."
-	icon_state = "black_king"
+	icon_state = "black_king"

code/game/objects/structures/crates_lockers/closets.dm

@@ -446,8 +446,11 @@
 			var/mob/living/L = O
 			if(!issilicon(L))
 				L.DefaultCombatKnockdown(40)
-			O.forceMove(T)
-			close()
+			if(istype(src, /obj/structure/closet/supplypod/extractionpod))
+				O.forceMove(src)
+			else
+				O.forceMove(T)
+				close()
 	else
 		O.forceMove(T)
 	return 1

code/game/objects/structures/crates_lockers/closets/bodybag.dm

@@ -108,4 +108,4 @@
 	icon_state = "radbodybag"
 	mob_storage_capacity = 1
 	foldedbag_path = /obj/item/bodybag/containment
-	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -70,7 +70,7 @@
 	new /obj/item/melee/flyswatter(src)
 	new /obj/item/flashlight(src)
 	for(var/i in 1 to 3)
-		new /obj/item/caution(src)
+		new /obj/item/clothing/suit/caution(src)
 	new /obj/item/holosign_creator(src)
 	new /obj/item/lightreplacer(src)
 	new /obj/item/soap(src)

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -30,6 +30,8 @@
 	new /obj/item/construction/rcd/loaded/upgraded(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/ce(src)
 	new /obj/item/clothing/head/beret/ce/white(src)
+	new /obj/item/storage/bag/construction(src)
+	new /obj/item/storage/bag/material(src)
 
 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
@@ -78,6 +80,8 @@
 	new /obj/item/clothing/glasses/meson/engine(src)
 	new /obj/item/storage/box/emptysandbags(src)
 	new /obj/item/cartridge/engineering(src)
+	new /obj/item/storage/bag/construction(src)
+	new /obj/item/storage/bag/material(src)
 
 /obj/structure/closet/secure_closet/atmospherics
 	name = "\proper atmospheric technician's locker"
@@ -92,13 +96,15 @@
 	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/analyzer(src)
 	new /obj/item/holosign_creator/atmos(src)
-	new /obj/item/holosign_creator/firelock(src)
+	new /obj/item/holosign_creator/firelock(src) //what if atmos techs could test things they are meant to test, wild, innit?
 	new /obj/item/watertank/atmos(src)
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)
 	new /obj/item/clothing/glasses/meson/engine/tray(src)
 	new /obj/item/extinguisher/advanced(src)
 	new /obj/item/cartridge/atmos(src)
+	new /obj/item/storage/bag/construction(src)
+	new /obj/item/storage/bag/material(src)
 
 /*
  * Empty lockers

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -10,4 +10,4 @@
 	new /obj/item/radio/headset/headset_srv(src)
 	new /obj/item/cultivator(src)
 	new /obj/item/hatchet(src)
-	new /obj/item/storage/box/disks_plantgene(src)
+	new /obj/item/storage/box/disks_plantgene(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -47,6 +47,25 @@
 	new /obj/item/clothing/glasses/hud/health(src)
 	return
 
+/obj/structure/closet/secure_closet/paramedic
+    name = "paramedic's locker"
+    req_access = list(ACCESS_MEDICAL)
+    icon_state = "paramed_secure"
+
+/obj/structure/closet/secure_closet/paramedic/PopulateContents()
+    ..()
+    new /obj/item/clothing/suit/toggle/labcoat/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic(src)
+    new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+    new /obj/item/radio/headset/headset_med(src)
+    new /obj/item/defibrillator/loaded(src)
+    new /obj/item/clothing/gloves/color/latex/nitrile(src)
+    new /obj/item/storage/belt/medical(src)
+    new /obj/item/clothing/glasses/hud/health(src)
+    new /obj/item/pinpointer/crew(src)
+    new /obj/item/sensor_device(src)
+    return
+
 /obj/structure/closet/secure_closet/CMO
 	name = "\proper chief medical officer's locker"
 	req_access = list(ACCESS_CMO)

code/game/objects/structures/crates_lockers/crates/wooden.dm

@@ -15,4 +15,4 @@
 	new	/obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src)
 	new /obj/item/pneumatic_cannon/pie(src)
 	new /obj/item/reagent_containers/food/snacks/pie/cream(src)
-	new /obj/item/storage/crayons(src)
+	new /obj/item/storage/crayons(src)

code/game/objects/structures/displaycase.dm

@@ -553,4 +553,4 @@
 /obj/structure/displaycase/forsale/kitchen
 	desc = "A display case with an ID-card swiper. Use your ID to purchase the contents. Meant for the bartender and chef."
 	req_one_access = list(ACCESS_KITCHEN, ACCESS_BAR)
-*/
+*/

code/game/objects/structures/janicart.dm

@@ -73,7 +73,7 @@
 			l.janicart_insert(user,src)
 		else
 			to_chat(user, fail_msg)
-	else if(istype(I, /obj/item/caution))
+	else if(istype(I, /obj/item/clothing/suit/caution))
 		if(signs < max_signs)
 			put_in_cart(I, user)
 			signs++
@@ -104,7 +104,7 @@
 		items += list("Spray bottle" = image(icon = myspray.icon, icon_state = myspray.icon_state))
 	if(myreplacer)
 		items += list("Light replacer" = image(icon = myreplacer.icon, icon_state = myreplacer.icon_state))
-	var/obj/item/caution/sign = locate() in src
+	var/obj/item/clothing/suit/caution/sign = locate() in src
 	if(sign)
 		items += list("Sign" = image(icon = sign.icon, icon_state = sign.icon_state))
 

code/game/objects/structures/loom.dm

@@ -38,4 +38,4 @@
 			user.show_message("<span class='notice'>You weave \the [W.name] into a workable fabric.</span>", MSG_VISUAL)
 	return TRUE
 
-#undef FABRIC_PER_SHEET
+#undef FABRIC_PER_SHEET

code/game/objects/structures/memorial.dm

@@ -18,4 +18,4 @@ This memorial has been designed for him and any future coders to perish.
 	icon = 'icons/obj/tomb.dmi'
 	icon_state = "memorial"
 	density = TRUE
-	anchored = TRUE
+	anchored = TRUE

code/game/objects/structures/mirror.dm

@@ -94,7 +94,7 @@
 	name = "magic mirror"
 	desc = "Turn and face the strange... face."
 	icon_state = "magic_mirror"
-	var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie")
+	var/list/races_blacklist = list("skeleton", "agent", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie")
 	var/list/choosable_races = list()
 
 /obj/structure/mirror/magic/New()

code/game/objects/structures/mop_bucket.dm

@@ -26,4 +26,4 @@
 /obj/structure/mopbucket/update_overlays()
 	. = ..()
 	if(reagents.total_volume > 0)
-		. += "mopbucket_water"
+		. += "mopbucket_water"

code/game/objects/structures/spawner.dm

@@ -72,4 +72,4 @@
 /obj/structure/spawner/mining/wumborian
 	name = "wumborian fugu den"
 	desc = "A den housing a nest of wumborian fugus, how do they all even fit in there?"
-	mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu)
+	mob_types = list(/mob/living/simple_animal/hostile/asteroid/fugu)