Deconflict and revert an accidental iconstate name change

2026-08-26 21:48:21 +01:00 · 2019-08-31 09:18:36 -04:00
parent c3b48f6862 4c088259d3
commit a5c0138dda
210 changed files with 3227 additions and 1747 deletions
@@ -9,15 +9,27 @@ assignees: ''
 <!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable -->
 **Issue Description**:
 <!---What is the problem?-->
+
+
 **What did you expect to happen**: 
 <!--Why do you think this is an issue?-->
+
+
 **What happened instead**:
 <!--How is what happened different from what you expected?-->
+
+
 **Why is this bad/What are the consequences**:
 <!--Why do you think this is an important issue?-->
+
+
 **Steps to reproduce the problem**:
 <!--The most important section. Review everything you did leading up to causing the issue.-->
+
+
 **When did the problem start happening**:
 <!--If your report is about something that used to work but no longer does, when was the last time you remember it working?-->
+
+
 **Extra information**:
 <!--Anything else you can tell us.-->
@@ -49652,8 +49652,8 @@
 /obj/item/radio/intercom{
 	pixel_y = 28
 	},
-/obj/machinery/deployable/barrier,
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
 /turf/simulated/floor/plasteel{
 	icon_state = "vault";
 	dir = 8
@@ -49673,8 +49673,8 @@
 	},
 /area/security/armoury)
 "bLK" = (
-/obj/machinery/deployable/barrier,
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
 /turf/simulated/floor/plasteel{
 	icon_state = "vault";
 	dir = 8
@@ -4795,10 +4795,10 @@
 /obj/structure/reagent_dispensers/peppertank{
 	pixel_y = 29
 	},
-/obj/machinery/deployable/barrier,
-/obj/machinery/deployable/barrier,
-/obj/machinery/deployable/barrier,
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
+/obj/item/grenade/barrier,
 /turf/simulated/floor/plasteel{
 	tag = "icon-vault (WEST)";
 	icon_state = "vault";
@@ -13,7 +13,7 @@
 /turf/unsimulated/beach/water/deep/rock_wall,
 /area/awaymission/undersea)
 "ae" = (
-/obj/structure/ladder/dive_point/anchor{
+/obj/structure/ladder/unbreakable/dive_point/anchor{
 	id = "pirate"
 	},
 /turf/unsimulated/beach/water/deep/sand_floor,
@@ -217,7 +217,7 @@
 /turf/unsimulated/beach/water/deep/wood_floor,
 /area/awaymission/undersea)
 "aU" = (
-/obj/structure/ladder/dive_point/anchor,
+/obj/structure/ladder/unbreakable/dive_point/anchor,
 /turf/unsimulated/beach/water/deep/sand_floor,
 /area/awaymission/undersea)
 "aV" = (
@@ -1113,7 +1113,7 @@
 /turf/unsimulated/beach/water/deep,
 /area/awaymission/beach)
 "dv" = (
-/obj/structure/ladder/dive_point/buoy,
+/obj/structure/ladder/unbreakable/dive_point/buoy,
 /turf/unsimulated/beach/water/deep,
 /area/awaymission/beach)
 "dw" = (
@@ -1306,7 +1306,7 @@
 	},
 /area/awaymission/beach)
 "dW" = (
-/obj/structure/ladder/dive_point/buoy{
+/obj/structure/ladder/unbreakable/dive_point/buoy{
 	id = "pirate"
 	},
 /turf/unsimulated/beach/water,
@@ -261,7 +261,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/example)
 "aH" = (
-/obj/structure/ladder{
+/obj/structure/ladder/unbreakable{
 	height = 1;
 	id = "example"
 	},
@@ -782,7 +782,7 @@
 /turf/simulated/floor/plasteel,
 /area/awaymission/example)
 "ca" = (
-/obj/structure/ladder{
+/obj/structure/ladder/unbreakable{
 	id = "example"
 	},
 /turf/simulated/floor/plating,
@@ -540,7 +540,7 @@
 	requires_power = 0
 	})
 "aZ" = (
-/obj/structure/ladder/dive_point/anchor{
+/obj/structure/ladder/unbreakable/dive_point/anchor{
 	id = "weirddive";
 	layer = 4.5
 	},
@@ -1996,7 +1996,7 @@
 	requires_power = 0
 	})
 "dA" = (
-/obj/structure/ladder/dive_point/anchor{
+/obj/structure/ladder/unbreakable/dive_point/anchor{
 	layer = 4.5
 	},
 /turf/unsimulated/beach/water/deep/wood_floor{
@@ -2721,8 +2721,8 @@
 /turf/unsimulated/beach/water/drop,
 /area/awaymission/spacehotel)
 "fC" = (
-/obj/structure/ladder/dive_point/buoy,
-/obj/structure/ladder/dive_point/buoy{
+/obj/structure/ladder/unbreakable/dive_point/buoy,
+/obj/structure/ladder/unbreakable/dive_point/buoy{
 	id = "weirddive";
 	invisibility = 101
 	},
@@ -3465,7 +3465,7 @@
 	},
 /area/awaymission/spacehotel)
 "hG" = (
-/obj/structure/ladder{
+/obj/structure/ladder/unbreakable{
 	height = 1;
 	icon_state = "ladder10";
 	id = "service"
@@ -3525,7 +3525,7 @@
 /area/awaymission/spacehotel)
 "hN" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/structure/ladder{
+/obj/structure/ladder/unbreakable{
 	height = 2;
 	icon_state = "ladder01";
 	id = "service"
@@ -4055,7 +4055,7 @@
 /turf/simulated/floor/plasteel,
 /area/security/armoury)
 "ahH" = (
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -4155,7 +4155,7 @@
 	},
 /area/security/brig)
 "ahR" = (
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -4324,7 +4324,7 @@
 	},
 /area/security/brig)
 "aif" = (
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -4370,7 +4370,7 @@
 	},
 /area/security/brig)
 "aij" = (
-/obj/machinery/deployable/barrier,
+/obj/item/grenade/barrier,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -79988,7 +79988,7 @@
 "cMF" = (
 /obj/machinery/door/airlock/engineering{
 	name = "Engineering Checkpoint";
-	req_access_txt = "11"
+	req_one_access_txt = "11;24"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
@@ -8742,7 +8742,7 @@
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/clothing/glasses/hud/health/health_advanced,
+/obj/item/clothing/glasses/hud/health/sunglasses,
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /turf/unsimulated/floor{
 	tag = "icon-floor";
@@ -106,9 +106,10 @@
 #define SAWN_INTACT  0
 #define SAWN_OFF     1

-#define WEAPON_LIGHT 0
-#define WEAPON_MEDIUM 1
-#define WEAPON_HEAVY 2
+#define WEAPON_DUAL_WIELD 0
+#define WEAPON_LIGHT 1
+#define WEAPON_MEDIUM 2
+#define WEAPON_HEAVY 3

 #define EXPLODE_NONE 0				//Don't even ask me why we need this.
 #define EXPLODE_DEVASTATE 1
@@ -5,6 +5,7 @@
 #define CAT_FOOD	"Food"
 #define CAT_MISC	"Misc"
 #define CAT_PRIMAL  "Tribal"
+#define CAT_CLOTHING	"Clothing"

 #define RECIPE_MICROWAVE	"Microwave"
 #define RECIPE_OVEN			"Oven"
@@ -105,6 +105,9 @@
 #define NUTRITION_LEVEL_STARVING 150
 #define NUTRITION_LEVEL_CURSED 0

+//Used as an upper limit for species that continuously gain nutriment
+#define NUTRITION_LEVEL_ALMOST_FULL 535
+
 //Blood levels
 #define BLOOD_VOLUME_MAXIMUM		2000
 #define BLOOD_VOLUME_NORMAL			560
@@ -487,10 +487,14 @@
 // Cult summon possibilities
 #define SUMMON_POSSIBILITIES 3

+// Dice rigged options.
 #define DICE_NOT_RIGGED 1
 #define DICE_BASICALLY_RIGGED 2
 #define DICE_TOTALLY_RIGGED 3

+// Water temperature
+#define COLD_WATER_TEMPERATURE 283.15 // 10 degrees celsius
+
 // Parallax
 #define PARALLAX_DELAY_DEFAULT	world.tick_lag
 #define PARALLAX_DELAY_MED		1
@@ -500,4 +504,4 @@
 // Engine types
 #define ENGTYPE_SING 		"Singularity"
 #define ENGTYPE_SM		"Supermatter"
-#define ENGTYPE_TESLA		"Tesla"
+#define ENGTYPE_TESLA		"Tesla"
@@ -7,8 +7,9 @@
 #define SOUND_BUZZ			64
 #define SOUND_INSTRUMENTS	128
 #define SOUND_MENTORHELP	256
+#define SOUND_DISCO 512

-#define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_HEARTBEAT|SOUND_BUZZ|SOUND_INSTRUMENTS|SOUND_MENTORHELP)
+#define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_HEARTBEAT|SOUND_BUZZ|SOUND_INSTRUMENTS|SOUND_MENTORHELP|SOUND_DISCO)

 #define CHAT_OOC		1
 #define CHAT_DEAD		2
@@ -34,7 +35,7 @@
 #define AMBIENT_OCCLUSION 2097152
 #define CHAT_GHOSTPDA 4194304
 #define NUMPAD_TARGET 8388608
-#define TOGGLES_TOTAL 16777215 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. 
+#define TOGGLES_TOTAL 16777215 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined.


 #define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC|AMBIENT_OCCLUSION|CHAT_GHOSTPDA|NUMPAD_TARGET)
@@ -34,14 +34,14 @@
 #define WAIT_FINISH		3

 //shuttle mode defines
-#define SHUTTLE_IDLE     0
-#define SHUTTLE_RECALL   1
-#define SHUTTLE_CALL     2
-#define SHUTTLE_DOCKED   3
-#define SHUTTLE_STRANDED 4
-#define SHUTTLE_ESCAPE 5
-#define SHUTTLE_ENDGAME 6
-#define SHUTTLE_IGNITING 7
+#define SHUTTLE_IGNITING 0
+#define SHUTTLE_IDLE     1
+#define SHUTTLE_RECALL   2
+#define SHUTTLE_CALL     3
+#define SHUTTLE_DOCKED   4
+#define SHUTTLE_STRANDED 5
+#define SHUTTLE_ESCAPE 6
+#define SHUTTLE_ENDGAME 7

 // Shuttle return values
 #define SHUTTLE_CAN_DOCK "can_dock"
@@ -948,10 +948,16 @@ The _flatIcons list is a cache for generated icon files.
 	return "#[color]"

 //Imagine removing pixels from the main icon that are covered by pixels from the mask icon.
-/proc/get_icon_difference(var/icon/main, var/icon/mask)
+//Standard behaviour is to cut pixels from the main icon that are covered by pixels from the mask icon unless passed mask_ready, see below.
+/proc/get_icon_difference(var/icon/main, var/icon/mask, var/mask_ready)
+	/*You should skip prep if the mask is already sprited properly. This significantly improves performance by eliminating most of the realtime icon work.
+	e.g. A 'ready' mask is a mask where the part you want cut out is missing (no pixels, 0 alpha) from the sprite, and everything else is solid white.*/
+
 	if(istype(main) && istype(mask))
-		mask.Blend(rgb(255,255,255), ICON_SUBTRACT) //Make all pixels on the mask as black as possible.
-		mask.Opaque(rgb(255,255,255)) //Make the transparent pixels (background) white.
-		mask.BecomeAlphaMask() //Make all the black pixels vanish (fully transparent), leaving only the white pixels.
+		if(!mask_ready) //Prep the mask if we're using a regular old sprite and not a special-made mask.
+			mask.Blend(rgb(255,255,255), ICON_SUBTRACT) //Make all pixels on the mask as black as possible.
+			mask.Opaque(rgb(255,255,255)) //Make the transparent pixels (background) white.
+			mask.BecomeAlphaMask() //Make all the black pixels vanish (fully transparent), leaving only the white background pixels.
+
 		main.AddAlphaMask(mask) //Make the pixels in the main icon that are in the transparent zone of the mask icon also vanish (fully transparent).
-		return main
+		return main
@@ -42,6 +42,7 @@ GLOBAL_LIST_INIT(global_radios, list())				//list of all radios, across all z-le
 GLOBAL_LIST_INIT(meteor_list, list())				//list of all meteors
 GLOBAL_LIST_INIT(poi_list, list())					//list of points of interest for observe/follow
 GLOBAL_LIST_INIT(active_jammers, list())             // List of active radio jammers
+GLOBAL_LIST_EMPTY(ladders)

 GLOBAL_LIST_INIT(active_diseases, list()) 			//List of Active disease in all mobs; purely for quick referencing.

@@ -68,8 +68,14 @@ SUBSYSTEM_DEF(ticker)
 			current_state = GAME_STATE_PREGAME
 			fire() // TG says this is a good idea
 		if(GAME_STATE_PREGAME)
+			if(!going)
+				return
+
 			// This is so we dont have sleeps in controllers, because that is a bad, bad thing
-			pregame_timeleft = max(0,round_start_time - world.time)
+			if(!delay_end)
+				pregame_timeleft = max(0,round_start_time - world.time) // Normal lobby countdown when roundstart was not delayed			
+			else
+				pregame_timeleft = max(0,pregame_timeleft - 20) // If roundstart was delayed, we should resume the countdown where it left off

 			if(pregame_timeleft <= 600 && !tipped) // 60 seconds
 				send_tip_of_the_round()
@@ -83,6 +89,7 @@ SUBSYSTEM_DEF(ticker)
 				current_state = GAME_STATE_STARTUP
 				Master.SetRunLevel(RUNLEVEL_LOBBY)
 		if(GAME_STATE_PLAYING)
+			delay_end = 0 // reset this in case round start was delayed
 			mode.process()
 			mode.process_job_tasks()
 			var/game_finished = SSshuttle.emergency.mode >= SHUTTLE_ENDGAME || mode.station_was_nuked
@@ -1151,7 +1151,7 @@
 						A.set_zeroth_law("")
 						A.show_laws()
 						A.verbs -= /mob/living/silicon/ai/proc/choose_modules
-						A.malf_picker.remove_verbs(A)
+						A.malf_picker.remove_malf_verbs(A)
 						qdel(A.malf_picker)
 					SSticker.mode.update_traitor_icons_removed(src)

@@ -337,6 +337,13 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list)			//Some pipes we don't want to be dispensable
 	pipe_icon = "intake"
 	rpd_dispensable = TRUE

+/datum/pipes/disposal/sortjunction
+	pipe_name = "disposals sort junction"
+	pipe_id = PIPE_DISPOSALS_SORT_RIGHT
+	orientations = 4
+	pipe_icon = "pipe-j1s"
+	rpd_dispensable = TRUE
+
 //Pipes the RPD can't dispense. Since these don't use an interface, we don't need to bother with setting an icon. We do, however, want to name these for other purposes

 /datum/pipes/atmospheric/circulator
@@ -363,12 +370,8 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list)			//Some pipes we don't want to be dispensable
 	pipe_name = "bent insulated pipe"
 	pipe_id = PIPE_INSULATED_BENT

-/datum/pipes/disposal/sortjunction
-	pipe_name = "disposals sort junction"
-	pipe_id = PIPE_DISPOSALS_SORT_RIGHT
-	pipe_icon = "pipe-j1s"
-
-/datum/pipes/disposal/sortjunction/left
+/datum/pipes/disposal/left_sortjunction
+	pipe_name = "disposals sort junction left"
 	pipe_id = PIPE_DISPOSALS_SORT_LEFT
 	pipe_icon = "pipe-j2s"

@@ -1,7 +1,6 @@
 /obj/effect/proc_holder/spell/targeted/charge
 	name = "Charge"
 	desc = "This spell can be used to recharge a variety of things in your hands, from magical artifacts to electrical components. A creative wizard can even use it to grant magical power to a fellow magic user."
-
 	school = "transmutation"
 	charge_max = 600
 	clothes_req = 0
@@ -10,7 +9,7 @@
 	range = -1
 	cooldown_min = 400 //50 deciseconds reduction per rank
 	include_user = 1
-
+	action_icon_state = "charge"

 /obj/effect/proc_holder/spell/targeted/charge/cast(list/targets,mob/user = usr)
 	for(var/mob/living/L in targets)
@@ -11,8 +11,6 @@
 	cooldown_min = 10 //Gun wizard
 	action_icon_state = "bolt_action"

-
-
 /obj/effect/proc_holder/spell/targeted/infinite_guns/cast(list/targets, mob/user = usr)
 	for(var/mob/living/carbon/C in targets)
 		C.drop_item()
@@ -72,6 +72,7 @@
 /obj/effect/proc_holder/spell/noclothes
 	name = "No Clothes"
 	desc = "This always-on spell allows you to cast magic without your garments."
+	action_icon_state = "no_clothes"

 /obj/effect/proc_holder/spell/targeted/genetic/mutate
 	name = "Mutate"
@@ -45,13 +45,6 @@
 	duration = 10
 	tick_interval = 0
 	alert_type = /obj/screen/alert/status_effect/blooddrunk
-	var/last_health = 0
-	var/last_bruteloss = 0
-	var/last_fireloss = 0
-	var/last_toxloss = 0
-	var/last_oxyloss = 0
-	var/last_cloneloss = 0
-	var/last_staminaloss = 0

 /obj/screen/alert/status_effect/blooddrunk
 	name = "Blood-Drunk"
@@ -61,108 +54,32 @@
 /datum/status_effect/blooddrunk/on_apply()
 	. = ..()
 	if(.)
-		owner.maxHealth *= 10
-		owner.bruteloss *= 10
-		owner.fireloss *= 10
 		if(ishuman(owner))
 			var/mob/living/carbon/human/H = owner
 			for(var/X in H.bodyparts)
 				var/obj/item/organ/external/BP = X
-				BP.max_damage *= 10
-				BP.min_broken_damage *= 10
-				BP.brute_dam *= 10
-				BP.burn_dam *= 10
-		owner.toxloss *= 10
-		owner.oxyloss *= 10
-		owner.cloneloss *= 10
-		owner.staminaloss *= 10
-		owner.updatehealth()
-		last_health = owner.health
-		last_bruteloss = owner.getBruteLoss()
-		last_fireloss = owner.getFireLoss()
-		last_toxloss = owner.getToxLoss()
-		last_oxyloss = owner.getOxyLoss()
-		last_cloneloss = owner.getCloneLoss()
-		last_staminaloss = owner.getStaminaLoss()
+				BP.brute_mod *= 0.1
+				BP.burn_mod *= 0.1
+			H.dna.species.tox_mod *= 0.1
+			H.dna.species.oxy_mod *= 0.1
+			H.dna.species.clone_mod *= 0.1
+			H.dna.species.stamina_mod *= 0.1
 		add_attack_logs(owner, owner, "gained blood-drunk stun immunity")
 		var/status = CANSTUN | CANWEAKEN | CANPARALYSE | IGNORESLOWDOWN
 		owner.status_flags &= ~status
 		owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1)

-/datum/status_effect/blooddrunk/tick() //multiply the effect of healing by 10
-	if(owner.health > last_health)
-		var/needs_health_update = FALSE
-		var/new_bruteloss = owner.getBruteLoss()
-		if(new_bruteloss < last_bruteloss)
-			var/heal_amount = (new_bruteloss - last_bruteloss) * 10
-			owner.adjustBruteLoss(heal_amount, updating_health = FALSE)
-			new_bruteloss = owner.getBruteLoss()
-			needs_health_update = TRUE
-		last_bruteloss = new_bruteloss
-
-		var/new_fireloss = owner.getFireLoss()
-		if(new_fireloss < last_fireloss)
-			var/heal_amount = (new_fireloss - last_fireloss) * 10
-			owner.adjustFireLoss(heal_amount, updating_health = FALSE)
-			new_fireloss = owner.getFireLoss()
-			needs_health_update = TRUE
-		last_fireloss = new_fireloss
-
-		var/new_toxloss = owner.getToxLoss()
-		if(new_toxloss < last_toxloss)
-			var/heal_amount = (new_toxloss - last_toxloss) * 10
-			owner.adjustToxLoss(heal_amount, updating_health = FALSE)
-			new_toxloss = owner.getToxLoss()
-			needs_health_update = TRUE
-		last_toxloss = new_toxloss
-
-		var/new_oxyloss = owner.getOxyLoss()
-		if(new_oxyloss < last_oxyloss)
-			var/heal_amount = (new_oxyloss - last_oxyloss) * 10
-			owner.adjustOxyLoss(heal_amount, updating_health = FALSE)
-			new_oxyloss = owner.getOxyLoss()
-			needs_health_update = TRUE
-		last_oxyloss = new_oxyloss
-
-		var/new_cloneloss = owner.getCloneLoss()
-		if(new_cloneloss < last_cloneloss)
-			var/heal_amount = (new_cloneloss - last_cloneloss) * 10
-			owner.adjustCloneLoss(heal_amount, updating_health = FALSE)
-			new_cloneloss = owner.getCloneLoss()
-			needs_health_update = TRUE
-		last_cloneloss = new_cloneloss
-
-		var/new_staminaloss = owner.getStaminaLoss()
-		if(new_staminaloss < last_staminaloss)
-			var/heal_amount = (new_staminaloss - last_staminaloss) * 10
-			owner.adjustStaminaLoss(heal_amount, updating_health = FALSE)
-			new_staminaloss = owner.getStaminaLoss()
-			needs_health_update = TRUE
-		last_staminaloss = new_staminaloss
-
-		if(needs_health_update)
-			owner.updatehealth()
-			owner.playsound_local(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1)
-	last_health = owner.health
-
 /datum/status_effect/blooddrunk/on_remove()
-	tick()
-	owner.maxHealth *= 0.1
-	owner.bruteloss *= 0.1
-	owner.fireloss *= 0.1
 	if(ishuman(owner))
 		var/mob/living/carbon/human/H = owner
 		for(var/X in H.bodyparts)
 			var/obj/item/organ/external/BP = X
-			BP.brute_dam *= 0.1
-			BP.burn_dam *= 0.1
-			BP.max_damage /= 10
-			BP.min_broken_damage /= 10
-	owner.toxloss *= 0.1
-	owner.oxyloss *= 0.1
-	owner.cloneloss *= 0.1
-	owner.staminaloss *= 0.1
-	owner.updatehealth()
+			BP.brute_mod *= 10
+			BP.burn_mod *= 10
+		H.dna.species.tox_mod *= 10
+		H.dna.species.oxy_mod *= 10
+		H.dna.species.clone_mod *= 10
+		H.dna.species.stamina_mod *= 10
 	add_attack_logs(owner, owner, "lost blood-drunk stun immunity")
 	owner.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | IGNORESLOWDOWN

@@ -482,10 +482,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine

 /datum/supply_packs/security/securitybarriers
 	name = "Security Barriers Crate"
-	contains = list(/obj/machinery/deployable/barrier,
-					/obj/machinery/deployable/barrier,
-					/obj/machinery/deployable/barrier,
-					/obj/machinery/deployable/barrier)
+	contains = list(/obj/item/grenade/barrier,
+					/obj/item/grenade/barrier,
+					/obj/item/grenade/barrier,
+					/obj/item/grenade/barrier)
 	cost = 20
 	containername = "security barriers crate"

@@ -1173,6 +1173,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 /datum/supply_packs/organic/hydroponics/seeds
 	name = "Seeds Crate"
 	contains = list(/obj/item/seeds/chili,
+					/obj/item/seeds/cotton,
 					/obj/item/seeds/berry,
 					/obj/item/seeds/corn,
 					/obj/item/seeds/eggplant,
@@ -234,14 +234,18 @@
 	blobber.color = blob_reagent_datum.complementary_color
 	blobber.overmind = src
 	blob_mobs.Add(blobber)
+	blobber.AIStatus = AI_OFF
+	blobber.LoseTarget()
 	spawn()
-		var/list/candidates = pollCandidates("Do you want to play as a blobbernaut?", ROLE_BLOB, 1, 150)
+		var/list/candidates = pollCandidates("Do you want to play as a blobbernaut?", ROLE_BLOB, 1, 100)
 		if(candidates.len)
 			var/mob/C = pick(candidates)
 			if(C)
 				blobber.key = C.key
 				to_chat(blobber, "<span class='biggerdanger'>You are a blobbernaut! You must assist all blob lifeforms in their mission to consume everything!</span>")
 				to_chat(blobber, "<span class='danger'>You heal while standing on blob structures, however you will decay slowly if you are damaged outside of the blob.</span>")
+		if(!blobber.ckey)
+			blobber.AIStatus = AI_ON
 	return


@@ -303,7 +303,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon"

 /datum/changeling/proc/can_absorb_dna(mob/living/carbon/user, mob/living/carbon/target)
 	if(using_stale_dna(user))//If our current DNA is the stalest, we gotta ditch it.
-		to_chat(user, "<span class='warning'>We have reached our capacity to store genetic information! We must transform before absorbing more.</span>")
+		to_chat(user, "<span class='warning'>The DNA we are wearing is stale. Transform and try again.</span>")
 		return

 	if(!target || !target.dna)
@@ -290,10 +290,10 @@
 	emote_hear = list("gaffaws", "laughs")
 	response_help  = "hugs"
 	attacktext = "wildly tickles"
-	maxHealth = 150
-	health = 150
-	melee_damage_lower = 20
-	melee_damage_upper = 20
+	maxHealth = 175
+	health = 175
+	melee_damage_lower = 25
+	melee_damage_upper = 25

 	attack_sound = 'sound/items/bikehorn.ogg'
 	feast_sound = 'sound/spookoween/scary_horn2.ogg'
@@ -214,7 +214,7 @@
 	suit = /obj/item/clothing/suit/storage/fr_jacket
 	shoes = /obj/item/clothing/shoes/white
 	l_ear = /obj/item/radio/headset/headset_sec/alt
-	glasses = /obj/item/clothing/glasses/hud/health/health_advanced
+	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
 	id = /obj/item/card/id/security
 	suit_store = /obj/item/flashlight/pen
 	l_hand = /obj/item/storage/firstaid/adv
@@ -175,7 +175,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0)
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/jackboots
 	l_ear = /obj/item/radio/headset/heads/blueshield/alt
-	glasses = /obj/item/clothing/glasses/hud/health/health_advanced
+	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
 	id = /obj/item/card/id/nanotrasen
 	pda = /obj/item/pda/heads/blueshield
 	backpack_contents = list(
@@ -66,6 +66,12 @@
 	l_ear = /obj/item/radio/headset/headset_service
 	pda = /obj/item/pda/chef

+/datum/outfit/job/chef/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+	..()
+	if(visualsOnly)
+		return
+	var/datum/martial_art/cqc/under_siege/justacook = new
+	justacook.teach(H)


 /datum/job/hydro
@@ -322,6 +322,9 @@

 /obj/machinery/disco/proc/dance(mob/living/M) //Show your moves
 	set waitfor = FALSE
+	if(M.client && !(M.client.prefs.sound & SOUND_DISCO)) //We have a client that doesn't want to dance.
+		rangers -= M //Doing that here as it'll be checked less often than in processing.
+		return
 	switch(rand(0,9))
 		if(0 to 1)
 			dance2(M)
@@ -460,17 +463,18 @@
 		var/sound/song_played = sound(selection.song_path)

 		for(var/mob/M in range(10,src))
-			if(!(M in rangers))
-				rangers[M] = TRUE
-				M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played)
-			if(prob(5+(allowed(M) * 4)) && M.canmove && isliving(M))
-				dance(M)
+			if(!M.client || M.client.prefs.sound & SOUND_DISCO)
+				if(!(M in rangers))
+					rangers[M] = TRUE
+					M.playsound_local(get_turf(M), null, 100, channel = CHANNEL_JUKEBOX, S = song_played)
 		for(var/mob/L in rangers)
 			if(get_dist(src, L) > 10)
 				rangers -= L
 				if(!L || !L.client)
 					continue
 				L.stop_sound_channel(CHANNEL_JUKEBOX)
+			else if(prob(9) && L.canmove && isliving(L))
+				dance(L)
 	else if(active)
 		active = FALSE
 		STOP_PROCESSING(SSobj, src)
@@ -1,144 +1,231 @@
-/*
-CONTAINS:
+#define SINGLE "single"
+#define VERTICAL "vertical"
+#define HORIZONTAL "horizontal"

-Deployable items
-Barricades
+#define METAL 1
+#define WOOD 2
+#define SAND 3

-for reference:
+//Barricades/cover

-	access_security = 1
-	access_brig = 2
-	access_armory = 3
-	access_forensics_lockers= 4
-	access_medical = 5
-	access_morgue = 6
-	access_tox = 7
-	access_tox_storage = 8
-	access_genetics = 9
-	access_engine = 10
-	access_engine_equip= 11
-	access_maint_tunnels = 12
-	access_external_airlocks = 13
-	access_emergency_storage = 14
-	access_change_ids = 15
-	access_ai_upload = 16
-	access_teleporter = 17
-	access_eva = 18
-	access_heads = 19
-	access_captain = 20
-	access_all_personal_lockers = 21
-	access_chapel_office = 22
-	access_tech_storage = 23
-	access_atmospherics = 24
-	access_bar = 25
-	access_janitor = 26
-	access_crematorium = 27
-	access_kitchen = 28
-	access_robotics = 29
-	access_rd = 30
-	access_cargo = 31
-	access_construction = 32
-	access_chemistry = 33
-	access_cargo_bot = 34
-	access_hydroponics = 35
-	access_manufacturing = 36
-	access_library = 37
-	access_lawyer = 38
-	access_virology = 39
-	access_cmo = 40
-	access_qm = 41
-	access_court = 42
-	access_clown = 43
-	access_mime = 44
-
-*/
-
-
-//Barricades, maybe there will be a metal one later...
 /obj/structure/barricade
-	anchored = 1.0
-	density = 1.0
-	var/health = 100.0
-	var/maxhealth = 100.0
+	name = "chest high wall"
+	desc = "Looks like this would make good cover."
+	anchored = TRUE
+	density = TRUE
+	max_integrity = 100
+	var/proj_pass_rate = 50 //How many projectiles will pass the cover. Lower means stronger cover
+	var/bar_material = METAL
+	var/drop_amount = 3
 	var/stacktype = /obj/item/stack/sheet/metal

-/obj/structure/barricade/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W, stacktype))
-		if(src.health < src.maxhealth)
-			visible_message("<span class='warning'>[user] begins to repair the [src]!</span>")
-			if(do_after(user, 20 * W.toolspeed, target = src))
-				src.health = src.maxhealth
-				W:use(1)
-				visible_message("<span class='warning'>[user] repairs the [src]!</span>")
-				return
-		else
-			return
-		return
-	else if(istype(W, /obj/item/crowbar))
-		user.changeNext_move(CLICK_CD_MELEE)
-		user.visible_message("<span class='notice'>[user] is prying apart \the [src].</span>", "<span class='notice'>You begin to pry apart \the [src].</span>")
-		playsound(src, W.usesound, 200, 1)
+/obj/structure/barricade/blob_act(obj/structure/blob/B) //TO-DO-OBJECT-DAMAGE: Kill off when everything is damageable
+	take_damage(400, BRUTE, "melee", 0, get_dir(src, B))

-		if(do_after(user, 300 * W.toolspeed, target = src) && !QDELETED(src))
-			user.visible_message("<span class='notice'>[user] pries apart \the [src].</span>", "<span class='notice'>You pry apart \the [src].</span>")
-			dismantle()
+/obj/structure/barricade/ex_act(severity) //TO-DO-OBJECT-DAMAGE: Kill off when everything is damageable
+	if(resistance_flags & INDESTRUCTIBLE)
 		return
-	else
-		switch(W.damtype)
-			if("fire")
-				src.health -= W.force * 1
-			if("brute")
-				src.health -= W.force * 0.75
-			else
-		if(src.health <= 0)
-			visible_message("<span class='danger'>\The [src] is smashed apart!</span>")
-			dismantle()
-		..()
-
-/obj/structure/barricade/ex_act(severity)
 	switch(severity)
-		if(1.0)
-			visible_message("<span class='danger'>\The [src] is blown apart!</span>")
+		if(1)
+			obj_integrity = 0
 			qdel(src)
-			return
-		if(2.0)
-			src.health -= 25
-			if(src.health <= 0)
-				visible_message("<span class='danger'>\The [src] is blown apart!</span>")
-				dismantle()
-			return
+		if(2)
+			take_damage(rand(100, 250), BRUTE, "bomb", 0)
+		if(3)
+			take_damage(rand(10, 90), BRUTE, "bomb", 0)

-/obj/structure/barricade/blob_act()
-	src.health -= 25
-	if(src.health <= 0)
-		visible_message("<span class='danger'>The blob eats through \the [src]!</span>")
-		qdel(src)
-	return
-
-/obj/structure/barricade/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
-	if(height==0)
-		return 1
-	if(istype(mover) && mover.checkpass(PASSTABLE))
-		return 1
+/obj/structure/barricade/mech_melee_attack(obj/mecha/M) //TO-DO-OBJECT-DAMAGE: Kill off when everything is damageable
+	M.do_attack_animation(src)
+	var/play_soundeffect = 0
+	var/mech_damtype = M.damtype
+	if(M.selected)
+		mech_damtype = M.selected.damtype
+		play_soundeffect = 1
 	else
-		return 0
+		switch(M.damtype)
+			if(BRUTE)
+				playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
+			if(BURN)
+				playsound(src, 'sound/items/welder.ogg', 50, 1)
+			if(TOX)
+				playsound(src, 'sound/effects/spray2.ogg', 50, 1)
+				return 0
+			else
+				return 0
+	visible_message("<span class='danger'>[M.name] has hit [src].</span>")
+	return take_damage(M.force*3, mech_damtype, "melee", play_soundeffect, get_dir(src, M)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.

-/obj/structure/barricade/proc/dismantle()
-	if(stacktype)
-		new stacktype(get_turf(src))
-		new stacktype(get_turf(src))
-		new stacktype(get_turf(src))
+/obj/structure/barricade/deconstruct(disassembled = TRUE)
+	make_debris()
 	qdel(src)

+/obj/structure/barricade/proc/make_debris()
+	if(stacktype)
+		new stacktype(get_turf(src), drop_amount)
+
+/obj/structure/barricade/attackby(obj/item/I, mob/user, params)
+	if(iswelder(I) && user.a_intent != INTENT_HARM && bar_material == METAL)
+		var/obj/item/weldingtool/WT = I
+		if(obj_integrity < max_integrity)
+			if(WT.remove_fuel(0, user))
+				to_chat(user, "<span class='notice'>You begin repairing [src]...</span>")
+				playsound(loc, WT.usesound, 40, 1)
+				if(do_after(user, 40 * I.toolspeed, target = src))
+					obj_integrity = Clamp(obj_integrity + 20, 0, max_integrity)
+	else
+		return ..()
+
+/obj/structure/barricade/CanPass(atom/movable/mover, turf/target)//So bullets will fly over and stuff.
+	if(locate(/obj/structure/barricade) in get_turf(mover))
+		return TRUE
+	else if(istype(mover, /obj/item/projectile))
+		if(!anchored)
+			return TRUE
+		var/obj/item/projectile/proj = mover
+		if(proj.firer && Adjacent(proj.firer))
+			return TRUE
+		if(prob(proj_pass_rate))
+			return TRUE
+		return FALSE
+	else
+		return !density
+
+
+
+/////BARRICADE TYPES///////
+
 /obj/structure/barricade/wooden
 	name = "wooden barricade"
 	desc = "This space is blocked off by a wooden barricade."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "woodenbarricade"
+	bar_material = WOOD
 	stacktype = /obj/item/stack/sheet/wood
 	burn_state = FLAMMABLE
 	burntime = 25

+/obj/structure/barricade/wooden/attackby(obj/item/I, mob/user)
+	if(istype(I,/obj/item/stack/sheet/wood))
+		var/obj/item/stack/sheet/wood/W = I
+		if(W.amount < 5)
+			to_chat(user, "<span class='warning'>You need at least five wooden planks to make a wall!</span>")
+			return
+		else
+			to_chat(user, "<span class='notice'>You start adding [I] to [src]...</span>")
+			if(do_after(user, 50, target = src))
+				W.use(5)
+				new /turf/simulated/wall/mineral/wood/nonmetal(get_turf(src))
+				qdel(src)
+				return
+	return ..()
+
+/obj/structure/barricade/wooden/crude
+	name = "crude plank barricade"
+	desc = "This space is blocked off by a crude assortment of planks."
+	icon_state = "woodenbarricade-old"
+	drop_amount = 1
+	max_integrity = 50
+	proj_pass_rate = 65
+
+/obj/structure/barricade/wooden/crude/snow
+	desc = "This space is blocked off by a crude assortment of planks. It seems to be covered in a layer of snow."
+	icon_state = "woodenbarricade-snow-old"
+	max_integrity = 75
+
+/obj/structure/barricade/sandbags
+	name = "sandbags"
+	desc = "Bags of sand. Self explanatory."
+	icon = 'icons/obj/smooth_structures/sandbags.dmi'
+	icon_state = "sandbags"
+	max_integrity = 280
+	proj_pass_rate = 20
+	pass_flags = LETPASSTHROW
+	bar_material = SAND
+	climbable = TRUE
+	smooth = SMOOTH_TRUE
+	canSmoothWith = list(/obj/structure/barricade/sandbags, /turf/simulated/wall, /turf/simulated/wall/r_wall, /obj/structure/falsewall, /obj/structure/falsewall/reinforced, /turf/simulated/wall/rust, /turf/simulated/wall/r_wall/rust, /obj/structure/barricade/security)
+	stacktype = null
+
+/obj/structure/barricade/security
+	name = "security barrier"
+	desc = "A deployable barrier. Provides good cover in fire fights."
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "barrier0"
+	density = FALSE
+	anchored = FALSE
+	max_integrity = 180
+	proj_pass_rate = 20
+	armor = list(melee = 10, bullet = 50, laser = 50, energy = 50, bomb = 10, bio = 100, rad = 100)
+	stacktype = null
+	var/deploy_time = 40
+	var/deploy_message = TRUE
+
+/obj/structure/barricade/security/New()
+	..()
+	addtimer(CALLBACK(src, .proc/deploy), deploy_time)
+
+/obj/structure/barricade/security/proc/deploy()
+	icon_state = "barrier1"
+	density = TRUE
+	anchored = TRUE
+	if(deploy_message)
+		visible_message("<span class='warning'>[src] deploys!</span>")
+
+
+/obj/item/grenade/barrier
+	name = "barrier grenade"
+	desc = "Instant cover."
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "flashbang"
+	item_state = "flashbang"
+	actions_types = list(/datum/action/item_action/toggle_barrier_spread)
+	var/mode = SINGLE
+
+/obj/item/grenade/barrier/examine(mob/user)
+	. = ..()
+	to_chat(user, "<span class='notice'>Alt-click to toggle modes.</span>")
+
+/obj/item/grenade/barrier/AltClick(mob/living/carbon/user)
+	if(!istype(user) || !user.Adjacent(src) || user.incapacitated())
+		return
+	toggle_mode(user)
+
+/obj/item/grenade/barrier/proc/toggle_mode(mob/user)
+	switch(mode)
+		if(SINGLE)
+			mode = VERTICAL
+		if(VERTICAL)
+			mode = HORIZONTAL
+		if(HORIZONTAL)
+			mode = SINGLE
+
+	to_chat(user, "[src] is now in [mode] mode.")
+
+/obj/item/grenade/barrier/prime()
+	new /obj/structure/barricade/security(get_turf(loc))
+	switch(mode)
+		if(VERTICAL)
+			var/target_turf = get_step(src, NORTH)
+			if(!(is_blocked_turf(target_turf)))
+				new /obj/structure/barricade/security(target_turf)
+
+			var/target_turf2 = get_step(src, SOUTH)
+			if(!(is_blocked_turf(target_turf2)))
+				new /obj/structure/barricade/security(target_turf2)
+		if(HORIZONTAL)
+			var/target_turf = get_step(src, EAST)
+			if(!(is_blocked_turf(target_turf)))
+				new /obj/structure/barricade/security(target_turf)
+
+			var/target_turf2 = get_step(src, WEST)
+			if(!(is_blocked_turf(target_turf2)))
+				new /obj/structure/barricade/security(target_turf2)
+	qdel(src)
+
+/obj/item/grenade/barrier/ui_action_click(mob/user)
+	toggle_mode(user)
+
+
 /obj/structure/barricade/mime
 	name = "floor"
 	desc = "Is... this a floor?"
@@ -149,128 +236,10 @@ for reference:
 /obj/structure/barricade/mime/mrcd
 	stacktype = null

-//Actual Deployable machinery stuff
+#undef SINGLE
+#undef VERTICAL
+#undef HORIZONTAL

-/obj/machinery/deployable
-	name = "deployable"
-	desc = "deployable"
-	icon = 'icons/obj/objects.dmi'
-	req_access = list(access_security)//I'm changing this until these are properly tested./N
-
-/obj/machinery/deployable/barrier
-	name = "deployable barrier"
-	desc = "A deployable barrier. Swipe your ID card to lock/unlock it."
-	icon = 'icons/obj/objects.dmi'
-	anchored = 0.0
-	density = 1.0
-	icon_state = "barrier0"
-	var/health = 100.0
-	var/maxhealth = 100.0
-	var/locked = 0.0
-//	req_access = list(access_maint_tunnels)
-
-/obj/machinery/deployable/barrier/New()
-	..()
-
-	src.icon_state = "barrier[src.locked]"
-
-/obj/machinery/deployable/barrier/attackby(obj/item/W as obj, mob/user as mob, params)
-	if(istype(W, /obj/item/card/id))
-		if(src.allowed(user))
-			if(src.emagged < 2.0)
-				src.locked = !src.locked
-				src.anchored = !src.anchored
-				src.icon_state = "barrier[src.locked]"
-				if((src.locked == 1.0) && (src.emagged < 2.0))
-					to_chat(user, "Barrier lock toggled on.")
-					return
-				else if((src.locked == 0.0) && (src.emagged < 2.0))
-					to_chat(user, "Barrier lock toggled off.")
-					return
-			else
-				do_sparks(2, 1, src)
-				visible_message("<span class='warning'>BZZzZZzZZzZT</span>")
-				return
-		return
-	else if(istype(W, /obj/item/wrench))
-		if(src.health < src.maxhealth)
-			src.health = src.maxhealth
-			src.emagged = 0
-			src.req_access = list(access_security)
-			visible_message("<span class='warning'>[user] repairs the [src]!</span>")
-			return
-		else if(src.emagged > 0)
-			src.emagged = 0
-			src.req_access = list(access_security)
-			visible_message("<span class='warning'>[user] repairs the [src]!</span>")
-			return
-		return
-	else
-		switch(W.damtype)
-			if("fire")
-				src.health -= W.force * 0.75
-			if("brute")
-				src.health -= W.force * 0.5
-			else
-		if(src.health <= 0)
-			src.explode()
-		..()
-
-/obj/machinery/deployable/barrier/emag_act(user as mob)
-	if(!emagged)
-		emagged = 1
-		req_access = null
-		to_chat(user, "You break the ID authentication lock on the [src].")
-		do_sparks(2, 1, src)
-		visible_message("<span class='warning'>BZZzZZzZZzZT</span>")
-	else if(src.emagged == 1)
-		src.emagged = 2
-		to_chat(user, "You short out the anchoring mechanism on the [src].")
-		do_sparks(2, 1, src)
-		visible_message("<span class='warning'>BZZzZZzZZzZT</span>")
-
-/obj/machinery/deployable/barrier/ex_act(severity)
-	switch(severity)
-		if(1.0)
-			src.explode()
-			return
-		if(2.0)
-			src.health -= 25
-			if(src.health <= 0)
-				src.explode()
-			return
-
-/obj/machinery/deployable/barrier/emp_act(severity)
-	if(stat & (BROKEN|NOPOWER))
-		return
-	if(prob(50/severity))
-		locked = !locked
-		anchored = !anchored
-		icon_state = "barrier[src.locked]"
-
-/obj/machinery/deployable/barrier/blob_act()
-	src.health -= 25
-	if(src.health <= 0)
-		src.explode()
-	return
-
-/obj/machinery/deployable/barrier/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
-	if(height==0)
-		return 1
-	if(istype(mover) && mover.checkpass(PASSTABLE))
-		return 1
-	else
-		return 0
-
-/obj/machinery/deployable/barrier/proc/explode()
-	visible_message("<span class='danger'>[src] blows apart!</span>")
-	var/turf/Tsec = get_turf(src)
-
-/*	var/obj/item/stack/rods/ =*/
-	new /obj/item/stack/rods(Tsec)
-
-	do_sparks(3, 1, src)
-
-	explosion(src.loc,-1,-1,0)
-	if(src)
-		qdel(src)
+#undef METAL
+#undef WOOD
+#undef SAND
@@ -109,6 +109,7 @@
 			var/obj/item/gun/energy/E = charging
 			if(E.power_supply.charge < E.power_supply.maxcharge)
 				E.power_supply.give(E.power_supply.chargerate * recharge_coeff)
+				E.on_recharge()
 				use_power(250)
 				using_power = TRUE

@@ -203,6 +203,7 @@
 						if(D.power_supply.charge < D.power_supply.maxcharge)
 							var/obj/item/ammo_casing/energy/E = D.ammo_type[D.select]
 							D.power_supply.give(E.e_cost)
+							D.on_recharge()
 							D.update_icon()
 						else
 							D.charge_tick = 0
@@ -1191,7 +1191,7 @@
 	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
 	product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
 	icon_state = "seeds"
-	products = list(/obj/item/seeds/aloe =3, /obj/item/seeds/ambrosia = 3, /obj/item/seeds/apple = 3, /obj/item/seeds/banana = 3, /obj/item/seeds/berry = 3,
+	products = list(/obj/item/seeds/aloe =3, /obj/item/seeds/ambrosia = 3, /obj/item/seeds/apple = 3, /obj/item/seeds/cotton = 3, /obj/item/seeds/banana = 3, /obj/item/seeds/berry = 3,
 						/obj/item/seeds/cabbage = 3, /obj/item/seeds/carrot = 3, /obj/item/seeds/cherry = 3, /obj/item/seeds/chanter = 3,
 						/obj/item/seeds/chili = 3, /obj/item/seeds/cocoapod = 3, /obj/item/seeds/coffee = 3, /obj/item/seeds/comfrey =3, /obj/item/seeds/corn = 3,
 						/obj/item/seeds/nymph =3, /obj/item/seeds/eggplant = 3, /obj/item/seeds/grape = 3, /obj/item/seeds/grass = 3, /obj/item/seeds/lemon = 3,
@@ -1355,7 +1355,7 @@
 	desc = "Spare tool vending. What? Did you expect some witty description?"
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
-	req_access_txt = "11" //Engineering Equipment access
+	req_one_access_txt = "11;24" // Engineers and atmos techs can use this
 	products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/multitool = 4,/obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10)
 	contraband = list(/obj/item/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/storage/belt/utility = 3)
@@ -1470,24 +1470,90 @@
 	product_slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this free swag!;Why leave style up to fate? Use the ClothesMate!"
 	vend_delay = 15
 	vend_reply = "Thank you for using the ClothesMate!"
-	products = list(/obj/item/clothing/head/that=2,/obj/item/clothing/head/fedora=1,/obj/item/clothing/glasses/monocle=1,
-	/obj/item/clothing/under/suit_jacket/navy=2,/obj/item/clothing/under/kilt=1,/obj/item/clothing/under/overalls=1,
-	/obj/item/clothing/under/suit_jacket/really_black=2,/obj/item/clothing/suit/storage/lawyer/blackjacket=2,/obj/item/clothing/under/pants/jeans=3,/obj/item/clothing/under/pants/classicjeans=2,
-	/obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2,
-	/obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2,
-	/obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/blue=1,/obj/item/clothing/under/pants/track=1,/obj/item/clothing/suit/jacket/miljacket = 1,
-	/obj/item/clothing/accessory/scarf/red=1,/obj/item/clothing/accessory/scarf/green=1,/obj/item/clothing/accessory/scarf/darkblue=1,
-	/obj/item/clothing/accessory/scarf/purple=1,/obj/item/clothing/accessory/scarf/yellow=1,/obj/item/clothing/accessory/scarf/orange=1,
-	/obj/item/clothing/accessory/scarf/lightblue=1,/obj/item/clothing/accessory/scarf/white=1,/obj/item/clothing/accessory/scarf/black=1,
-	/obj/item/clothing/accessory/scarf/zebra=1,/obj/item/clothing/accessory/scarf/christmas=1,/obj/item/clothing/accessory/stripedredscarf=1,
-	/obj/item/clothing/accessory/stripedbluescarf=1,/obj/item/clothing/accessory/stripedgreenscarf=1,/obj/item/clothing/accessory/waistcoat=1,
-	/obj/item/clothing/under/sundress=2,/obj/item/clothing/under/stripeddress = 1, /obj/item/clothing/under/sailordress = 1, /obj/item/clothing/under/redeveninggown = 1, /obj/item/clothing/under/blacktango=1,/obj/item/clothing/suit/jacket=3,
-	/obj/item/clothing/glasses/regular=2,/obj/item/clothing/glasses/sunglasses/fake=2,/obj/item/clothing/head/sombrero=1,/obj/item/clothing/suit/poncho=1,
-	/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/black=4,
-	/obj/item/clothing/shoes/sandal=1, /obj/item/clothing/gloves/fingerless=2,
-	/obj/item/storage/belt/fannypack=1, /obj/item/storage/belt/fannypack/blue=1, /obj/item/storage/belt/fannypack/red=1, /obj/item/clothing/suit/mantle = 2, /obj/item/clothing/suit/mantle/old = 1, /obj/item/clothing/suit/mantle/regal = 2)
-	contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/storage/belt/fannypack/black=1)
-	premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/under/pants/mustangjeans=1)
+	products = list(/obj/item/clothing/head/that = 2,
+					/obj/item/clothing/head/fedora = 1,
+					/obj/item/clothing/glasses/monocle = 1,
+					/obj/item/clothing/under/suit_jacket/navy = 2,
+					/obj/item/clothing/under/kilt = 1,
+					/obj/item/clothing/under/overalls = 1,
+					/obj/item/clothing/under/suit_jacket/really_black = 2,
+					/obj/item/clothing/suit/storage/lawyer/blackjacket = 2,
+					/obj/item/clothing/under/pants/jeans = 3,
+					/obj/item/clothing/under/pants/classicjeans = 2,
+					/obj/item/clothing/under/pants/camo = 1,
+					/obj/item/clothing/under/pants/blackjeans = 2,
+					/obj/item/clothing/under/pants/khaki = 2,
+					/obj/item/clothing/under/pants/white = 2,
+					/obj/item/clothing/under/pants/red = 1,
+					/obj/item/clothing/under/pants/black = 2,
+					/obj/item/clothing/under/pants/tan = 2,
+					/obj/item/clothing/under/pants/blue = 1,
+					/obj/item/clothing/under/pants/track = 1,
+					/obj/item/clothing/suit/jacket/miljacket = 1,
+					/obj/item/clothing/head/beanie = 3,
+					/obj/item/clothing/head/beanie/black = 3,
+					/obj/item/clothing/head/beanie/red = 3,
+					/obj/item/clothing/head/beanie/green = 3,
+					/obj/item/clothing/head/beanie/darkblue = 3,
+					/obj/item/clothing/head/beanie/purple = 3,
+					/obj/item/clothing/head/beanie/yellow = 3,
+					/obj/item/clothing/head/beanie/orange = 3,
+					/obj/item/clothing/head/beanie/cyan = 3,
+					/obj/item/clothing/head/beanie/christmas = 3,
+					/obj/item/clothing/head/beanie/striped = 3,
+					/obj/item/clothing/head/beanie/stripedred = 3,
+					/obj/item/clothing/head/beanie/stripedblue = 3,
+					/obj/item/clothing/head/beanie/stripedgreen = 3,
+					/obj/item/clothing/head/beanie/rasta = 3,
+					/obj/item/clothing/accessory/scarf/red = 1,
+					/obj/item/clothing/accessory/scarf/green = 1,
+					/obj/item/clothing/accessory/scarf/darkblue = 1,
+					/obj/item/clothing/accessory/scarf/purple = 1,
+					/obj/item/clothing/accessory/scarf/yellow = 1,
+					/obj/item/clothing/accessory/scarf/orange = 1,
+					/obj/item/clothing/accessory/scarf/lightblue = 1,
+					/obj/item/clothing/accessory/scarf/white = 1,
+					/obj/item/clothing/accessory/scarf/black = 1,
+					/obj/item/clothing/accessory/scarf/zebra = 1,
+					/obj/item/clothing/accessory/scarf/christmas = 1,
+					/obj/item/clothing/accessory/stripedredscarf = 1,
+					/obj/item/clothing/accessory/stripedbluescarf = 1,
+					/obj/item/clothing/accessory/stripedgreenscarf = 1,
+					/obj/item/clothing/accessory/waistcoat = 1,
+					/obj/item/clothing/under/sundress = 2,
+					/obj/item/clothing/under/stripeddress = 1,
+					/obj/item/clothing/under/sailordress = 1,
+					/obj/item/clothing/under/redeveninggown = 1,
+					/obj/item/clothing/under/blacktango = 1,
+					/obj/item/clothing/suit/jacket = 3,
+					/obj/item/clothing/glasses/regular = 2,
+					/obj/item/clothing/glasses/sunglasses_fake = 2,
+					/obj/item/clothing/head/sombrero = 1,
+					/obj/item/clothing/suit/poncho = 1,
+					/obj/item/clothing/suit/ianshirt = 1,
+					/obj/item/clothing/shoes/laceup = 2,
+					/obj/item/clothing/shoes/black = 4,
+					/obj/item/clothing/shoes/sandal = 1,
+					/obj/item/clothing/gloves/fingerless = 2,
+					/obj/item/storage/belt/fannypack = 1,
+					/obj/item/storage/belt/fannypack/blue = 1,
+					/obj/item/storage/belt/fannypack/red = 1,
+					/obj/item/clothing/suit/mantle = 2,
+					/obj/item/clothing/suit/mantle/old = 1,
+					/obj/item/clothing/suit/mantle/regal = 2)
+
+	contraband = list(/obj/item/clothing/under/syndicate/tacticool = 1,
+					  /obj/item/clothing/mask/balaclava = 1,
+					  /obj/item/clothing/head/ushanka = 1,
+					  /obj/item/clothing/under/soviet = 1,
+					  /obj/item/storage/belt/fannypack/black = 1)
+
+	premium = list(/obj/item/clothing/under/suit_jacket/checkered = 1,
+				   /obj/item/clothing/head/mailman = 1,
+				   /obj/item/clothing/under/rank/mailman = 1,
+				   /obj/item/clothing/suit/jacket/leather = 1,
+				   /obj/item/clothing/under/pants/mustangjeans = 1)
+
 	refill_canister = /obj/item/vending_refill/clothing

 /obj/machinery/vending/clothing/New()
@@ -11,6 +11,7 @@ var/global/list/image/splatter_cache = list()
 	density = FALSE
 	anchored = TRUE
 	layer = TURF_LAYER
+	plane = GAME_PLANE
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "mfloor1"
 	random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
@@ -175,6 +175,7 @@
 	density = FALSE
 	anchored = TRUE
 	layer = TURF_LAYER
+	plane = GAME_PLANE
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "flour"
 	color = "#D5820B"
@@ -4,6 +4,7 @@
 	icon = 'icons/effects/crayondecal.dmi'
 	icon_state = "rune1"
 	layer = MID_TURF_LAYER
+	plane = GAME_PLANE //makes the graffiti visible over a wall.
 	anchored = TRUE


@@ -79,7 +79,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
 		reagents.reaction(A)
 	if(istype(A,/atom/movable))
 		var/atom/movable/AM = A
-		AM.water_act(life, 310.15, src)
+		AM.water_act(life, COLD_WATER_TEMPERATURE, src)
 	return ..()


@@ -21,7 +21,7 @@
 		reagents.reaction(A)
 	if(istype(A,/atom/movable))
 		var/atom/movable/AM = A
-		AM.water_act(life, 310.15, src)
+		AM.water_act(life, COLD_WATER_TEMPERATURE, src)
 	return ..()

 /////////////////////////////////////////////
@@ -123,6 +123,19 @@
 	origin_tech = "biotech=2"
 	stop_bleeding = 1800

+/obj/item/stack/medical/bruise_pack/attackby(obj/item/I, mob/user, params)
+	if(I.sharp)
+		if(get_amount() < 2)
+			to_chat(user, "<span class='warning'>You need at least two gauzes to do this!</span>")
+			return
+		new /obj/item/stack/sheet/cloth(user.drop_location())
+		user.visible_message("[user] cuts [src] into pieces of cloth with [I].", \
+					 "<span class='notice'>You cut [src] into pieces of cloth with [I].</span>", \
+					 "<span class='italics'>You hear cutting.</span>")
+		use(2)
+	else
+		return ..()
+
 /obj/item/stack/medical/bruise_pack/attack(mob/living/M, mob/user)
 	if(..())
 		return 1
@@ -145,6 +158,11 @@
 		else
 			to_chat(user, "<span class='warning'>[affecting] is cut open, you'll need more than a bandage!</span>")

+/obj/item/stack/medical/bruise_pack/improvised
+	name = "improvised gauze"
+	singular_name = "improvised gauze"
+	desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds."
+	stop_bleeding = 900

 /obj/item/stack/medical/bruise_pack/advanced
 	name = "advanced trauma kit"
@@ -137,6 +137,44 @@ var/global/list/datum/stack_recipe/snow_recipes = list(
 	..()
 	recipes = sandstone_recipes

+/*
+ * Sandbags
+ */
+
+/obj/item/stack/sheet/mineral/sandbags
+	name = "sandbags"
+	icon_state = "sandbags"
+	singular_name = "sandbag"
+	layer = LOW_ITEM_LAYER
+	merge_type = /obj/item/stack/sheet/mineral/sandbags
+
+GLOBAL_LIST_INIT(sandbag_recipes, list ( \
+	new/datum/stack_recipe("sandbags", /obj/structure/barricade/sandbags, 1, time = 25, one_per_turf = 1, on_floor = 1), \
+	))
+
+/obj/item/stack/sheet/mineral/sandbags/New()
+	recipes = GLOB.sandbag_recipes
+	..()
+
+/obj/item/emptysandbag
+	name = "empty sandbag"
+	desc = "A bag to be filled with sand."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "sandbag"
+	w_class = WEIGHT_CLASS_TINY
+
+/obj/item/emptysandbag/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/stack/ore/glass))
+		var/obj/item/stack/ore/glass/G = I
+		to_chat(user, "<span class='notice'>You fill the sandbag.</span>")
+		var/obj/item/stack/sheet/mineral/sandbags/S = new /obj/item/stack/sheet/mineral/sandbags(drop_location())
+		qdel(src)
+		if(Adjacent(user) && !issilicon(user))
+			user.put_in_hands(S)
+		G.use(1)
+	else
+		return ..()
+
 /obj/item/stack/sheet/mineral/diamond
 	name = "diamond"
 	icon_state = "sheet-diamond"
@@ -182,6 +182,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	new /datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 10),
 	new /datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),
 	new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),
+	new /datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
 	new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50),
 	new /datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100)
 )
@@ -204,8 +205,9 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 * Cloth
 */
 var/global/list/datum/stack_recipe/cloth_recipes = list ( \
-	new/datum/stack_recipe("grey jumpsuit", /obj/item/clothing/under/color/grey, 3), \
-	new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/black, 2), \
+	new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 3), \
+	new/datum/stack_recipe("white shoes", /obj/item/clothing/shoes/white, 2), \
+	new/datum/stack_recipe("white scarf", /obj/item/clothing/accessory/scarf/white, 1), \
 	null, \
 	new/datum/stack_recipe("backpack", /obj/item/storage/backpack, 4), \
 	new/datum/stack_recipe("dufflebag", /obj/item/storage/backpack/duffel, 6), \
@@ -216,11 +218,15 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	new/datum/stack_recipe("chemistry bag", /obj/item/storage/bag/chemistry, 4), \
 	new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \
 	null, \
+	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/bruise_pack/improvised, 1, 2, 6), \
 	new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1), \
 	new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \
+	new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4), \
 	null, \
 	new/datum/stack_recipe("fingerless gloves", /obj/item/clothing/gloves/fingerless, 1), \
-	new/datum/stack_recipe("black gloves", /obj/item/clothing/gloves/color/black, 3), \
+	new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 3), \
+	new/datum/stack_recipe("white softcap", /obj/item/clothing/head/soft/mime, 2), \
+	new/datum/stack_recipe("white beanie", /obj/item/clothing/head/beanie, 2), \
 	null, \
 	new/datum/stack_recipe("blindfold", /obj/item/clothing/glasses/sunglasses/blindfold, 3), \
 	)
@@ -243,6 +249,49 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 /obj/item/stack/sheet/cloth/ten
 	amount = 10

+GLOBAL_LIST_INIT(durathread_recipes, list ( \
+	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/misc/durathread, 4, time = 40),
+	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
+	new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \
+	new/datum/stack_recipe("durathread bandana", /obj/item/clothing/mask/bandana/durathread, 1, time = 25), \
+	))
+
+/obj/item/stack/sheet/durathread
+	name = "durathread"
+	desc = "A fabric sown from incredibly durable threads, known for its usefulness in armor production."
+	singular_name = "durathread roll"
+	icon_state = "sheet-durathread"
+	item_state = "sheet-cloth"
+	resistance_flags = FLAMMABLE
+	force = 0
+	throwforce = 0
+	merge_type = /obj/item/stack/sheet/durathread
+
+/obj/item/stack/sheet/durathread/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.durathread_recipes
+	return ..()
+
+/obj/item/stack/sheet/cotton
+	name = "raw cotton bundle"
+	desc = "A bundle of raw cotton ready to be spun on the loom."
+	singular_name = "raw cotton ball"
+	icon_state = "sheet-cotton"
+	resistance_flags = FLAMMABLE
+	force = 0
+	throwforce = 0
+	merge_type = /obj/item/stack/sheet/cotton
+	var/pull_effort = 30
+	var/loom_result = /obj/item/stack/sheet/cloth
+
+/obj/item/stack/sheet/cotton/durathread
+	name = "raw durathread bundle"
+	desc = "A bundle of raw durathread ready to be spun on the loom."
+	singular_name = "raw durathread ball"
+	icon_state = "sheet-durathreadraw"
+	merge_type = /obj/item/stack/sheet/cotton/durathread
+	pull_effort = 70
+	loom_result = /obj/item/stack/sheet/durathread
+
 /*
 * Cardboard
 */
@@ -1059,6 +1059,15 @@
 	desc = "A colorful cardboard box for the clown"
 	icon_state = "box_clown"

+/obj/item/storage/box/emptysandbags
+	name = "box of empty sandbags"
+
+/obj/item/storage/box/emptysandbags/New()
+	..()
+	contents = list()
+	for(var/i in 1 to 7)
+		new /obj/item/emptysandbag(src)
+
 /obj/item/storage/box/rndboards
 	name = "the Liberator's legacy"
 	desc = "A box containing a gift for worthy golems."
@@ -48,38 +48,38 @@
 		return

 	if(!on)
-		turn_on()
+		turn_on(user)
 		to_chat(user, "<span class='notice'>You turn the jetpack on.</span>")
 	else
-		turn_off()
+		turn_off(user)
 		to_chat(user, "<span class='notice'>You turn the jetpack off.</span>")
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()


-/obj/item/tank/jetpack/proc/turn_on()
+/obj/item/tank/jetpack/proc/turn_on(mob/user)
 	on = TRUE
 	icon_state = "[initial(icon_state)]-on"
 	ion_trail.start()

-/obj/item/tank/jetpack/proc/turn_off()
+/obj/item/tank/jetpack/proc/turn_off(mob/user)
 	on = FALSE
 	stabilizers = FALSE
 	icon_state = initial(icon_state)
 	ion_trail.stop()


-/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user as mob)
+/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user)
 	if(!on)
 		return 0
 	if((num < 0.005 || air_contents.total_moles() < num))
-		turn_off()
+		turn_off(user)
 		return 0

 	var/datum/gas_mixture/removed = air_contents.remove(num)
 	if(removed.total_moles() < 0.005)
-		turn_off()
+		turn_off(user)
 		return 0

 	var/turf/T = get_turf(user)
@@ -163,15 +163,65 @@
 		to_chat(user, "<span class='danger'>The meter on [src] indicates you are almost out of air!</span>")
 		playsound(user, 'sound/effects/alert.ogg', 50, 1)

-/obj/item/tank/jetpack/carbondioxide/mining
-	name = "mining jetpack"
+/obj/item/tank/jetpack/suit
+	name = "hardsuit jetpack upgrade"
+	desc = "A modular, compact set of thrusters designed to integrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment."
 	icon_state = "jetpack-mining"
-	item_state = "jetpack-mining"
+	item_state = "jetpack-black"
 	origin_tech = "materials=4;magnets=4;engineering=5"
-	desc = "A tank of compressed carbon dioxide for miners to use as propulsion in local space. The compact size allows for easy storage at the cost of capacity."
-	volume = 40
-	throw_range = 7
-	w_class = WEIGHT_CLASS_NORMAL //same as syndie harness
+	w_class = WEIGHT_CLASS_NORMAL
+	actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
+	volume = 1
+	slot_flags = null
+	var/datum/gas_mixture/temp_air_contents
+	var/obj/item/tank/tank = null
+	var/mob/living/carbon/human/cur_user
+
+/obj/item/tank/jetpack/suit/New()
+	..()
+	STOP_PROCESSING(SSobj, src)
+	temp_air_contents = air_contents
+
+/obj/item/tank/jetpack/suit/attack_self()
+	return
+
+/obj/item/tank/jetpack/suit/cycle(mob/user)
+	if(!istype(loc, /obj/item/clothing/suit/space/hardsuit))
+		to_chat(user, "<span class='warning'>[src] must be connected to a hardsuit!</span>")
+		return
+
+	var/mob/living/carbon/human/H = user
+	if(!istype(H.s_store, /obj/item/tank))
+		to_chat(user, "<span class='warning'>You need a tank in your suit storage!</span>")
+		return
+	..()
+
+/obj/item/tank/jetpack/suit/turn_on(mob/user)
+	if(!istype(loc, /obj/item/clothing/suit/space/hardsuit) || !ishuman(loc.loc) || loc.loc != user)
+		return
+	var/mob/living/carbon/human/H = user
+	tank = H.s_store
+	air_contents = tank.air_contents
+	START_PROCESSING(SSobj, src)
+	cur_user = user
+	..()
+
+/obj/item/tank/jetpack/suit/turn_off(mob/user)
+	tank = null
+	air_contents = temp_air_contents
+	STOP_PROCESSING(SSobj, src)
+	cur_user = null
+	..()
+
+/obj/item/tank/jetpack/suit/process()
+	if(!istype(loc, /obj/item/clothing/suit/space/hardsuit) || !ishuman(loc.loc))
+		turn_off(cur_user)
+		return
+	var/mob/living/carbon/human/H = loc.loc
+	if(!tank || tank != H.s_store)
+		turn_off(cur_user)
+		return
+	..()

 /obj/item/tank/jetpack/rig
 	name = "jetpack"
@@ -182,7 +232,7 @@
 	to_chat(usr, "It's a jetpack. If you can see this, report it on the bug tracker.")
 	return 0

-/obj/item/tank/jetpack/rig/allow_thrust(num, mob/living/user as mob)
+/obj/item/tank/jetpack/rig/allow_thrust(num, mob/living/user)
 	if(!on)
 		return 0

@@ -191,7 +241,7 @@

 	var/datum/gas_mixture/removed = holder.air_supply.air_contents.remove(num)
 	if(removed.total_moles() < 0.005)
-		turn_off()
+		turn_off(user)
 		return 0

 	var/turf/T = get_turf(user)
@@ -181,16 +181,16 @@
 			if(prob(10))
 				visible_message("<span class='boldwarning'>[owner] Deflects [I] directly back at the thrower! It's a home run!</span>", "<span class='boldwarning'>You deflect the [I] directly back at the thrower! It's a home run!</span>")
 				playsound(get_turf(owner), 'sound/weapons/homerun.ogg', 100, 1)
-				do_attack_animation(I, ATTACK_EFFECT_DISARM)				
+				do_attack_animation(I, ATTACK_EFFECT_DISARM)
 				I.throw_at(I.thrownby, 20, 20, owner)
 				deflectmode = FALSE
 				if(!istype(I, /obj/item/beach_ball))
 					lastdeflect = world.time + 3000
-				return TRUE				
+				return TRUE
 			else if(prob(30))
 				visible_message("<span class='warning'>[owner] swings! And [p_they()] miss[p_es()]! How embarassing.</span>", "<span class='warning'>You swing! You miss! Oh no!</span>")
 				playsound(get_turf(owner), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-				do_attack_animation(get_step(owner, pick(alldirs)), ATTACK_EFFECT_DISARM)			
+				do_attack_animation(get_step(owner, pick(alldirs)), ATTACK_EFFECT_DISARM)
 				deflectmode = FALSE
 				if(!istype(I, /obj/item/beach_ball))
 					lastdeflect = world.time + 3000
@@ -198,7 +198,7 @@
 			else
 				visible_message("<span class='warning'>[owner] swings and deflects [I]!</span>", "<span class='warning'>You swing and deflect the [I]!</span>")
 				playsound(get_turf(owner), 'sound/weapons/baseball_hit.ogg', 50, 1, -1)
-				do_attack_animation(I, ATTACK_EFFECT_DISARM)					
+				do_attack_animation(I, ATTACK_EFFECT_DISARM)
 				I.throw_at(get_edge_target_turf(owner, pick(cardinal)), rand(8,10), 14, owner)
 				deflectmode = FALSE
 				if(!istype(I, /obj/item/beach_ball))
@@ -239,7 +239,7 @@
 		playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
 		homerun_ready = 0
 		return
-	else
+	else if(!target.anchored)
 		target.throw_at(throw_target, rand(1,2), 7, user)

 /obj/item/melee/baseball_bat/ablative
@@ -34,6 +34,15 @@ LINEN BINS
 	add_fingerprint(user)
 	return

+/obj/item/bedsheet/attackby(obj/item/I, mob/user, params)
+	if(I.sharp)
+		var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
+		transfer_fingerprints_to(C)
+		C.add_fingerprint(user)
+		qdel(src)
+		to_chat(user, "<span class='notice'>You tear [src] up.</span>")
+	else
+		return ..()

 /obj/item/bedsheet/blue
 	icon_state = "sheetblue"
@@ -105,7 +105,7 @@
 			continue
 		if(istype(M, /mob/living/simple_animal/bot/mulebot))
 			continue
-		if(M.buckled)
+		if(M.buckled || M.anchored)
 			continue

 		M.forceMove(src)
@@ -15,15 +15,19 @@
 	var/move_delay = 0
 	var/egged = 0

-/obj/structure/closet/cardboard/relaymove(mob/user, direction)
-	if(opened || move_delay || user.stat || user.stunned || user.weakened || user.paralysis || !isturf(loc) || !has_gravity(loc))
+/obj/structure/closet/cardboard/relaymove(mob/living/user, direction)
+	if(!istype(user) || opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc))
 		return
-	move_delay = 1
-	if(step(src, direction))
-		spawn(config.walk_speed)
-			move_delay = 0
+	move_delay = TRUE
+	var/oldloc = loc
+	step(src, direction)
+	if(oldloc != loc)
+		addtimer(CALLBACK(src, .proc/ResetMoveDelay), config.walk_speed)
 	else
-		move_delay = 0
+		move_delay = FALSE
+
+/obj/structure/closet/cardboard/proc/ResetMoveDelay()
+	move_delay = FALSE

 /obj/structure/closet/cardboard/open()
 	if(opened || !can_open())
@@ -25,6 +25,7 @@
 	new /obj/item/clothing/glasses/welding/superior(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
 	new /obj/item/clothing/shoes/brown(src)
+	new /obj/item/tank/jetpack/suit(src)
 	new /obj/item/cartridge/ce(src)
 	new /obj/item/radio/headset/heads/ce(src)
 	new /obj/item/storage/toolbox/mechanical(src)
@@ -147,3 +148,4 @@
 	new /obj/item/clothing/suit/fire/atmos(src)
 	new /obj/item/clothing/head/hardhat/atmos(src)
 	new /obj/item/rpd(src)
+	new /obj/item/destTagger(src)
@@ -251,7 +251,7 @@
 	new /obj/item/melee/baton/loaded(src)
 	new /obj/item/clothing/glasses/sunglasses(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses/read_only(src)
-	new /obj/item/clothing/glasses/hud/health/health_advanced
+	new /obj/item/clothing/glasses/hud/health/sunglasses
 	new /obj/item/clothing/head/beret/centcom/officer(src)
 	new /obj/item/clothing/head/beret/centcom/officer/navy(src)
 	new /obj/item/clothing/suit/armor/vest/blueshield(src)
@@ -1,33 +1,59 @@
+// Basic ladder. By default links to the z-level above/below.
 /obj/structure/ladder
 	name = "ladder"
 	desc = "A sturdy metal ladder."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "ladder11"
-	anchored = 1
-	var/id = null
-	var/height = 0							//the 'height' of the ladder. higher numbers are considered physically higher
-	var/obj/structure/ladder/down = null	//the ladder below this one
-	var/obj/structure/ladder/up = null		//the ladder above this one
-	var/use_verb = "climbs"
+	anchored = TRUE
+	var/obj/structure/ladder/down   //the ladder below this one
+	var/obj/structure/ladder/up     //the ladder above this one
+	var/use_verb = "climb"

-/obj/structure/ladder/New()
-	spawn(8)
-		for(var/obj/structure/ladder/L in world)
-			if(L.id == id)
-				if(L.height == (height - 1))
-					down = L
-					if(isnull(L.up))
-						L.up = src
-					continue
-				if(L.height == (height + 1))
-					up = L
-					if(isnull(L.down))
-						L.down = src
-					continue
+/obj/structure/ladder/Initialize(mapload, obj/structure/ladder/up, obj/structure/ladder/down)
+	. = ..()
+	if (up)
+		src.up = up
+		up.down = src
+		up.update_icon()
+	if (down)
+		src.down = down
+		down.up = src
+		down.update_icon()
+	return INITIALIZE_HINT_LATELOAD

-			if(up && down)	//if both our connections are filled
-				break
-		update_icon()
+/obj/structure/ladder/Destroy(force)
+	if((resistance_flags & INDESTRUCTIBLE) && !force)
+		return QDEL_HINT_LETMELIVE
+	disconnect()
+	return ..()
+
+/obj/structure/ladder/LateInitialize()
+	// By default, discover ladders above and below us vertically
+	var/turf/T = get_turf(src)
+
+	if(!down)
+		for(var/obj/structure/ladder/L in locate(T.x, T.y, T.z - 1))
+			down = L
+			L.up = src  // Don't waste effort looping the other way
+			L.update_icon()
+			break
+	if(!up)
+		for (var/obj/structure/ladder/L in locate(T.x, T.y, T.z + 1))
+			up = L
+			L.down = src  // Don't waste effort looping the other way
+			L.update_icon()
+			break
+
+	update_icon()
+
+/obj/structure/ladder/proc/disconnect()
+	if(up && up.down == src)
+		up.down = null
+		up.update_icon()
+	if(down && down.up == src)
+		down.up = null
+		down.update_icon()
+	up = down = null

 /obj/structure/ladder/update_icon()
 	if(up && down)
@@ -42,61 +68,134 @@
 	else	//wtf make your ladders properly assholes
 		icon_state = "ladder00"

-/obj/structure/ladder/attack_hand(mob/user as mob)
+/obj/structure/ladder/singularity_pull()
+	if(!(resistance_flags & INDESTRUCTIBLE))
+		visible_message("<span class='danger'>[src] is torn to pieces by the gravitational pull!</span>")
+		qdel(src)
+
+/obj/structure/ladder/proc/travel(going_up, mob/user, is_ghost, obj/structure/ladder/ladder)
+	if(!is_ghost)
+		show_fluff_message(going_up, user)
+		ladder.add_fingerprint(user)
+
+	var/turf/T = get_turf(ladder)
+	var/atom/movable/AM
+	if(user.pulling)
+		AM = user.pulling
+		AM.forceMove(T)
+	user.forceMove(T)
+	if(AM)
+		user.start_pulling(AM)
+
+/obj/structure/ladder/proc/use(mob/user, is_ghost = FALSE)
+	if(!is_ghost && !in_range(src, user))
+		return
+
 	if(up && down)
-		switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
+		var/result = alert("Go up or down [src]?", "[name]", "Up", "Down", "Cancel")
+		if (!is_ghost && !in_range(src, user))
+			return  // nice try
+		switch(result)
 			if("Up")
-				user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
-									 "<span class='notice'>You climb up \the [src]!</span>")
-				user.forceMove(get_turf(up))
-				up.add_fingerprint(user)
+				travel(TRUE, user, is_ghost, up)
 			if("Down")
-				user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
-									 "<span class='notice'>You climb down \the [src]!</span>")
-				user.forceMove(get_turf(down))
-				down.add_fingerprint(user)
+				travel(FALSE, user, is_ghost, down)
 			if("Cancel")
 				return
-
 	else if(up)
-		user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
-							 "<span class='notice'>You climb up \the [src]!</span>")
-		user.forceMove(get_turf(up))
-		up.add_fingerprint(user)
-
+		travel(TRUE, user, is_ghost, up)
 	else if(down)
-		user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
-							 "<span class='notice'>You climb down \the [src]!</span>")
-		user.forceMove(get_turf(down))
-		down.add_fingerprint(user)
+		travel(FALSE, user, is_ghost, down)
+	else
+		to_chat(user, "<span class='warning'>[src] doesn't seem to lead anywhere!</span>")

-	add_fingerprint(user)
+	if(!is_ghost)
+		add_fingerprint(user)

-/obj/structure/ladder/attackby(obj/item/W, mob/user as mob, params)
-	return attack_hand(user)
+/obj/structure/ladder/attack_hand(mob/user)
+	use(user)

-/obj/structure/ladder/dive_point/buoy
+/obj/structure/ladder/attackby(obj/item/W, mob/user, params)
+	return use(user)
+
+/obj/structure/ladder/attack_robot(mob/living/silicon/robot/R)
+	if(R.Adjacent(src))
+		return use(R)
+
+//ATTACK GHOST IGNORING PARENT RETURN VALUE
+/obj/structure/ladder/attack_ghost(mob/dead/observer/user)
+	use(user, TRUE)
+
+/obj/structure/ladder/proc/show_fluff_message(going_up, mob/user)
+	if(going_up)
+		user.visible_message("[user] climbs up [src].","<span class='notice'>You [use_verb] up [src].</span>")
+	else
+		user.visible_message("[user] climbs down [src].","<span class='notice'>You [use_verb] down [src].</span>")
+
+
+// Indestructible away mission ladders which link based on a mapped ID and height value rather than X/Y/Z.
+/obj/structure/ladder/unbreakable
+	name = "sturdy ladder"
+	desc = "An extremely sturdy metal ladder."
+	resistance_flags = INDESTRUCTIBLE
+	var/id
+	var/height = 0  // higher numbers are considered physically higher
+
+/obj/structure/ladder/unbreakable/Initialize(mapload)
+	GLOB.ladders += src
+	return ..()
+
+/obj/structure/ladder/unbreakable/Destroy()
+	. = ..()
+	if(. != QDEL_HINT_LETMELIVE)
+		GLOB.ladders -= src
+
+/obj/structure/ladder/unbreakable/LateInitialize()
+	// Override the parent to find ladders based on being height-linked
+	if(!id || (up && down))
+		update_icon()
+		return
+
+	for(var/O in GLOB.ladders)
+		var/obj/structure/ladder/unbreakable/L = O
+		if(L.id != id)
+			continue  // not one of our pals
+		if(!down && L.height == height - 1)
+			down = L
+			L.up = src
+			L.update_icon()
+			if (up)
+				break  // break if both our connections are filled
+		else if(!up && L.height == height + 1)
+			up = L
+			L.down = src
+			L.update_icon()
+			if (down)
+				break  // break if both our connections are filled
+
+	update_icon()
+
+/obj/structure/ladder/unbreakable/dive_point/buoy
 	name = "diving point buoy"
 	desc = "A buoy marking the location of an underwater dive area."
 	icon = 'icons/misc/beach.dmi'
 	icon_state = "buoy"
 	id = "dive"
 	height = 2
-	use_verb = "dives"
+	use_verb = "swim"
 	layer = MOB_LAYER + 0.2		//0.1 higher than the water overlay, this also means people can "swim" behind/under it

-/obj/structure/ladder/dive_point/anchor
+/obj/structure/ladder/unbreakable/dive_point/anchor
 	name = "diving point anchor"
 	desc = "An anchor tethered to the buoy at the surface, to keep the dive area marked."
 	icon = 'icons/misc/beach.dmi'
 	icon_state = "anchor"
 	id = "dive"
 	height = 1
-	use_verb = "ascends"
 	light_range = 5

-/obj/structure/ladder/dive_point/New()
-	..()
+/obj/structure/ladder/dive_point/Initialize(mapload)
+	. = ..()
 	set_light(light_range, light_power)		//magical glowing anchor

 /obj/structure/ladder/dive_point/update_icon()
@@ -0,0 +1,38 @@
+#define FABRIC_PER_SHEET 4
+
+
+///This is a loom. It's usually made out of wood and used to weave fabric like durathread or cotton into their respective cloth types.
+/obj/structure/loom
+	name = "loom"
+	desc = "A simple device used to weave cloth and other thread-based fabrics together into usable material."
+	icon = 'icons/obj/hydroponics/equipment.dmi'
+	icon_state = "loom"
+	density = TRUE
+	anchored = TRUE
+
+/obj/structure/loom/attackby(obj/item/I, mob/user)
+	if(default_unfasten_wrench(user, I, 5))
+		return
+	if(weave(I, user))
+		return
+	return ..()
+
+///Handles the weaving.
+/obj/structure/loom/proc/weave(obj/item/stack/sheet/cotton/W, mob/user)
+	if(!istype(W))
+		return FALSE
+	if(!anchored)
+		user.show_message("<span class='notice'>The loom needs to be wrenched down.</span>", 1)
+		return FALSE
+	if(W.amount < FABRIC_PER_SHEET)
+		user.show_message("<span class='notice'>You need at least [FABRIC_PER_SHEET] units of fabric before using this.</span>", 1)
+		return FALSE
+	user.show_message("<span class='notice'>You start weaving \the [W.name] through the loom..</span>", 1)
+	if(do_after(user, W.pull_effort, target = src))
+		if(W.amount >= FABRIC_PER_SHEET)
+			new W.loom_result(drop_location())
+			W.use(FABRIC_PER_SHEET)
+			user.show_message("<span class='notice'>You weave \the [W.name] into a workable fabric.</span>", 1)
+	return TRUE
+
+#undef FABRIC_PER_SHEET
@@ -600,7 +600,7 @@
 				wateract = (W.wash(user, src))
 				busy = 0
 				if(wateract)
-					W.water_act(20, 310.15, src)
+					W.water_act(20, COLD_WATER_TEMPERATURE, src)
 			if("Disconnect")
 				user.visible_message("<span class='notice'>[user] starts disconnecting [src].</span>", "<span class='notice'>You begin disconnecting [src]...</span>")
 				if(do_after(user, 40 * O.toolspeed, target = src))
@@ -633,7 +633,7 @@
 	wateract = (O.wash(user, src))
 	busy = 0
 	if(wateract)
-		O.water_act(20, 310.15, src)
+		O.water_act(20, COLD_WATER_TEMPERATURE, src)

 /obj/structure/sink/update_icon()
 	..()
@@ -140,7 +140,23 @@
 	sheet_type = /obj/item/stack/sheet/wood
 	hardness = 70
 	explosion_block = 0
-	canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood)
+	canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal)
+
+/turf/simulated/wall/mineral/wood/attackby(obj/item/W, mob/user)
+	if(W.sharp && W.force)
+		var/duration = (48 / W.force) * 2 //In seconds, for now.
+		if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/twohanded/fireaxe))
+			duration /= 4 //Much better with hatchets and axes.
+		if(do_after(user, duration * 10, target = src)) //Into deciseconds.
+			dismantle_wall(FALSE, FALSE)
+			return
+	return ..()
+
+/turf/simulated/wall/mineral/wood/nonmetal
+	desc = "A solidly wooden wall. It's a bit weaker than a wall made with metal."
+	girder_type = /obj/structure/barricade/wooden
+	hardness = 50
+	canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal)

 /turf/simulated/wall/mineral/iron
 	name = "rough metal wall"
@@ -516,6 +516,5 @@
 /turf/AllowDrop()
 	return TRUE

-/turf/proc/water_act(volume, temperature, source)
-	for(var/mob/living/carbon/slime/M in src)
-		M.apply_water()
+/turf/proc/water_act(volume, temperature, source)	
+ 	return FALSE
@@ -784,11 +784,13 @@ var/global/nologevent = 0
 		log_admin("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
 		message_admins("[key_name(usr)] [SSticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
 		return //alert("Round end delayed", null, null, null, null, null)
-	going = !( going )
-	if(!( going ))
+	if(going)
+		going = FALSE
+		SSticker.delay_end = TRUE
 		to_chat(world, "<b>The game start has been delayed.</b>")
 		log_admin("[key_name(usr)] delayed the game.")
 	else
+		going = TRUE
 		to_chat(world, "<b>The game will start soon.</b>")
 		log_admin("[key_name(usr)] removed the delay.")
 	feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -210,6 +210,7 @@
 	var/datum/objective/KillDaCrew = new /datum/objective
 	KillDaCrew.owner = S.mind
 	KillDaCrew.explanation_text = "[objective_verb] everyone else while you're at it."
+	KillDaCrew.completed = TRUE
 	S.mind.objectives += KillDaCrew
 	to_chat(S, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
 	to_chat(S, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")
@@ -219,7 +220,8 @@
 	desc = "A magically infused bottle of clown love, distilled from \
 		countless hugging attacks. Used in funny rituals to attract \
 		adorable creatures."
-	color = "#FF69B4" // HOT PINK
+	icon = 'icons/obj/wizard.dmi'
+	icon_state = "vialtickles"
 	veil_msg = "<span class='warning'>You sense an adorable presence \
 		lurking just beyond the veil...</span>"
 	objective_verb = "Hug and tickle"
@@ -278,6 +280,7 @@
 	var/datum/objective/KillDaCrew = new /datum/objective
 	KillDaCrew.owner = M.mind
 	KillDaCrew.explanation_text = "[objective_verb] everyone and everything else while you're at it."
+	KillDaCrew.completed = TRUE
 	M.mind.objectives += KillDaCrew
 	to_chat(M, "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]")
 	to_chat(M, "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]")
@@ -104,6 +104,11 @@
 			H.rename_character(null, H.dna.species.get_random_name())
 		else
 			H.rename_character(null, name)
+		if(is_species(H, /datum/species/golem/tranquillite) && H.mind)
+			H.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall(null))
+			H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak(null))
+			H.mind.miming = TRUE
+
 	if(has_owner)
 		new_spawn.mind.assigned_role = "Servant Golem"
 	else
@@ -318,7 +318,7 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 		for(var/D in cardinal)
 			assets["[state]-[dir2text(D)].png"] = icon('icons/obj/pipe-item.dmi', state, D)
 	for(var/state in icon_states('icons/obj/pipes/disposal.dmi'))
-		if(!(state in list("pipe-c", "pipe-j1", "pipe-s", "pipe-t", "pipe-y", "intake", "outlet"))) //Pipes we want sprites for
+		if(!(state in list("pipe-c", "pipe-j1", "pipe-s", "pipe-t", "pipe-y", "intake", "outlet", "pipe-j1s"))) //Pipes we want sprites for
 			continue
 		for(var/D in cardinal)
 			assets["[state]-[dir2text(D)].png"] = icon('icons/obj/pipes/disposal.dmi', state, D)
@@ -21,12 +21,4 @@

 /datum/gear/lipstick/lime
 	display_name = "lipstick, lime"
-	path = /obj/item/lipstick/lime
-
-/datum/gear/monocle
-	display_name = "monocle"
-	path = /obj/item/clothing/glasses/monocle
-
-/datum/gear/sunglasses
-	display_name = "cheap sunglasses"
-	path = /obj/item/clothing/glasses/sunglasses/fake
+	path = /obj/item/lipstick/lime
@@ -18,12 +18,10 @@
 /datum/gear/donor/furcape
 	display_name = "Fur Cape"
 	path = /obj/item/clothing/suit/furcape
-	cost = 2

 /datum/gear/donor/furcoat
 	display_name = "Fur Coat"
 	path = /obj/item/clothing/suit/furcoat
-	cost = 2

 /datum/gear/donor/kamina
 	display_name = "Spiky Orange-tinted Shades"
@@ -33,10 +31,6 @@
 	display_name = "Spiky Green-tinted Shades"
 	path = /obj/item/clothing/glasses/fluff/kamina/green

-/datum/gear/donor/hipster
-	display_name = "Hipster Glasses"
-	path = /obj/item/clothing/glasses/regular/hipster
-
 /datum/gear/donor/threedglasses
 	display_name = "Threed Glasses"
 	path = /obj/item/clothing/glasses/threedglasses
@@ -0,0 +1,24 @@
+/datum/gear/glasses
+	subtype_path = /datum/gear/glasses
+	slot = slot_glasses
+	sort_category = "Glasses"
+
+/datum/gear/glasses/sunglasses
+	display_name = "cheap sunglasses"
+	path = /obj/item/clothing/glasses/sunglasses_fake
+
+/datum/gear/glasses/eyepatch
+	display_name = "Eyepatch"
+	path = /obj/item/clothing/glasses/eyepatch
+
+/datum/gear/glasses/hipster
+	display_name = "Hipster glasses"
+	path = /obj/item/clothing/glasses/regular/hipster
+
+/datum/gear/glasses/monocle
+	display_name = "Monocle"
+	path = /obj/item/clothing/glasses/monocle
+
+/datum/gear/glasses/prescription
+	display_name = "Prescription glasses"
+	path = /obj/item/clothing/glasses/regular
@@ -0,0 +1,8 @@
+/datum/gear/gloves
+	subtype_path = /datum/gear/gloves
+	slot = slot_gloves
+	sort_category = "Gloves"
+
+/datum/gear/gloves/fingerless
+	display_name = "Fingerless Gloves"
+	path = /obj/item/clothing/gloves/fingerless
@@ -27,25 +27,32 @@

 /datum/gear/shoes/cowboyboots
 	display_name = "cowboy boots, brown"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots
+	path = /obj/item/clothing/shoes/cowboy

 /datum/gear/shoes/cowboyboots_black
 	display_name = "cowboy boots, black"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots/black
+	path = /obj/item/clothing/shoes/cowboy/black

 /datum/gear/shoes/cowboyboots/white
 	display_name = "cowboy boots, white"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots/white
+	path = /obj/item/clothing/shoes/cowboy/white

 /datum/gear/shoes/cowboyboots/pink
 	display_name = "cowboy boots, pink"
-	cost = 1
-	path = /obj/item/clothing/shoes/cowboyboots/pink
-	
+	path = /obj/item/clothing/shoes/cowboy/pink
+
 /datum/gear/shoes/laceup
 	display_name = "laceup shoes"
-	cost = 1
 	path = /obj/item/clothing/shoes/laceup
+
+/datum/gear/shoes/blackshoes
+	display_name = "Black shoes"
+	path = /obj/item/clothing/shoes/black
+
+/datum/gear/shoes/brownshoes
+	display_name = "Brown shoes"
+	path = /obj/item/clothing/shoes/brown
+
+/datum/gear/shoes/whiteshoes
+	display_name = "White shoes"
+	path = /obj/item/clothing/shoes/white
@@ -1,7 +1,6 @@
 /datum/gear/suit
 	subtype_path = /datum/gear/suit
 	slot = slot_wear_suit
-	cost = 2
 	sort_category = "External Wear"

 //WINTER COATS
@@ -105,6 +104,10 @@
 	path = /obj/item/clothing/suit/armor/secjacket
 	allowed_roles = list("Head of Security", "Warden", "Detective", "Security Officer", "Security Pod Pilot")

+/datum/gear/suit/ianshirt
+	display_name = "Ian Shirt"
+	path = /obj/item/clothing/suit/ianshirt
+
 /datum/gear/suit/poncho
 	display_name = "poncho, classic"
 	path = /obj/item/clothing/suit/poncho
@@ -2,7 +2,6 @@
 /datum/gear/uniform
 	subtype_path = /datum/gear/uniform
 	slot = slot_w_uniform
-	cost = 2
 	sort_category = "Uniforms and Casual Dress"

 /datum/gear/uniform/skirt
@@ -201,6 +201,19 @@
 		to_chat(src, "You will no longer hear musical instruments.")
 	feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

+/client/verb/Toggle_disco() //to toggle off the disco machine locally, in case it gets too annoying
+	set name = "Hear/Silence Dance Machine"
+	set category = "Preferences"
+	set desc = "Toggles hearing and dancing to the radiant dance machine"
+	prefs.sound ^= SOUND_DISCO
+	prefs.save_preferences(src)
+	if(prefs.sound & SOUND_DISCO)
+		to_chat(src, "You will now hear and dance to the radiant dance machine.")
+	else
+		to_chat(src, "You will no longer hear or dance to the radiant dance machine.")
+		usr.stop_sound_channel(CHANNEL_JUKEBOX)
+	feedback_add_details("admin_verb","Tdd") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /client/verb/setup_character()
 	set name = "Game Preferences"
 	set category = "Preferences"
@@ -596,7 +596,7 @@ BLIND     // can't see anything
 	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	heat_protection = HEAD
 	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	flash_protect = 2
 	strip_delay = 50
 	put_on_delay = 50
@@ -624,7 +624,7 @@ BLIND     // can't see anything
 	put_on_delay = 80
 	burn_state = FIRE_PROOF
 	hide_tail_by_species = null
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")

 //Under clothing
 /obj/item/clothing/under
@@ -265,9 +265,11 @@
 		"Grey" = 'icons/mob/species/grey/eyes.dmi'
 		)

-/obj/item/clothing/glasses/sunglasses/fake
+/obj/item/clothing/glasses/sunglasses_fake
 	desc = "Cheap, plastic sunglasses. They don't even have UV protection."
 	name = "cheap sunglasses"
+	icon_state = "sun"
+	item_state = "sunglasses"
 	see_in_dark = 0
 	flash_protect = 0
 	tint = 0
@@ -38,12 +38,6 @@
 		"Grey" = 'icons/mob/species/grey/eyes.dmi'
 		)

-/obj/item/clothing/glasses/hud/health/health_advanced
-	name = "\improper Advanced Health Scanner HUD"
-	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status.  Includes anti-flash filter."
-	icon_state = "advmedhud"
-	flash_protect = 1
-
 /obj/item/clothing/glasses/hud/health/night
 	name = "\improper Night Vision Health Scanner HUD"
 	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
@@ -54,6 +48,14 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	prescription_upgradable = 0

+/obj/item/clothing/glasses/hud/health/sunglasses
+	name = "medical HUDSunglasses"
+	desc = "Sunglasses with a medical HUD."
+	icon_state = "sunhudmed"
+	see_in_dark = 1
+	flash_protect = 1
+	tint = 1
+
 /obj/item/clothing/glasses/hud/diagnostic
 	name = "Diagnostic HUD"
 	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
@@ -77,6 +79,14 @@
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	prescription_upgradable = 0

+/obj/item/clothing/glasses/hud/diagnostic/sunglasses
+	name = "diagnostic sunglasses"
+	desc = "Sunglasses with a diagnostic HUD."
+	icon_state = "sunhuddiag"
+	item_state = "glasses"
+	flash_protect = 1
+	tint = 1
+
 /obj/item/clothing/glasses/hud/security
 	name = "\improper Security HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records."
@@ -0,0 +1,96 @@
+
+//BeanieStation13 Redux
+
+//Plus a bobble hat, lets be inclusive!!
+
+/obj/item/clothing/head/beanie //Default is white, this is meant to be seen
+	name = "white beanie"
+	desc = "A stylish beanie. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their heads."
+	icon_state = "beanie" //Default white
+	item_color = "beanie"
+
+/obj/item/clothing/head/beanie/black
+	name = "black beanie"
+	icon_state = "beanie"
+	color = "#4A4A4B" //Grey but it looks black
+
+/obj/item/clothing/head/beanie/red
+	name = "red beanie"
+	icon_state = "beanie"
+	color = "#D91414" //Red
+
+/obj/item/clothing/head/beanie/green
+	name = "green beanie"
+	icon_state = "beanie"
+	color = "#5C9E54" //Green
+
+/obj/item/clothing/head/beanie/darkblue
+	name = "dark blue beanie"
+	icon_state = "beanie"
+	color = "#1E85BC" //Blue
+
+/obj/item/clothing/head/beanie/purple
+	name = "purple beanie"
+	icon_state = "beanie"
+	color = "#9557C5" //purple
+
+/obj/item/clothing/head/beanie/yellow
+	name = "yellow beanie"
+	icon_state = "beanie"
+	color = "#E0C14F" //Yellow
+
+/obj/item/clothing/head/beanie/orange
+	name = "orange beanie"
+	icon_state = "beanie"
+	color = "#C67A4B" //orange
+
+/obj/item/clothing/head/beanie/cyan
+	name = "cyan beanie"
+	icon_state = "beanie"
+	color = "#54A3CE" //Cyan (Or close to it)
+
+//Striped Beanies have unique sprites
+
+/obj/item/clothing/head/beanie/christmas
+	name = "christmas beanie"
+	icon_state = "beaniechristmas"
+	item_color = "beaniechristmas"
+
+/obj/item/clothing/head/beanie/striped
+	name = "striped beanie"
+	icon_state = "beaniestriped"
+	item_color = "beaniestriped"
+
+/obj/item/clothing/head/beanie/stripedred
+	name = "red striped beanie"
+	icon_state = "beaniestripedred"
+	item_color = "beaniestripedred"
+
+/obj/item/clothing/head/beanie/stripedblue
+	name = "blue striped beanie"
+	icon_state = "beaniestripedblue"
+	item_color = "beaniestripedblue"
+
+/obj/item/clothing/head/beanie/stripedgreen
+	name = "green striped beanie"
+	icon_state = "beaniestripedgreen"
+	item_color = "beaniestripedgreen"
+
+/obj/item/clothing/head/beanie/durathread
+	name = "durathread beanie"
+	desc = "A beanie made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "beaniedurathread"
+	item_color = null
+	armor = list(melee = 15, bullet = 5, laser = 15, energy = 5, bomb = 10, bio = 0, rad = 0)
+
+/obj/item/clothing/head/beanie/waldo
+	name = "red striped bobble hat"
+	desc = "If you're going on a worldwide hike, you'll need some cold protection."
+	icon_state = "waldo_hat"
+	item_color = "waldo_hat"
+
+/obj/item/clothing/head/beanie/rasta
+	name = "rastacap"
+	desc = "Perfect for tucking in those dreadlocks."
+	icon_state = "beanierasta"
+	item_color = "beanierasta"
@@ -227,6 +227,24 @@ obj/item/clothing/head/blob
 	item_state = "knight_templar"
 	armor = list(melee = 20, bullet = 7, laser = 2, energy = 2, bomb = 2, bio = 2, rad = 0)

+/obj/item/clothing/head/helmet/skull
+	name = "skull helmet"
+	desc = "An intimidating tribal helmet, it doesn't look very comfortable."
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
+	flags_cover = HEADCOVERSEYES
+	armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 10, bio = 5, rad = 20)
+	icon_state = "skull"
+	item_state = "skull"
+	strip_delay = 100
+
+/obj/item/clothing/head/helmet/durathread
+	name = "durathread helmet"
+	desc = "A helmet made from durathread and leather."
+	icon_state = "durathread"
+	item_state = "durathread"
+	armor = list(melee = 25, bullet = 10, laser = 20, energy = 10, bomb = 30, bio = 15, rad = 20)
+	strip_delay = 60
+
 //Commander
 /obj/item/clothing/head/helmet/ert/command
 	name = "emergency response team commander helmet"
@@ -82,6 +82,13 @@
 	desc = "A beret, an artists favorite headwear."
 	icon_state = "beret"

+/obj/item/clothing/head/beret/durathread
+	name = "durathread beret"
+	desc =  "A beret made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "beretdurathread"
+	item_color = null
+	armor = list(melee = 15, bullet = 5, laser = 15, energy = 5, bomb = 10, bio = 0, rad = 0)
+
 //Security
 /obj/item/clothing/head/HoS
 	name = "head of security cap"
@@ -483,6 +483,11 @@
 	item_color = "black"
 	desc = "It's a black bandana."

+/obj/item/clothing/mask/bandana/durathread
+	name = "durathread bandana"
+	desc =  "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
+	icon_state = "banddurathread"
+
 /obj/item/clothing/mask/cursedclown
 	name = "cursed clown mask"
 	desc = "This is a very, very odd looking mask."
@@ -243,30 +243,55 @@
 	icon_state = "bsing"
 	put_on_delay = 50

-/obj/item/clothing/shoes/cowboyboots
+/obj/item/clothing/shoes/cowboy
 	name = "cowboy boots"
 	desc = "A pair a' brown boots."
-	icon_state = "cowboyboots"
-	item_color = "cowboyboots"
+	icon_state = "cowboy_brown"
+	item_color = "cowboy_brown"

-/obj/item/clothing/shoes/cowboyboots/black
+/obj/item/clothing/shoes/cowboy/black
 	name = "black cowboy boots"
 	desc = "A pair a' black rustlers' boots"
-	icon_state = "cowboyboots_black"
-	item_color = "cowboyboots_black"
+	icon_state = "cowboy_black"
+	item_color = "cowboy_black"

-/obj/item/clothing/shoes/cowboyboots/white
+/obj/item/clothing/shoes/cowboy/white
 	name = "white cowboy boots"
 	desc = "For the rancher in us all."
-	icon_state = "cowboyboots_white"
-	item_color = "cowboyboots_white"
+	icon_state = "cowboy_white"
+	item_color = "cowboy_white"

-/obj/item/clothing/shoes/cowboyboots/pink
+/obj/item/clothing/shoes/cowboy/fancy
+	name = "bilton wrangler boots"
+	desc = "A pair of authentic haute couture boots from Japanifornia. You doubt they have ever been close to cattle."
+	icon_state = "cowboy_fancy"
+	item_color = "cowboy_fancy"
+
+/obj/item/clothing/shoes/cowboy/pink
 	name = "pink cowgirl boots"
 	desc = "For a Rustlin' tustlin' cowgirl."
 	icon_state = "cowboyboots_pink"
 	item_color = "cowboyboots_pink"

+/obj/item/clothing/shoes/cowboy/lizard
+	name = "lizard skin boots"
+	desc = "You can hear a faint hissing from inside the boots; you hope it is just a mournful ghost."
+	icon_state = "lizardboots_green"
+
+/obj/item/clothing/shoes/cowboy/lizardmasterwork
+	name = "\improper Hugs-The-Feet lizard skin boots"
+	desc = "A pair of masterfully crafted lizard skin boots. Finally a good application for the station's most bothersome inhabitants."
+	icon_state = "lizardboots_blue"
+
+/obj/effect/spawner/lootdrop/lizardboots
+	name = "random lizard boot quality"
+	desc = "Which ever gets picked, the lizard race loses"
+	icon = 'icons/obj/clothing/shoes.dmi'
+	icon_state = "lizardboots_green"
+	loot = list(
+		/obj/item/clothing/shoes/cowboy/lizard = 7,
+		/obj/item/clothing/shoes/cowboy/lizardmasterwork = 1)
+
 /obj/item/clothing/shoes/footwraps
 	name = "cloth footwraps"
 	desc = "A roll of treated canvas used for wrapping claws or paws."
@@ -190,7 +190,7 @@
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	sprite_sheets = null
 	actions_types = list()
-	has_camera = 0
+	has_camera = FALSE

 /obj/item/clothing/suit/space/hardsuit/ert/paranormal
 	name = "paranormal response team suit"
@@ -208,20 +208,26 @@
 	name = "inquisitor's helmet"
 	icon_state = "hardsuit0-inquisitor"
 	item_color = "inquisitor"
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)

 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
 	name = "inquisitor's hardsuit"
 	icon_state = "hardsuit-inquisitor"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
+	slowdown = 0

 /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker
 	name = "champion's helmet"
 	desc = "Peering into the eyes of the helmet is enough to seal damnation."
 	icon_state = "hardsuit0-berserker"
 	item_color = "berserker"
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)

 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/berserker
 	name = "champion's hardsuit"
 	desc = "Voices echo from the hardsuit, driving the user insane."
 	icon_state = "hardsuit-berserker"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker
+	armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100)
+	slowdown = 0
@@ -14,7 +14,7 @@
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)

 	//Species-specific stuff.
-	species_restricted = list("exclude","Diona","Wryn")
+	species_restricted = list("exclude","Wryn")
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -93,9 +93,10 @@
 	var/obj/item/clothing/head/helmet/space/hardsuit/helmet
 	actions_types = list(/datum/action/item_action/toggle_helmet)
 	var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
+	var/obj/item/tank/jetpack/suit/jetpack = null

 	hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
-	species_restricted = list("exclude","Diona","Wryn")
+	species_restricted = list("exclude", "Wryn")
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
@@ -112,10 +113,59 @@
 		"Vulpkanin" = 'icons/obj/clothing/species/vulpkanin/suits.dmi'
 		)

+/obj/item/clothing/suit/space/hardsuit/New()
+	if(jetpack && ispath(jetpack))
+		jetpack = new jetpack(src)
+	..()
+
 /obj/item/clothing/suit/space/hardsuit/attack_self(mob/user)
 	user.changeNext_move(CLICK_CD_MELEE)
 	..()

+/obj/item/clothing/suit/space/hardsuit/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/tank/jetpack/suit))
+		if(jetpack)
+			to_chat(user, "<span class='warning'>[src] already has a jetpack installed.</span>")
+			return
+		if(src == user.get_item_by_slot(slot_wear_suit)) //Make sure the player is not wearing the suit before applying the upgrade.
+			to_chat(user, "<span class='warning'>You cannot install the upgrade to [src] while wearing it.</span>")
+			return
+
+		if(user.unEquip(I))
+			I.forceMove(src)
+			jetpack = I
+			to_chat(user, "<span class='notice'>You successfully install the jetpack into [src].</span>")
+			return
+	else if(isscrewdriver(I))
+		if(!jetpack)
+			to_chat(user, "<span class='warning'>[src] has no jetpack installed.</span>")
+			return
+		if(src == user.get_item_by_slot(slot_wear_suit))
+			to_chat(user, "<span class='warning'>You cannot remove the jetpack from [src] while wearing it.</span>")
+			return
+
+		jetpack.turn_off(user)
+		jetpack.forceMove(drop_location())
+		jetpack = null
+		to_chat(user, "<span class='notice'>You successfully remove the jetpack from [src].</span>")
+		return
+	return ..()
+
+/obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot)
+	..()
+	if(jetpack)
+		if(slot == slot_wear_suit)
+			for(var/X in jetpack.actions)
+				var/datum/action/A = X
+				A.Grant(user)
+
+/obj/item/clothing/suit/space/hardsuit/dropped(mob/user)
+	..()
+	if(jetpack)
+		for(var/X in jetpack.actions)
+			var/datum/action/A = X
+			A.Remove(user)
+
 /obj/item/clothing/suit/space/hardsuit/item_action_slot_check(slot)
 	if(slot == slot_wear_suit) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit.
 		return 1
@@ -178,6 +228,7 @@
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS					//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/elite
+	jetpack = /obj/item/tank/jetpack/suit

 //Mining hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/mining
@@ -291,6 +342,7 @@
 	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
 	allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
+	jetpack = /obj/item/tank/jetpack/suit

 /obj/item/clothing/suit/space/hardsuit/syndi/update_icon()
 	icon_state = "hardsuit[on]-[item_color]"
@@ -438,6 +490,7 @@
 	icon_state = "hardsuit-hos"
 	armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
+	jetpack = /obj/item/tank/jetpack/suit
 	sprite_sheets = null

 //Singuloth armor
@@ -522,6 +575,7 @@
 	allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs,/obj/item/tank)
 	slowdown = 0
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
+	jetpack = /obj/item/tank/jetpack/suit
 	sprite_sheets = list(
 		"Unathi" = 'icons/mob/species/unathi/suit.dmi',
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
@@ -7,7 +7,7 @@
 	flags_inv = HIDEFACE
 	permeability_coefficient = 0.01
 	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi',
@@ -31,7 +31,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	allowed = list(/obj/item/tank, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs)
 	armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -72,7 +72,7 @@
 	allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/tank,/obj/item/kitchen/knife/combat)
 	armor = list(melee = 40, bullet = 30, laser = 30, energy = 30, bomb = 50, bio = 90, rad = 20)
 	strip_delay = 120
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi'
@@ -159,7 +159,7 @@
 	icon_state = "paramedic-eva-helmet"
 	item_state = "paramedic-eva-helmet"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/helmet.dmi',
@@ -180,7 +180,7 @@
 	item_state = "paramedic-eva"
 	desc = "A brand new paramedic EVA suit. The nitrile seems a bit too thin to be space proof. Used for retrieving bodies in space."
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/suit.dmi',
@@ -200,7 +200,7 @@
 	item_state = "s_suit"
 	desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Tajaran" = 'icons/mob/species/tajaran/suit.dmi',
@@ -223,7 +223,7 @@
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 20)
 	flash_protect = 0
-	species_restricted = list("exclude", "Diona", "Wryn")
+	species_restricted = list("exclude", "Wryn")

 	sprite_sheets = list(
 		"Tajaran" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -244,7 +244,7 @@
 	desc = ". . ."
 	icon_state = "spacemimehelmet"
 	item_state = "spacemimehelmet"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null

@@ -254,7 +254,7 @@
 	desc = ". . ."
 	icon_state = "spacemime_suit"
 	item_state = "spacemime_items"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null

@@ -264,7 +264,7 @@
 	desc = "An EVA helmet specifically designed for the clown. SPESSHONK!"
 	icon_state = "clownhelmet"
 	item_state = "clownhelmet"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null

@@ -274,7 +274,6 @@
 	desc = "An EVA suit specifically designed for the clown. SPESSHONK!"
 	icon_state = "spaceclown_suit"
 	item_state = "spaceclown_items"
-	species_restricted = list("exclude","Diona","Vox","Wryn")
+	species_restricted = list("exclude","Vox","Wryn")
 	sprite_sheets = null
 	sprite_sheets_obj = null
-	
@@ -209,6 +209,15 @@
 	allowed = list(/obj/item/nullrod/claymore)
 	armor = list(melee = 25, bullet = 5, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0)

+/obj/item/clothing/suit/armor/vest/durathread
+	name = "durathread vest"
+	desc = "A vest made of durathread with strips of leather acting as trauma plates."
+	icon_state = "durathread"
+	item_state = "durathread"
+	strip_delay = 60
+	burn_state = FLAMMABLE
+	armor = list(melee = 20, bullet = 10, laser = 30, energy = 5, bomb = 15, bio = 0, rad = 0)
+
 /obj/item/clothing/suit/armor/bulletproof
 	name = "Bulletproof Vest"
 	desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
@@ -528,14 +537,4 @@
 	item_state = "bonearmor"
 	blood_overlay_type = "armor"
 	armor = list(melee = 35, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
-
-/obj/item/clothing/head/helmet/skull
-	name = "skull helmet"
-	desc = "An intimidating tribal helmet, it doesn't look very comfortable."
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
-	flags_cover = HEADCOVERSEYES
-	armor = list(melee = 25, bullet = 25, laser = 25, energy = 10, bomb = 10, bio = 5, rad = 20)
-	icon_state = "skull"
-	item_state = "skull"
-	strip_delay = 100
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
@@ -1005,3 +1005,14 @@
 	icon_state = "old_mantle"
 	item_state = "old_mantle"

+/obj/item/clothing/suit/ghost_sheet
+	name = "ghost sheet"
+	desc = "The hands float by themselves, so it's extra spooky."
+	icon_state = "ghost_sheet"
+	item_state = "ghost_sheet"
+	throwforce = 0
+	throw_speed = 1
+	throw_range = 2
+	w_class = WEIGHT_CLASS_TINY
+	flags = BLOCKHAIR
+	flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE
@@ -6,7 +6,8 @@
 /obj/item/clothing/suit/space/hardsuit/Destroy()
 	if(helmet)
 		helmet.suit = null
-		qdel(helmet)
+		QDEL_NULL(helmet)
+	QDEL_NULL(jetpack)
 	return ..()

 /obj/item/clothing/head/helmet/space/hardsuit/Destroy()
@@ -890,3 +890,10 @@
 	item_color = "hawaiianblue"
 	flags_size = ONESIZEFITSALL

+/obj/item/clothing/under/misc/durathread
+	name = "durathread jumpsuit"
+	desc = "A jumpsuit made from durathread, its resilient fibres provide some protection to the wearer."
+	icon_state = "durathread"
+	item_state = "durathread"
+	item_color = "durathread"
+	armor = list(melee = 10, bullet = 0, laser = 10, energy = 0, bomb = 5, bio = 0, rad = 0)
@@ -1,7 +1,7 @@
 /datum/personal_crafting
 	var/busy
 	var/viewing_category = 1 //typical powergamer starting on the Weapons tab
-	var/list/categories = list(CAT_WEAPON,CAT_AMMO,CAT_ROBOT,CAT_FOOD,CAT_MISC,CAT_PRIMAL)
+	var/list/categories = list(CAT_WEAPON,CAT_AMMO,CAT_ROBOT,CAT_FOOD,CAT_CLOTHING,CAT_MISC,CAT_PRIMAL)
 	var/display_craftable_only = FALSE
 	var/display_compact = TRUE

@@ -0,0 +1,145 @@
+/datum/crafting_recipe/durathread_vest
+	name = "Durathread Vest"
+	result = /obj/item/clothing/suit/armor/vest/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 5,
+				/obj/item/stack/sheet/leather = 4)
+	time = 50
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_helmet
+	name = "Durathread Helmet"
+	result = /obj/item/clothing/head/helmet/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 4,
+				/obj/item/stack/sheet/leather = 5)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_jumpsuit
+	name = "Durathread Jumpsuit"
+	result = /obj/item/clothing/under/misc/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 4)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_beret
+	name = "Durathread Beret"
+	result = /obj/item/clothing/head/beret/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 2)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_beanie
+	name = "Durathread Beanie"
+	result = /obj/item/clothing/head/beanie/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 2)
+	time = 40
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/durathread_bandana
+	name = "Durathread Bandana"
+	result = /obj/item/clothing/mask/bandana/durathread
+	reqs = list(/obj/item/stack/sheet/durathread = 1)
+	time = 25
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/fannypack
+	name = "Fannypack"
+	result = /obj/item/storage/belt/fannypack
+	reqs = list(/obj/item/stack/sheet/cloth = 2,
+				/obj/item/stack/sheet/leather = 1)
+	time = 20
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunsec
+	name = "Security HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/security/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/security = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunsecremoval
+	name = "Security HUD removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunmed
+	name = "Medical HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/health/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/health = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsunmedremoval
+	name = "Medical HUD removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsundiag
+	name = "Diagnostic HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/hudsundiagremoval
+	name = "Diagnostic HUD removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/beergoggles
+	name = "Beer Goggles"
+	result = /obj/item/clothing/glasses/sunglasses/reagent
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/science = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/beergogglesremoval
+	name = "Beer Goggles removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(/obj/item/screwdriver, /obj/item/wirecutters)
+	reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/ghostsheet
+	name = "Ghost Sheet"
+	result = /obj/item/clothing/suit/ghost_sheet
+	time = 5
+	tools = list(/obj/item/wirecutters)
+	reqs = list(/obj/item/bedsheet = 1)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/cowboyboots
+	name = "Cowboy Boots"
+	result = /obj/item/clothing/shoes/cowboy
+	reqs = list(/obj/item/stack/sheet/leather = 2)
+	time = 45
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/lizardboots
+	name = "Lizard Skin Boots"
+	result = /obj/effect/spawner/lootdrop/lizardboots
+	reqs = list(/obj/item/stack/sheet/animalhide/lizard = 1, /obj/item/stack/sheet/leather = 1)
+	time = 60
+	category = CAT_CLOTHING
@@ -178,7 +178,7 @@
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "book_berner_1"

-/obj/item/clothing/glasses/sunglasses/fake/fluff/kaki //Rapidvalj: Kakicharakiti
+/obj/item/clothing/glasses/sunglasses_fake/fluff/kaki //Rapidvalj: Kakicharakiti
 	name = "broken thermonocle"
 	desc = "A weathered Vox thermonocle, doesn't seem to work anymore."
 	icon_state = "thermoncle"
@@ -1212,16 +1212,16 @@

 //////////// Sets ////////////
 // Fox P McCloud: Fox McCloud
-/obj/item/clothing/suit/jacket/fluff/fox
+/obj/item/clothing/suit/storage/fox
 	name = "Aeronautics Jacket"
 	desc = "An aviator styled jacket made from a peculiar material; this one seems very old."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "fox_jacket"
 	item_state = "fox_jacket"
-	ignore_suitadjust = TRUE
-	actions_types = list()
-	adjust_flavour = null
-	sprite_sheets = null
+	allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/projectile/revolver/detective)
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+	cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT

 /obj/item/clothing/under/fluff/fox
 	name = "Aeronautics Jumpsuit"
@@ -1232,6 +1232,12 @@
 	item_color = "fox_suit"
 	displays_id = FALSE //still appears on examine; this is pure fluff.

+/obj/item/clothing/suit/storage/fox/miljacket_desert
+	name = "rugged military jacket"
+	desc = "A rugged brown military jacket with a stylized 'A' embroidered on the back. It seems very old, yet is in near mint condition. Has a tag on the inside collar signed 'Fox McCloud'."
+	icon_state = "fox_coat"
+	item_color = "fox_coat"
+
 /obj/item/toy/plushie/fluff/fox
 	name = "orange fox plushie"
 	desc = "A cute, soft, fuzzy, fluffy, and cuddly plushie. This has a small tag on it that is signed 'Fox McCloud'."
@@ -1262,12 +1268,6 @@
 /obj/item/toy/plushie/fluff/fox/ui_action_click()
 	change_color()

-/obj/item/clothing/suit/jacket/miljacket/desert/fox
-	name = "rugged military jacket"
-	desc = "A rugged brown military jacket with a stylized 'A' embroidered on the back. It seems very old, yet is in near mint condition. Has a tag on the inside collar signed 'Fox McCloud'."
-	icon = 'icons/obj/custom_items.dmi'
-	icon_state = "fox_coat"
-	item_color = "fox_coat"

 // TheFlagbearer: Willow Walker
 /obj/item/clothing/under/fluff/arachno_suit
@@ -0,0 +1,79 @@
+/obj/item/seeds/cotton
+	name = "pack of cotton seeds"
+	desc = "A pack of seeds that'll grow into a cotton plant. Assistants make good free labor if neccesary."
+	icon_state = "seed-cotton"
+	species = "cotton"
+	plantname = "Cotton"
+	icon_harvest = "cotton-harvest"
+	product = /obj/item/grown/cotton
+	lifespan = 35
+	endurance = 25
+	maturation = 15
+	production = 1
+	yield = 2
+	potency = 50
+	growthstages = 3
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
+	icon_dead = "cotton-dead"
+	mutatelist = list(/obj/item/seeds/cotton/durathread)
+
+/obj/item/grown/cotton
+	seed = /obj/item/seeds/cotton
+	name = "cotton bundle"
+	desc = "A fluffy bundle of cotton."
+	icon_state = "cotton"
+	force = 0
+	throwforce = 0
+	w_class = WEIGHT_CLASS_TINY
+	throw_speed = 2
+	throw_range = 3
+	attack_verb = list("pomfed")
+	var/cotton_type = /obj/item/stack/sheet/cotton
+	var/cotton_name = "raw cotton"
+
+/obj/item/grown/cotton/attack_self(mob/user)
+	user.show_message("<span class='notice'>You pull some [cotton_name] out of the [name]!</span>", 1)
+	var/seed_modifier = 0
+	if(seed)
+		seed_modifier = round(seed.potency / 25)
+	var/obj/item/stack/cotton = new cotton_type(user.loc, 1 + seed_modifier)
+	var/old_cotton_amount = cotton.amount
+	for(var/obj/item/stack/ST in user.loc)
+		if(ST != cotton && istype(ST, cotton_type) && ST.amount < ST.max_amount)
+			ST.attackby(cotton, user)
+	if(cotton.amount > old_cotton_amount)
+		to_chat(user, "<span class='notice'>You add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].</span>")
+	qdel(src)
+
+//reinforced mutated variant
+/obj/item/seeds/cotton/durathread
+	name = "pack of durathread seeds"
+	desc = "A pack of seeds that'll grow into an extremely durable thread that could easily rival plasteel if woven properly."
+	icon_state = "seed-durathread"
+	species = "durathread"
+	plantname = "Durathread"
+	icon_harvest = "durathread-harvest"
+	product = /obj/item/grown/cotton/durathread
+	lifespan = 80
+	endurance = 50
+	maturation = 15
+	production = 1
+	yield = 2
+	potency = 50
+	growthstages = 3
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
+	icon_dead = "cotton-dead"
+
+/obj/item/grown/cotton/durathread
+	seed = /obj/item/seeds/cotton/durathread
+	name = "durathread bundle"
+	desc = "A tough bundle of durathread, good luck unraveling this."
+	icon_state = "durathread"
+	force = 5
+	throwforce = 5
+	w_class = WEIGHT_CLASS_NORMAL
+	throw_speed = 2
+	throw_range = 3
+	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
+	cotton_type = /obj/item/stack/sheet/cotton/durathread
+	cotton_name = "raw durathread"
@@ -88,7 +88,7 @@
 		make_podman = 0

 	if(make_podman)	//all conditions met!
-		var/mob/living/carbon/human/diona/podman = new /mob/living/carbon/human/diona(parent.loc)
+		var/mob/living/carbon/human/pod_diona/podman = new /mob/living/carbon/human/pod_diona(parent.loc)
 		if(realName)
 			podman.real_name = realName
 		mind.transfer_to(podman)
@@ -95,7 +95,7 @@
 /obj/item/seeds/redbeet
 	name = "pack of redbeet seeds"
 	desc = "These seeds grow into red beet producing plants."
-	icon_state = "seedredbeet"
+	icon_state = "seed-redbeet"
 	species = "redbeet"
 	plantname = "Red Beet Plants"
 	product = /obj/item/reagent_containers/food/snacks/grown/redbeet
@@ -209,7 +209,7 @@
 		if(istype(T, denied_type) || istype(src, T.denied_type))
 			to_chat(user, "<span class='warning'>You can't seem to attach [src] to [H]. Maybe remove a few trophies?</span>")
 			return FALSE
-	if(!user.drop_item())
+	if(!user.unEquip(src))
 		return
 	forceMove(H)
 	H.trophies += src
@@ -73,9 +73,10 @@
 	icon = 'icons/obj/mobcap.dmi'
 	icon_state = "mobcap0"
 	w_class = WEIGHT_CLASS_TINY
-	throw_range = 20
+	throw_range = 7
 	var/mob/living/simple_animal/captured = null
 	var/colorindex = 0
+	var/capture_type = SENTIENCE_ORGANIC //So you can't capture boss monsters or robots with it

 /obj/item/mobcapsule/Destroy()
 	if(captured)
@@ -83,26 +84,25 @@
 		QDEL_NULL(captured)
 	return ..()

-/obj/item/mobcapsule/attack(var/atom/A, mob/user, prox_flag)
-	if(!istype(A, /mob/living/simple_animal) || isbot(A))
-		return ..()
-	capture(A, user)
-	return 1
+/obj/item/mobcapsule/attack(mob/living/simple_animal/S, mob/user, prox_flag)
+	if(istype(S) && S.sentience_type == capture_type)
+		capture(S, user)
+		return TRUE
+	return ..()

-/obj/item/mobcapsule/proc/capture(var/mob/target, var/mob/U as mob)
-	var/mob/living/simple_animal/T = target
+/obj/item/mobcapsule/proc/capture(mob/living/simple_animal/S, mob/living/M)
 	if(captured)
-		to_chat(U, "<span class='notice'>Capture failed!</span>: The capsule already has a mob registered to it!")
+		to_chat(M, "<span class='notice'>Capture failed!</span>: The capsule already has a mob registered to it!")
 	else
-		if(istype(T) && "neutral" in T.faction)
-			T.forceMove(src)
-			T.name = "[U.name]'s [initial(T.name)]"
-			T.cancel_camera()
-			name = "Lazarus Capsule: [initial(T.name)]"
-			to_chat(U, "<span class='notice'>You placed a [T.name] inside the Lazarus Capsule!</span>")
-			captured = T
+		if("neutral" in S.faction)
+			S.forceMove(src)
+			S.name = "[M.name]'s [initial(S.name)]"
+			S.cancel_camera()
+			name = "Lazarus Capsule: [initial(S.name)]"
+			to_chat(M, "<span class='notice'>You placed a [S.name] inside the Lazarus Capsule!</span>")
+			captured = S
 		else
-			to_chat(U, "You can't capture that mob!")
+			to_chat(M, "You can't capture that mob!")

 /obj/item/mobcapsule/throw_impact(atom/A, mob/user)
 	..()
@@ -77,6 +77,21 @@

 			add_fingerprint(M)

+//Book of Babel
+
+/obj/item/book_of_babel
+	name = "Book of Babel"
+	desc = "An ancient tome written in countless tongues."
+	icon = 'icons/obj/library.dmi'
+	icon_state = "book1"
+	w_class = 2
+
+/obj/item/book_of_babel/attack_self(mob/user)
+	to_chat(user, "You flip through the pages of the book, quickly and conveniently learning every language in existence. Somewhat less conveniently, the aging book crumbles to dust in the process. Whoops.")
+	user.grant_all_languages()
+	new /obj/effect/decal/cleanable/ash(get_turf(user))
+	qdel(src)
+
 //Potion of Flight: as we do not have the "Angel" species this currently does not work.

 /obj/item/reagent_containers/glass/bottle/potion
@@ -117,6 +132,30 @@
 		H.emote("scream")
 	..()*/

+/obj/item/jacobs_ladder
+	name = "jacob's ladder"
+	desc = "A celestial ladder that violates the laws of physics."
+	icon = 'icons/obj/structures.dmi'
+	icon_state = "ladder00"
+
+/obj/item/jacobs_ladder/attack_self(mob/user)
+	var/turf/T = get_turf(src)
+	var/ladder_x = T.x
+	var/ladder_y = T.y
+	to_chat(user, "<span class='notice'>You unfold the ladder. It extends much farther than you were expecting.</span>")
+	var/last_ladder = null
+	for(var/i in 1 to world.maxz)
+		if(is_admin_level(i) || is_away_level(i))
+			continue
+		var/turf/T2 = locate(ladder_x, ladder_y, i)
+		last_ladder = new /obj/structure/ladder/unbreakable/jacob(T2, null, last_ladder)
+	qdel(src)
+
+// Inherit from unbreakable but don't set ID, to suppress the default Z linkage
+/obj/structure/ladder/unbreakable/jacob
+	name = "jacob's ladder"
+	desc = "An indestructible celestial ladder that violates the laws of physics."
+
 //Boat

 /obj/vehicle/lavaboat
@@ -18,7 +18,7 @@
 	if(!add_loot)
 		return

-	var/loot = rand(1,25)
+	var/loot = rand(1, 26)
 	switch(loot)
 		if(1)
 			new /obj/item/shared_storage/red(src)
@@ -48,7 +48,7 @@
 		if(11)
 			new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/berserker(src)
 		if(12)
-			new /obj/item/sord(src)
+			new /obj/item/jacobs_ladder(src)
 		if(13)
 			new /obj/item/nullrod/scythe/talking(src)
 		if(14)
@@ -78,6 +78,8 @@
 		if(24)
 			new /obj/item/spellbook/oneuse/summonitem(src)
 		if(25)
+			new /obj/item/book_of_babel(src)
+		if(26)
 			new /obj/item/borg/upgrade/modkit/lifesteal(src)
 			new /obj/item/bedsheet/cult(src)

@@ -37,7 +37,7 @@
 		new /datum/data/mining_equipment("Lazarus Injector",			/obj/item/lazarus_injector,											1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/pickaxe/silver,											1000),
 		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffel/mining_conscript,					1500),
-		new /datum/data/mining_equipment("Jetpack",             		/obj/item/tank/jetpack/carbondioxide/mining,               			2000),
+		new /datum/data/mining_equipment("Jetpack Upgrade",				/obj/item/tank/jetpack/suit,										2000),
 		new /datum/data/mining_equipment("Mining Hardsuit",				/obj/item/clothing/suit/space/hardsuit/mining,						2000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",				/obj/item/pickaxe/diamond,											2000),
 		new /datum/data/mining_equipment("Super Resonator",				/obj/item/resonator/upgraded,										2500),
@@ -44,8 +44,8 @@

 /obj/structure/closet/secure_closet/miner/New()
 	..()
-//	new /obj/item/stack/sheet/mineral/sandbags(src, 5)
-//	new /obj/item/storage/box/emptysandbags(src)
+	new /obj/item/stack/sheet/mineral/sandbags(src, 5)
+	new /obj/item/storage/box/emptysandbags(src)
 	new /obj/item/shovel(src)
 	new /obj/item/pickaxe/mini(src)
 	new /obj/item/radio/headset/headset_cargo/mining(src)
@@ -762,6 +762,8 @@
 	desc = "Bark bark bark."
 	key = "vu"

-
+/mob/proc/grant_all_languages()
+	for(var/la in GLOB.all_languages)
+		add_language(la)

 #undef SCRAMBLE_CACHE_LEN
@@ -16,7 +16,7 @@

 /mob/living/carbon/water_act(volume, temperature, source, method = TOUCH)
 	. = ..()
-	if(volume > 10) //anything over 10 volume will make the mob wetter.
+	if(volume > 10) // Anything over 10 volume will make the mob wetter.
 		wetlevel = min(wetlevel + 1,5)

 /mob/living/carbon/attackby(obj/item/I, mob/user, params)
@@ -390,7 +390,7 @@
 					S = H.glasses
 				return !istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/security) && S && S.read_only
 			if("medical")
-				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(H.glasses, /obj/item/clothing/glasses/hud/health/health_advanced) ||  istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/medical)
+				return istype(H.glasses, /obj/item/clothing/glasses/hud/health) || istype(CIH,/obj/item/organ/internal/cyberimp/eyes/hud/medical)
 			else
 				return 0
 	else if(isrobot(M) || isAI(M)) //Stand-in/Stopgap to prevent pAIs from freely altering records, pending a more advanced Records system
--- a/Show More
+++ b/Show More