[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise (#2162)

* Ports Rapid Cable Layers from /vg/ and paradise

* rej clean up + manual sync

* maps and .rej file cleanup

* sprite and WGW memes

* actual spellchecked memes

* some other map fix memes

* fuck it, let's just hard sync maps

* dumb paperwork shit for maps

* Revert "dumb paperwork shit for maps"

This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.

* *autistic screeching*

* REEEEEEEEEEEEEEEEEEEEE

* Fuck off I want to do something else

code/__DEFINES/DNA.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm	(rejected hunks)
-@@ -114,4 +114,6 @@
- #define EASYLIMBATTACHMENT 23
- #define TOXINLOVER		24
- #define DIGITIGRADE		25	//Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi)
--#define NO_UNDERWEAR		26
-+#define NO_UNDERWEAR	26
-+#define NOLIVER			27
-+#define NOSTOMACH		28

code/__DEFINES/combat.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm	(rejected hunks)
-@@ -9,6 +9,7 @@
- #define OXY			"oxy"
- #define CLONE		"clone"
- #define STAMINA 	"stamina"
-+#define BRAIN		"brain"
- 
- //bitflag damage defines used for suicide_act
- #define BRUTELOSS 1

code/__DEFINES/sound.dm.rej

@@ -1,51 +0,0 @@
-diff a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm	(rejected hunks)
-@@ -5,42 +5,15 @@
- #define CHANNEL_JUKEBOX 1021
- #define CHANNEL_JUSTICAR_ARK 1020
- #define CHANNEL_HEARTBEAT 1019 //sound channel for heartbeats
-+#define CHANNEL_AMBIENCE 1018
-+#define CHANNEL_BUZZ 1017
-+#define CHANNEL_BICYCLE 1016
- 
- //THIS SHOULD ALWAYS BE THE LOWEST ONE!
- //KEEP IT UPDATED
- 
--#define CHANNEL_HIGHEST_AVAILABLE 1018
-+#define CHANNEL_HIGHEST_AVAILABLE 1015
- 
- 
- #define SOUND_MINIMUM_PRESSURE 10
--#define FALLOFF_SOUNDS 0.5
--
--//BYOND Sound Environment defines
--
--#define SOUND_ENV_DEFAULT			-1
--#define SOUND_ENV_GENERIC			0
--#define SOUND_ENV_PADDED_CELL		1
--#define SOUND_ENV_ROOM				2
--#define SOUND_ENV_BATHROOM			3
--#define SOUND_ENV_LIVINGROOM		4
--#define SOUND_ENV_STONEROOM			5
--#define SOUND_ENV_AUDITORIUM		6
--#define SOUND_ENV_CONCERT_HALL		7
--#define SOUND_ENV_CAVE				8
--#define SOUND_ENV_ARENA				9
--#define SOUND_ENV_HANGAR			10
--#define SOUND_ENV_CARPETTED_HALLWAY	11
--#define SOUND_ENV_HALLWAY			12
--#define SOUND_ENV_STONE_CORRIDOOR	13
--#define SOUND_ENV_ALLEY				14
--#define SOUND_ENV_FOREST			15
--#define SOUND_ENV_CITY				16
--#define SOUND_ENV_MOUNTAINS			17
--#define SOUND_ENV_QUARRY			18
--#define SOUND_ENV_PLAIN				19
--#define SOUND_ENV_PARKING_LOT		20
--#define SOUND_ENV_SEWER_PIPE		21
--#define SOUND_ENV_UNDERWATER		22
--#define SOUND_ENV_DRUGGED			23
--#define SOUND_ENV_DIZZY				24
--#define SOUND_ENV_PSYCHOTIC			25
-\ No newline at end of file
-+#define FALLOFF_SOUNDS 0.5
-\ No newline at end of file

code/datums/action.dm

@@ -168,6 +168,10 @@
 
 /datum/action/item_action/toggle_firemode
 	name = "Toggle Firemode"
+	
+/datum/action/item_action/rcl
+	name = "Change Cable Color"
+	button_icon_state = "rcl_rainbow"
 
 /datum/action/item_action/startchainsaw
 	name = "Pull The Starting Cord"

code/datums/components/component.dm.rej

@@ -1,35 +0,0 @@
-diff a/code/datums/components/component.dm b/code/datums/components/component.dm	(rejected hunks)
-@@ -47,12 +47,14 @@
- 	
- 	procs[sig_type] = CALLBACK(src, proc_on_self)    
- 
--/datum/component/proc/ReceiveSignal(sigtype, list/sig_args)
-+/datum/component/proc/ReceiveSignal(sigtype, ...)
- 	var/list/sps = signal_procs
- 	var/datum/callback/CB = LAZYACCESS(sps, sigtype)
- 	if(!CB)
- 		return FALSE
--	return CB.InvokeAsync(arglist(sig_args))
-+	var/list/arguments = args.Copy()
-+	arguments.Cut(1, 2)
-+	return CB.InvokeAsync(arglist(arguments))
- 
- /datum/component/proc/InheritComponent(datum/component/C, i_am_original)
- 	return
-@@ -62,14 +64,14 @@
- 
- /datum/var/list/datum_components //list of /datum/component
- 
--/datum/proc/SendSignal(sigtype, list/sig_args)
-+/datum/proc/SendSignal(sigtype, ...)
- 	var/list/comps = datum_components
- 	. = FALSE
- 	for(var/I in comps)
- 		var/datum/component/C = I
- 		if(!C.enabled)
- 			continue
--		if(C.ReceiveSignal(sigtype, sig_args))
-+		if(C.ReceiveSignal(arglist(args)))
- 			ComponentActivated(C)
- 			. = TRUE
- 

code/datums/diseases/advance/symptoms/sensory.dm.rej

@@ -1,134 +0,0 @@
-diff a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm	(rejected hunks)
-@@ -23,106 +23,43 @@ Bonus
- 	transmittable = -3
- 	level = 5
- 	severity = 0
-+	symptom_delay_min = 5
-+	symptom_delay_max = 10
-+	var/purge_alcohol = FALSE
-+	var/brain_heal = FALSE
- 
--/datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A)
-+/datum/symptom/sensory_restoration/Start(datum/disease/advance/A)
- 	..()
-+	if(A.properties["resistance"] >= 6) //heal brain damage
-+		brain_heal = TRUE
-+	if(A.properties["transmittable"] >= 8) //purge alcohol
-+		purge_alcohol = TRUE
-+
-+/datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A)
-+	if(!..())
-+		return
- 	var/mob/living/M = A.affected_mob
- 	if(A.stage >= 2)
- 		M.restoreEars()
- 
- 	if(A.stage >= 3)
--		M.dizziness = 0
--		M.drowsyness = 0
--		M.slurring = 0
--		M.confused = 0
--		M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3)
--		if(ishuman(M))
--			var/mob/living/carbon/human/H = M
--			H.drunkenness = max(H.drunkenness - 10, 0)
-+		M.dizziness = max(0, M.dizziness - 2)
-+		M.drowsyness = max(0, M.drowsyness - 2)
-+		M.slurring = max(0, M.slurring - 2)
-+		M.confused = max(0, M.confused - 2)
-+		if(purge_alcohol)
-+			M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3)
-+			if(ishuman(M))
-+				var/mob/living/carbon/human/H = M
-+				H.drunkenness = max(H.drunkenness - 5, 0)
- 
- 	if(A.stage >= 4)
--		M.drowsyness = max(M.drowsyness-5, 0)
-+		M.drowsyness = max(0, M.drowsyness - 2)
- 		if(M.reagents.has_reagent("mindbreaker"))
- 			M.reagents.remove_reagent("mindbreaker", 5)
- 		if(M.reagents.has_reagent("histamine"))
- 			M.reagents.remove_reagent("histamine", 5)
- 		M.hallucination = max(0, M.hallucination - 10)
- 
--	if(A.stage >= 5)
--		M.adjustBrainLoss(-3)
--
--/*
--//////////////////////////////////////
--Sensory-Destruction
--	noticable.
--	Lowers resistance
--	Decreases stage speed tremendously.
--	Decreases transmittablity tremendously.
--	the drugs hit them so hard they have to focus on not dying
--
--Bonus
--	The body generates Sensory destructive chemicals.
--	You cannot taste anything anymore.
--	ethanol for extremely drunk victim
--	mindbreaker to break the mind
--	impedrezene to ruin the brain
--
--//////////////////////////////////////
--*/
--/datum/symptom/sensory_destruction
--	name = "Sensory destruction"
--	stealth = -1
--	resistance = -2
--	stage_speed = -3
--	transmittable = -4
--	level = 6
--	severity = 5
--	var/sleepy = 0
--	var/sleepy_ticks = 0
--
--/datum/symptom/sensory_destruction/Activate(var/datum/disease/advance/A)
--	..()
--	var/mob/living/M = A.affected_mob
--	if(prob(SYMPTOM_ACTIVATION_PROB))
--		switch(A.stage)
--			if(1)
--				to_chat(M, "<span class='warning'>You can't feel anything.</span>")
--			if(2)
--				to_chat(M, "<span class='warning'>You feel absolutely hammered.</span>")
--				if(prob(10))
--					sleepy_ticks += rand(10,14)
--			if(3)
--				M.reagents.add_reagent("ethanol",rand(5,7))
--				to_chat(M, "<span class='warning'>You try to focus on not dying.</span>")
--				if(prob(15))
--					sleepy_ticks += rand(10,14)
--			if(4)
--				M.reagents.add_reagent("ethanol",rand(6,10))
--				to_chat(M, "<span class='warning'>u can count 2 potato!</span>")
--				if(prob(20))
--					sleepy_ticks += rand(10,14)
--			if(5)
--				M.reagents.add_reagent("ethanol",rand(7,13))
--				if(prob(25))
--					sleepy_ticks += rand(10,14)
--
--	if(sleepy_ticks)
--		if(A.stage>=4)
--			M.hallucination = min(M.hallucination + 10, 50)
--		if(A.stage>=5)
--			if(prob(80))
--				M.adjustBrainLoss(1)
--			if(prob(50))
--				M.drowsyness = max(M.drowsyness, 3)
--		sleepy++
--		sleepy_ticks--
--	else
--		sleepy = 0
--
--	switch(sleepy) //Works like morphine
--		if(11)
--			to_chat(M, "<span class='warning'>You start to feel tired...</span>")
--		if(12 to 24)
--			M.drowsyness += 1
--		if(24 to INFINITY)
--			M.Sleeping(2, 0)
-+	if(brain_heal && A.stage >= 5)
-+		M.adjustBrainLoss(-3)
-\ No newline at end of file

code/datums/diseases/advance/symptoms/vision.dm.rej

@@ -1,19 +0,0 @@
-diff a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm	(rejected hunks)
-@@ -40,7 +40,7 @@ Bonus
- 	if(!..())
- 		return
- 	var/mob/living/carbon/M = A.affected_mob
--	var/obj/item/organ/eyes = M.getorganslot("eye_sight")
-+	var/obj/item/organ/eyes/eyes = M.getorganslot("eye_sight")
- 	if(istype(eyes))
- 		switch(A.stage)
- 			if(1, 2)
-@@ -55,7 +55,7 @@ Bonus
- 				M.adjust_eye_damage(5)
- 				if(eyes.eye_damage >= 10)
- 					M.become_nearsighted()
--				if(prob(M.eye_damage - 10 + 1))
-+				if(prob(eyes.eye_damage - 10 + 1))
- 					if(!remove_eyes)
- 						if(M.become_blind())
- 							to_chat(M, "<span class='userdanger'>You go blind!</span>")

code/datums/diseases/advance/symptoms/vomit.dm.rej

@@ -1,30 +0,0 @@
-diff a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm	(rejected hunks)
-@@ -32,7 +32,7 @@ Bonus
- 	symptom_delay_min = 25
- 	symptom_delay_max = 80
- 	var/vomit_blood = FALSE
--	var/proj_vomit = FALSE
-+	var/proj_vomit = 0
- 
- /datum/symptom/vomit/Start(datum/disease/advance/A)
- 	..()
-@@ -41,7 +41,7 @@ Bonus
- 	if(A.properties["resistance"] >= 7) //blood vomit
- 		vomit_blood = TRUE
- 	if(A.properties["transmittable"] >= 7) //projectile vomit
--		proj_vomit = TRUE
-+		proj_vomit = 5
- 
- /datum/symptom/vomit/Activate(datum/disease/advance/A)
- 	if(!..())
-@@ -52,7 +52,7 @@ Bonus
- 			if(prob(base_message_chance) && !suppress_warning)
- 				to_chat(M, "<span class='warning'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>")
- 		else
--			Vomit(M)
-+			vomit(M)
- 
--/datum/symptom/vomit/proc/Vomit(mob/living/carbon/M)
--	M.vomit(20, vomit_blood, distance = 5 * proj_vomit)
-+/datum/symptom/vomit/proc/vomit(mob/living/carbon/M)
-+	M.vomit(20, vomit_blood, distance = proj_vomit)

code/game/area/areas/derelict.dm

@@ -13,6 +13,10 @@
 	name = "Derelict Secondary Hallway"
 	icon_state = "hallS"
 
+/area/derelict/hallway/primary/port
+	name = "Derelict Port Hallway"
+	icon_state = "hallFP"
+
 /area/derelict/arrival
 	name = "Derelict Arrival Centre"
 	icon_state = "yellow"
@@ -121,4 +125,4 @@
 	name = "Abandoned Teleporter"
 	icon_state = "teleporter"
 	music = "signal"
-	ambientsounds = list('sound/ambience/ambimalf.ogg')
+	ambientsounds = list('sound/ambience/ambimalf.ogg')

code/game/atoms.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/atoms.dm b/code/game/atoms.dm	(rejected hunks)
-@@ -126,7 +126,7 @@
- 			return TRUE
- 
- 	//finally check for centcom itself
--	return istype(T.loc,/area/centcom)
-+	return istype(T.loc, /area/centcom)
- 
- /atom/proc/onSyndieBase()
- 	var/turf/T = get_turf(src)

code/game/gamemodes/game_mode.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm	(rejected hunks)
-@@ -266,7 +266,7 @@
- 	if(escaped_total > 0)
- 		SSblackbox.set_val("escaped_total",escaped_total)
- 	send2irc("Server", "Round just ended.")
--	if(cult.len && !istype(SSticker.mode,/datum/game_mode/cult))
-+	if(cult.len && !istype(SSticker.mode, /datum/game_mode/cult))
- 		datum_cult_completion()
- 
- 	return 0

code/game/machinery/iv_drip.dm.rej

@@ -1,35 +0,0 @@
-diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm	(rejected hunks)
-@@ -1,21 +1,29 @@
-+#define IV_TAKING 0
-+#define IV_INJECTING 1
-+
- /obj/machinery/iv_drip
- 	name = "\improper IV drip"
- 	icon = 'icons/obj/iv_drip.dmi'
- 	icon_state = "iv_drip"
--	anchored = 0
-+	anchored = FALSE
- 	mouse_drag_pointer = MOUSE_ACTIVE_POINTER
- 	var/mob/living/carbon/attached = null
--	var/mode = 1 // 1 is injecting, 0 is taking blood.
-+	var/mode = IV_INJECTING
- 	var/obj/item/weapon/reagent_containers/beaker = null
- 	var/list/drip_containers = list(/obj/item/weapon/reagent_containers/blood,
--											/obj/item/weapon/reagent_containers/food,
--											/obj/item/weapon/reagent_containers/glass)
-+									/obj/item/weapon/reagent_containers/food,
-+									/obj/item/weapon/reagent_containers/glass)
- 
- /obj/machinery/iv_drip/Initialize()
- 	..()
- 	update_icon()
- 	drip_containers = typecacheof(drip_containers)
- 
-+/obj/machinery/iv_drip/Destroy()
-+	attached = null
-+	QDEL_NULL(beaker)
-+	return ..()
-+
- /obj/machinery/iv_drip/update_icon()
- 	if(attached)
- 		if(mode)

code/game/objects/effects/spawners/gibspawner.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm	(rejected hunks)
-@@ -52,7 +52,7 @@
- 	. = ..()
- 
- /obj/effect/gibspawner/human
--	gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/up,/obj/effect/decal/cleanable/blood/gibs/down,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/body,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/effect/decal/cleanable/blood/gibs/core)
-+	gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/up, /obj/effect/decal/cleanable/blood/gibs/down, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood/gibs/limb, /obj/effect/decal/cleanable/blood/gibs/core)
- 	gibamounts = list(1,1,1,1,1,1,1)
- 
- /obj/effect/gibspawner/human/Initialize()

code/game/objects/items/shooting_range.dm

@@ -49,6 +49,9 @@
 	desc = "A shooting target that looks like a xenomorphic alien."
 	hp = 2350
 
+/obj/item/target/alien/anchored
+	anchored = TRUE
+
 /obj/item/target/clown
 	icon_state = "target_c"
 	desc = "A shooting target that looks like a useless clown."

code/game/objects/items/weapons/RCL.dm

@@ -0,0 +1,202 @@
+/obj/item/weapon/twohanded/rcl
+	name = "rapid cable layer"
+	desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!"
+	icon = 'icons/obj/tools.dmi'
+	icon_state = "rcl-0"
+	item_state = "rcl-0"
+	var/obj/structure/cable/last
+	var/obj/item/stack/cable_coil/loaded
+	opacity = FALSE
+	force = 5 //Plastic is soft
+	throwforce = 5
+	throw_speed = 1
+	throw_range = 7
+	w_class = WEIGHT_CLASS_NORMAL
+	origin_tech = "engineering=4;materials=2"
+	var/max_amount = 90
+	var/active = FALSE
+	actions_types = list(/datum/action/item_action/rcl)
+	var/list/colors = list("red", "yellow", "green", "blue", "pink", "orange", "cyan", "white")
+	var/current_color_index = 1
+	var/ghetto = FALSE
+
+/obj/item/weapon/twohanded/rcl/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/stack/cable_coil))
+		var/obj/item/stack/cable_coil/C = W
+		if(user.transferItemToLoc(W, src))
+			loaded = W
+			loaded.max_amount = max_amount //We store a lot.
+		else
+			to_chat(user, "<span class='warning'>[src] is stuck to your hand!</span>")
+			return
+
+		if(loaded.amount < max_amount)
+			var/amount = min(loaded.amount + C.amount, max_amount)
+			C.use(amount - loaded.amount)
+			loaded.amount = amount
+		else
+			return
+		update_icon()
+		to_chat(user, "<span class='notice'>You add the cables to the [src]. It now contains [loaded.amount].</span>")
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(!loaded)
+			return
+		if(ghetto && prob(10)) //Is it a ghetto RCL? If so, give it a 10% chance to fall apart
+			to_chat(user, "<span class='warning'>You attempt to loosen the securing screws on the side, but it falls apart!</span>")
+			while(loaded.amount > 30) //There are only two kinds of situations: "nodiff" (60,90), or "diff" (31-59, 61-89)
+				var/diff = loaded.amount % 30
+				if(diff)
+					loaded.use(diff)
+					new /obj/item/stack/cable_coil(get_turf(user), diff)
+				else
+					loaded.use(30)
+					new /obj/item/stack/cable_coil(get_turf(user), 30)
+			qdel(src)
+			return
+
+		to_chat(user, "<span class='notice'>You loosen the securing screws on the side, allowing you to lower the guiding edge and retrieve the wires.</span>")
+		while(loaded.amount > 30) //There are only two kinds of situations: "nodiff" (60,90), or "diff" (31-59, 61-89)
+			var/diff = loaded.amount % 30
+			if(diff)
+				loaded.use(diff)
+				new /obj/item/stack/cable_coil(get_turf(user), diff)
+			else
+				loaded.use(30)
+				new /obj/item/stack/cable_coil(get_turf(user), 30)
+		loaded.max_amount = initial(loaded.max_amount)
+		if(!user.put_in_hands(loaded))
+			loaded.forceMove(get_turf(user))
+
+		loaded = null
+		update_icon()
+	else
+		..()
+
+/obj/item/weapon/twohanded/rcl/examine(mob/user)
+	..()
+	if(loaded)
+		to_chat(user, "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>")
+
+/obj/item/weapon/twohanded/rcl/Destroy()
+	QDEL_NULL(loaded)
+	last = null
+	active = FALSE
+	return ..()
+
+/obj/item/weapon/twohanded/rcl/update_icon()
+	if(!loaded)
+		icon_state = "rcl-0"
+		item_state = "rcl-0"
+		return
+	switch(loaded.amount)
+		if(61 to INFINITY)
+			icon_state = "rcl-30"
+			item_state = "rcl"
+		if(31 to 60)
+			icon_state = "rcl-20"
+			item_state = "rcl"
+		if(1 to 30)
+			icon_state = "rcl-10"
+			item_state = "rcl"
+		else
+			icon_state = "rcl-0"
+			item_state = "rcl-0"
+
+/obj/item/weapon/twohanded/rcl/proc/is_empty(mob/user, loud = 1)
+	update_icon()
+	if(!loaded || !loaded.amount)
+		if(loud)
+			to_chat(user, "<span class='notice'>The last of the cables unreel from [src].</span>")
+		if(loaded)
+			QDEL_NULL(loaded)
+			loaded = null
+		unwield(user)
+		active = wielded
+		return TRUE
+	return FALSE
+
+/obj/item/weapon/twohanded/rcl/dropped(mob/wearer)
+	..()
+	active = FALSE
+	last = null
+
+/obj/item/weapon/twohanded/rcl/attack_self(mob/user)
+	..()
+	active = wielded
+	if(!active)
+		last = null
+	else if(!last)
+		for(var/obj/structure/cable/C in get_turf(user))
+			if(C.d1 == FALSE || C.d2 == FALSE)
+				last = C
+				break
+
+/obj/item/weapon/twohanded/rcl/on_mob_move(direct, mob/user)
+	if(active)
+		trigger(user)
+
+/obj/item/weapon/twohanded/rcl/proc/trigger(mob/user)
+	if(!isturf(user.loc))
+		return
+	if(is_empty(user, 0))
+		to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
+		return
+
+	if(prob(2) && ghetto) //Give ghetto RCLs a 2% chance to jam, requiring it to be reactviated manually.
+		to_chat(user, "<span class='warning'>[src]'s wires jam!</span>")
+		active = FALSE
+		return
+	else
+		if(last)
+			if(get_dist(last, user) == 1) //hacky, but it works
+				var/turf/T = get_turf(user)
+				if(T.intact || !T.can_have_cabling())
+					last = null
+					return
+				if(get_dir(last, user) == last.d2)
+					//Did we just walk backwards? Well, that's the one direction we CAN'T complete a stub.
+					last = null
+					return
+				loaded.cable_join(last, user, FALSE)
+				if(is_empty(user))
+					return //If we've run out, display message and exit
+			else
+				last = null
+		loaded.item_color	 = colors[current_color_index]
+		last = loaded.place_turf(get_turf(src), user, turn(user.dir, 180))
+		is_empty(user) //If we've run out, display message
+
+
+/obj/item/weapon/twohanded/rcl/pre_loaded/Initialize () //Comes preloaded with cable, for testing stuff
+	. = ..()
+	loaded = new()
+	loaded.max_amount = max_amount
+	loaded.amount = max_amount
+	update_icon()
+
+/obj/item/weapon/twohanded/rcl/ui_action_click(mob/user, action)
+	if(istype(action, /datum/action/item_action/rcl))
+		current_color_index++;
+		if (current_color_index > colors.len)
+			current_color_index = 1
+		var/cwname = colors[current_color_index]
+		to_chat(user, "Color changed to [cwname]!")
+
+/obj/item/weapon/twohanded/rcl/ghetto
+	actions_types = list()
+	max_amount = 30
+	name = "makeshift rapid cable layer"
+	ghetto = TRUE
+
+/obj/item/weapon/twohanded/rcl/ghetto/update_icon()
+	if(!loaded)
+		icon_state = "rclg-0"
+		item_state = "rclg-0"
+		return
+	switch(loaded.amount)
+		if(1 to INFINITY)
+			icon_state = "rclg-1"
+			item_state = "rcl"
+		else
+			icon_state = "rclg-1"
+			item_state = "rclg-1"

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

@@ -162,6 +162,26 @@
 	buildstackamount = 10
 	var/mob/living/owner = null
 
+/obj/structure/bed/dogbed/ian
+	desc = "Ian's bed! Looks comfy."
+	name = "Ian's bed"
+	anchored = TRUE
+
+/obj/structure/bed/dogbed/cayenne
+	desc = "Seems kind of... fishy."
+	name = "Cayenne's bed"
+	anchored = TRUE
+
+/obj/structure/bed/dogbed/renault
+	desc = "Renault's bed! Looks comfy. A foxy person needs a foxy pet."
+	name = "Renault's bed"
+	anchored = TRUE
+
+/obj/structure/bed/dogbed/runtime
+	desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."
+	name = "Runtime's bed"
+	anchored = TRUE
+
 /obj/structure/bed/dogbed/proc/update_owner(mob/living/M)
 	owner = M
 	name = "[M]'s bed"
@@ -174,4 +194,4 @@
 /obj/structure/bed/alien
 	name = "resting contraption"
 	desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
-	icon_state = "abed"
+	icon_state = "abed"

code/game/objects/structures/crates_lockers/closets/secure/security.dm.rej

@@ -1,30 +0,0 @@
-diff a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm	(rejected hunks)
-@@ -203,7 +203,7 @@
- 	anchored = TRUE
- 	name = "Secure Evidence Closet"
- 	req_access_txt = "0"
--	req_one_access_txt = list(GLOB.access_armory, GLOB.access_forensics_lockers)
-+	req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS)
- 
- /obj/structure/closet/secure_closet/brig/PopulateContents()
- 	..()
-@@ -227,16 +227,16 @@
- /obj/structure/closet/secure_closet/contraband/armory
- 	anchored = TRUE
- 	name = "Contraband Locker"
--	req_access = list(GLOB.access_armory)
-+	req_access = list(ACCESS_ARMORY)
- 
- /obj/structure/closet/secure_closet/contraband/heads
- 	anchored = TRUE
- 	name = "Contraband Locker"
--	req_access = list(GLOB.access_heads)
-+	req_access = list(ACCESS_HEADS)
- 
- /obj/structure/closet/secure_closet/armory1
- 	name = "armory armor locker"
--	req_access = list(GLOB.access_armory)
-+	req_access = list(ACCESS_ARMORY)
- 	icon_state = "armory"
- 
- /obj/structure/closet/secure_closet/armory1/PopulateContents()

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

@@ -17,6 +17,9 @@
 	desc = "It's a storage unit for emergency breath masks and O2 tanks."
 	icon_state = "emergency"
 
+/obj/structure/closet/emcloset/anchored
+	anchored = TRUE
+
 /obj/structure/closet/emcloset/PopulateContents()
 	..()
 

code/game/objects/structures/reflector.dm

@@ -148,6 +148,9 @@
 	buildstacktype = /obj/item/stack/sheet/glass
 	buildstackamount = 5
 
+/obj/structure/reflector/single/anchored
+	anchored = TRUE
+
 /obj/structure/reflector/single/get_reflection(srcdir,pdir)
 	var/new_dir = rotations["[srcdir]"]["[pdir]"]
 	return new_dir
@@ -171,6 +174,9 @@
 	buildstacktype = /obj/item/stack/sheet/rglass
 	buildstackamount = 10
 
+/obj/structure/reflector/double/anchored
+	anchored = TRUE
+
 /obj/structure/reflector/double/get_reflection(srcdir,pdir)
 	var/new_dir = double_rotations["[srcdir]"]["[pdir]"]
 	return new_dir
@@ -194,6 +200,9 @@
 	buildstacktype = /obj/item/stack/sheet/mineral/diamond
 	buildstackamount = 1
 
+/obj/structure/reflector/box/anchored
+	anchored = TRUE
+
 /obj/structure/reflector/box/get_reflection(srcdir,pdir)
 	var/new_dir = box_rotations["[srcdir]"]["[pdir]"]
 	return new_dir

code/game/objects/structures/signs.dm

@@ -244,6 +244,36 @@
 	desc = "A sign labelling an area as a place where xenobiological entities are researched."
 	icon_state = "xenobio"
 
+/obj/structure/sign/evac
+	name = "\improper EVACUATION"
+	desc = "A sign labelling an area where evacuation procedures take place."
+	icon_state = "evac"
+
+/obj/structure/sign/custodian
+	name = "\improper CUSTODIAN"
+	desc = "A sign labelling an area where the custodian works."
+	icon_state = "custodian"
+
+/obj/structure/sign/engineering
+	name = "\improper ENGINEERING"
+	desc = "A sign labelling an area where engineers work."
+	icon_state = "engine"
+
+/obj/structure/sign/cargo
+	name = "\improper CARGO"
+	desc = "A sign labelling an area where cargo ships dock."
+	icon_state = "cargo"
+
+/obj/structure/sign/security
+	name = "\improper SECURITY"
+	desc = "A sign labelling an area where the law is law."
+	icon_state = "security"
+
+/obj/structure/sign/holy
+	name = "\improper HOLY"
+	desc = "A sign labelling a religious area."
+	icon_state = "holy"
+
 /obj/structure/sign/xeno_warning_mining
 	name = "DANGEROUS ALIEN LIFE"
 	desc = "A sign that warns would-be travellers of hostile alien life in the vicinity."
@@ -289,3 +319,8 @@
 	name = "command department"
 	desc = "A direction sign, pointing out which way the Command department is."
 	icon_state = "direction_bridge"
+
+/obj/structure/sign/logo
+	name = "station logo"
+	desc = "A sign: SPACE STATION 13."
+	icon_state = "ss13sign-1"

code/game/sound.dm.rej

@@ -1,9 +0,0 @@
-diff a/code/game/sound.dm b/code/game/sound.dm	(rejected hunks)
-@@ -154,6 +151,6 @@
- 				soundin = pick('sound/effects/can_open1.ogg', 'sound/effects/can_open2.ogg', 'sound/effects/can_open3.ogg')
- 	return soundin
- 
--/proc/playsound_global(file, repeat=0, wait, channel, volume)
-+/proc/playsound_global(file, repeat = 0, wait, channel, volume)
- 	for(var/V in GLOB.clients)
- 		V << sound(file, repeat, wait, channel, volume)

code/game/turfs/simulated/floor/misc_floor.dm

@@ -49,6 +49,9 @@
 /turf/open/floor/circuit/telecomms
 	initial_gas_mix = "n2=100;TEMP=80"
 
+/turf/open/floor/circuit/telecomms/mainframe
+	name = "Mainframe Base"
+
 /turf/open/floor/circuit/green
 	icon_state = "gcircuit"
 	icon_normal = "gcircuit"
@@ -70,6 +73,9 @@
 /turf/open/floor/circuit/green/telecomms
 	initial_gas_mix = "n2=100;TEMP=80"
 
+/turf/open/floor/circuit/green/telecomms/mainframe
+	name = "Mainframe Base"
+
 /turf/open/floor/circuit/red
 	icon_state = "rcircuit"
 	icon_normal = "rcircuit"
@@ -265,4 +271,4 @@
 	//Do this *after* the turf has changed as qdel in spacevines will call changeturf again if it hasn't
 	for(var/obj/structure/spacevine/SV in src)
 		if(!QDESTROYING(SV))//Helps avoid recursive loops
-			qdel(SV)
+			qdel(SV)

code/game/turfs/simulated/floor/plasteel_floor.dm

@@ -17,6 +17,10 @@
 
 /turf/open/floor/plasteel/black
 	icon_state = "dark"
+/turf/open/floor/plasteel/black/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
+/turf/open/floor/plasteel/black/telecomms/mainframe
+	name = "Mainframe Floor"
 /turf/open/floor/plasteel/airless/black
 	icon_state = "dark"
 /turf/open/floor/plasteel/black/side
@@ -43,6 +47,10 @@
 
 /turf/open/floor/plasteel/brown
 	icon_state = "brown"
+/turf/open/floor/plasteel/brown/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
+/turf/open/floor/plasteel/brown/telecomms/mainframe
+	name = "Mainframe Floor"
 /turf/open/floor/plasteel/brown/corner
 	icon_state = "browncorner"
 
@@ -59,6 +67,8 @@
 	icon_state = "greenfull"
 /turf/open/floor/plasteel/green/side
 	icon_state = "green"
+/turf/open/floor/plasteel/green/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/green/corner
 	icon_state = "greencorner"
 
@@ -66,6 +76,8 @@
 	icon_state = "darkgreenfull"
 /turf/open/floor/plasteel/darkgreen/side
 	icon_state = "darkgreen"
+/turf/open/floor/plasteel/darkgreen/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/darkgreen/corner
 	icon_state = "darkgreencorners"
 
@@ -89,6 +101,8 @@
 	icon_state = "darkredfull"
 /turf/open/floor/plasteel/darkred/side
 	icon_state = "darkred"
+/turf/open/floor/plasteel/darkred/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/darkred/corner
 	icon_state = "darkredcorners"
 
@@ -112,6 +126,8 @@
 	icon_state = "darkbluefull"
 /turf/open/floor/plasteel/darkblue/side
 	icon_state = "darkblue"
+/turf/open/floor/plasteel/darkblue/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/darkblue/corner
 	icon_state = "darkbluecorners"
 
@@ -119,6 +135,8 @@
 	icon_state = "whitebluefull"
 /turf/open/floor/plasteel/whiteblue/side
 	icon_state = "whiteblue"
+/turf/open/floor/plasteel/whiteblue/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/whiteblue/corner
 	icon_state = "whitebluecorner"
 
@@ -135,6 +153,8 @@
 	icon_state = "darkyellowfull"
 /turf/open/floor/plasteel/darkyellow/side
 	icon_state = "darkyellow"
+/turf/open/floor/plasteel/darkyellow/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/darkyellow/corner
 	icon_state = "darkyellowcorners"
 
@@ -158,6 +178,8 @@
 	icon_state = "darkpurplefull"
 /turf/open/floor/plasteel/darkpurple/side
 	icon_state = "darkpurple"
+/turf/open/floor/plasteel/darkpurple/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/darkpurple/corner
 	icon_state = "darkpurplecorners"
 
@@ -165,6 +187,8 @@
 	icon_state = "whitepurplefull"
 /turf/open/floor/plasteel/whitepurple/side
 	icon_state = "whitepurple"
+/turf/open/floor/plasteel/whitepurple/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/whitepurple/corner
 	icon_state = "whitepurplecorner"
 
@@ -181,6 +205,8 @@
 	icon_state = "neutralfull"
 /turf/open/floor/plasteel/neutral/side
 	icon_state = "neutral"
+/turf/open/floor/plasteel/neutral/side/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
 /turf/open/floor/plasteel/neutral/corner
 	icon_state = "neutralcorner"
 
@@ -325,6 +351,10 @@
 
 /turf/open/floor/plasteel/vault
 	icon_state = "vault"
+/turf/open/floor/plasteel/vault/telecomms
+	initial_gas_mix = "n2=100;TEMP=80"
+/turf/open/floor/plasteel/vault/telecomms/mainframe
+	name = "Mainframe Floor"
 
 /turf/open/floor/plasteel/cult
 	icon_state = "cult"

code/game/turfs/turf.dm

@@ -9,7 +9,7 @@
 	var/to_be_destroyed = 0 //Used for fire, if a melting temperature was reached, it will be destroyed
 	var/max_fire_temperature_sustained = 0 //The max temperature of the fire which it was subjected to
 
-	var/blocks_air = 0
+	var/blocks_air = FALSE
 
 	flags = CAN_BE_DIRTY
 
@@ -84,16 +84,28 @@
 /turf/attack_hand(mob/user)
 	user.Move_Pulled(src)
 
+/turf/proc/handleRCL(obj/item/weapon/twohanded/rcl/C, mob/user)
+	if(C.loaded)
+		for(var/obj/structure/cable/LC in src)
+			if(!LC.d1 || !LC.d2)
+				LC.handlecable(C, user)
+				return
+		C.loaded.place_turf(src, user)
+		C.is_empty(user)
+
 /turf/attackby(obj/item/C, mob/user, params)
 	if(can_lay_cable() && istype(C, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/coil = C
 		for(var/obj/structure/cable/LC in src)
-			if((LC.d1==0)||(LC.d2==0))
+			if(!LC.d1 || !LC.d2)
 				LC.attackby(C,user)
 				return
 		coil.place_turf(src, user)
 		return TRUE
 
+	else if(istype(C, /obj/item/weapon/twohanded/rcl))
+		handleRCL(C, user)
+
 	return FALSE
 
 /turf/CanPass(atom/movable/mover, turf/target)
@@ -117,7 +129,7 @@
 				return FALSE
 
 	var/list/large_dense = list()
-	
+
 	//Next, check objects to block entry that are on the border
 	for(var/atom/movable/border_obstacle in src)
 		if(border_obstacle.flags & ON_BORDER)
@@ -134,7 +146,7 @@
 
 	//Finally, check objects/mobs to block entry that are not on the border
 	var/atom/movable/tompost_bump
-	var/top_layer = 0
+	var/top_layer = FALSE
 	for(var/atom/movable/obstacle in large_dense)
 		if(!obstacle.CanPass(mover, mover.loc, 1) && (forget != obstacle))
 			if(obstacle.layer > top_layer)
@@ -197,14 +209,14 @@
 		qdel(L)
 
 //wrapper for ChangeTurf()s that you want to prevent/affect without overriding ChangeTurf() itself
-/turf/proc/TerraformTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE)
-	return ChangeTurf(path, new_baseturf, defer_change, ignore_air)
+/turf/proc/TerraformTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
+	return ChangeTurf(path, new_baseturf, defer_change, ignore_air, forceop)
 
 //Creates a new turf
-/turf/proc/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE)
+/turf/proc/ChangeTurf(path, new_baseturf, defer_change = FALSE, ignore_air = FALSE, forceop = FALSE)
 	if(!path)
 		return
-	if(!GLOB.use_preloader && path == type) // Don't no-op if the map loader requires it to be reconstructed
+	if(!GLOB.use_preloader && path == type && !forceop) // Don't no-op if the map loader requires it to be reconstructed
 		return src
 
 	var/old_baseturf = baseturf
@@ -416,8 +428,8 @@
 		var/thing = allowed_contents[i]
 		qdel(thing, force=TRUE)
 
-	var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE)
-
+	var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE, forceop = forceop)
+    
 	SSair.remove_from_active(newT)
 	newT.CalculateAdjacentTurfs()
 	SSair.add_to_active(newT,1)
@@ -425,13 +437,12 @@
 /turf/proc/is_transition_turf()
 	return
 
-
 /turf/acid_act(acidpwr, acid_volume)
 	. = 1
 	var/acid_type = /obj/effect/acid
 	if(acidpwr >= 200) //alien acid power
 		acid_type = /obj/effect/acid/alien
-	var/has_acid_effect = 0
+	var/has_acid_effect = FALSE
 	for(var/obj/O in src)
 		if(intact && O.level == 1) //hidden under the floor
 			continue
@@ -503,4 +514,4 @@
 			limit--
 		else
 			return I
-	return I
+	return I

code/game/turfs/turf.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm	(rejected hunks)
-@@ -410,7 +410,7 @@
- /turf/proc/empty(turf_type=/turf/open/space, baseturf_type)
- 	// Remove all atoms except observers, landmarks, docking ports
- 	var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
--	var/list/allowed_contents = typecache_filter_list(GetAllContents(),ignored_atoms,reversed=TRUE)
-+	var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(),ignored_atoms)
- 	allowed_contents -= src
- 	for(var/i in 1 to allowed_contents.len)
- 		var/thing = allowed_contents[i]

code/modules/atmospherics/machinery/airalarm.dm

@@ -113,6 +113,19 @@
 		"water_vapor"	= new/datum/tlv(-1, -1, 0.2, 0.5)
 	)
 
+/obj/machinery/airalarm/engine
+	name = "engine air alarm"
+	locked = FALSE
+	req_access = null
+	req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE)
+
+/obj/machinery/airalarm/all_access
+	name = "all-access air alarm"
+	desc = "This particular atmos control unit appears to have no access restrictions."
+	locked = FALSE
+	req_access = null
+	req_one_access = null
+
 //all air alarms in area are connected via magic
 /area
 	var/list/air_vent_names = list()

code/modules/clothing/spacesuits/flightsuit.dm.rej

@@ -1,14 +0,0 @@
-diff a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm	(rejected hunks)
-@@ -1157,10 +1157,10 @@
- 			maint_panel = TRUE
- 		else
- 			maint_panel = FALSE
--		usermessage("You [maint_panel? "open" : "close"] the maintainence panel.")
-+		usermessage("You [maint_panel? "open" : "close"] the maintenance panel.")
- 		return FALSE
- 	else if(!maint_panel)
--		usermessage("The maintainence panel is closed!", "boldwarning")
-+		usermessage("The maintenance panel is closed!", "boldwarning")
- 		return FALSE
- 	else if(istype(I, /obj/item/weapon/crowbar))
- 		var/list/inputlist = list()

code/modules/clothing/spacesuits/hardsuit.dm.rej

@@ -1,19 +0,0 @@
-diff a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm	(rejected hunks)
-@@ -304,7 +304,7 @@
- 	item_color = "syndi"
- 	w_class = WEIGHT_CLASS_NORMAL
- 	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50, fire = 50, acid = 90)
--	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
-+	allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/melee/energy/sword/saber, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals)
- 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
- 	jetpack = /obj/item/weapon/tank/jetpack/suit
- 
-@@ -698,7 +698,7 @@
- 	item_state = "syndie_hardsuit"
- 	item_color = "syndi"
- 	armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50, fire = 100, acid = 100)
--	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
-+	allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/melee/energy/sword/saber, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals)
- 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
- 	slowdown = 0
- 

code/modules/clothing/spacesuits/miscellaneous.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm	(rejected hunks)
-@@ -146,7 +146,7 @@ Contains:
- 	item_state = "pirate"
- 	w_class = WEIGHT_CLASS_NORMAL
- 	flags_inv = 0
--	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals, /obj/item/weapon/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/weapon/reagent_containers/food/drinks/bottle/rum)
-+	allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals, /obj/item/weapon/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/weapon/reagent_containers/food/drinks/bottle/rum)
- 	slowdown = 0
- 	armor = list(melee = 30, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 60, acid = 75)
- 	strip_delay = 40

code/modules/clothing/spacesuits/plasmamen.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm	(rejected hunks)
-@@ -4,7 +4,7 @@
- /obj/item/clothing/suit/space/eva/plasmaman
- 	name = "EVA plasma envirosuit"
- 	desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like it's smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges."
--	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_casing,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
-+	allowed = list(/obj/item/weapon/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/melee/energy/sword, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank)
- 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 0, fire = 100, acid = 75)
- 	resistance_flags = FIRE_PROOF
- 	icon_state = "plasmaman_suit"

code/modules/clothing/spacesuits/syndi.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm	(rejected hunks)
-@@ -12,7 +12,7 @@
- 	item_state = "space_suit_syndicate"
- 	desc = "Has a tag on it: Totally not property of an enemy corporation, honest!"
- 	w_class = WEIGHT_CLASS_NORMAL
--	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
-+	allowed = list(/obj/item/weapon/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/melee/energy/sword/saber, /obj/item/weapon/restraints/handcuffs, /obj/item/weapon/tank/internals)
- 	armor = list(melee = 40, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 80, acid = 85)
- 
- 

code/modules/clothing/suits/miscellaneous.dm.rej

@@ -1,19 +0,0 @@
-diff a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm	(rejected hunks)
-@@ -450,7 +450,7 @@
- 	icon_state = "coatcaptain"
- 	item_state = "coatcaptain"
- 	armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 50)
--	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic)
-+	allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic)
- 	hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
- 
- /obj/item/clothing/head/hooded/winterhood/captain
-@@ -461,7 +461,7 @@
- 	icon_state = "coatsecurity"
- 	item_state = "coatsecurity"
- 	armor = list(melee = 25, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 45)
--	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/ballistic,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic)
-+	allowed = list(/obj/item/weapon/gun/energy, /obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton, /obj/item/weapon/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/weapon/melee/classic_baton/telescopic)
- 	hoodtype = /obj/item/clothing/head/hooded/winterhood/security
- 
- /obj/item/clothing/head/hooded/winterhood/security

code/modules/crafting/recipes.dm

@@ -557,3 +557,12 @@
 	time = 5
 	reqs = list(/obj/item/stack/sheet/plasteel = 1, /obj/item/stack/tile/plasteel = 1, /obj/item/stack/cable_coil = 2)
 	category = CAT_MISC
+
+
+/datum/crafting_recipe/rcl
+	name = "Makeshift Rapid Cable Layer"
+	result = /obj/item/weapon/twohanded/rcl/ghetto
+	time = 40
+	tools = list(/obj/item/weapon/weldingtool, /obj/item/weapon/screwdriver, /obj/item/weapon/wrench)
+	reqs = list(/obj/item/stack/sheet/metal = 15)
+	category = CAT_MISC

code/modules/mining/mine_items.dm

@@ -37,6 +37,9 @@
 	icon_state = "mining"
 	req_access = list(ACCESS_MINING)
 
+/obj/structure/closet/secure_closet/miner/unlocked
+	locked = FALSE
+
 /obj/structure/closet/secure_closet/miner/PopulateContents()
 	..()
 	new /obj/item/stack/sheet/mineral/sandbags(src, 5)
@@ -77,4 +80,4 @@
 /obj/structure/closet/crate/miningcar
 	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
 	name = "Mining car (not for rails)"
-	icon_state = "miningcar"
+	icon_state = "miningcar"

code/modules/mob/living/carbon/damage_procs.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm	(rejected hunks)
-@@ -36,6 +36,8 @@
- 			adjustCloneLoss(damage * hit_percent)
- 		if(STAMINA)
- 			adjustStaminaLoss(damage * hit_percent)
-+		if(BRAIN)
-+			adjustBrainLoss(damage * hit_percent)
- 	return 1
- 
- 

code/modules/mob/living/carbon/human/species.dm.rej

@@ -1,12 +0,0 @@
-diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm	(rejected hunks)
-@@ -71,8 +71,8 @@
- 	var/obj/item/mutanthands = null
- 	var/obj/item/organ/tongue/mutanttongue = /obj/item/organ/tongue
- 
--	var/obj/item/organ/liver/mutantliver = null
--	var/obj/item/organ/stomach/mutantstomach = null
-+	var/obj/item/organ/liver/mutantliver
-+	var/obj/item/organ/stomach/mutantstomach
- 
- ///////////
- // PROCS //

code/modules/mob/living/damage_procs.dm.rej

@@ -1,41 +0,0 @@
-diff a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm	(rejected hunks)
-@@ -25,6 +25,8 @@
- 			adjustCloneLoss(damage * hit_percent)
- 		if(STAMINA)
- 			adjustStaminaLoss(damage * hit_percent)
-+		if(BRAIN)
-+			adjustBrainLoss(damage * hit_percent)
- 	return 1
- 
- /mob/living/proc/apply_damage_type(damage = 0, damagetype = BRUTE) //like apply damage except it always uses the damage procs
-@@ -41,6 +43,8 @@
- 			return adjustCloneLoss(damage)
- 		if(STAMINA)
- 			return adjustStaminaLoss(damage)
-+		if(BRAIN)
-+			return adjustBrainLoss(damage)
- 
- /mob/living/proc/get_damage_amount(damagetype = BRUTE)
- 	switch(damagetype)
-@@ -56,9 +60,11 @@
- 			return getCloneLoss()
- 		if(STAMINA)
- 			return getStaminaLoss()
-+		if(BRAIN)
-+			return getBrainLoss()
- 
- 
--/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0)
-+/mob/living/proc/apply_damages(brute = 0, burn = 0, tox = 0, oxy = 0, clone = 0, def_zone = null, blocked = FALSE, stamina = 0, brain = 0)
- 	if(blocked >= 100)
- 		return 0
- 	if(brute)
-@@ -73,6 +79,8 @@
- 		apply_damage(clone, CLONE, def_zone, blocked)
- 	if(stamina)
- 		apply_damage(stamina, STAMINA, def_zone, blocked)
-+	if(brain)
-+		apply_damage(brain, BRAIN, def_zone, blocked)
- 	return 1
- 
- 

code/modules/mob/living/simple_animal/friendly/lizard.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm	(rejected hunks)
-@@ -21,7 +21,7 @@
- 	gold_core_spawnable = 2
- 	obj_damage = 0
- 	environment_smash = ENVIRONMENT_SMASH_NONE
--	var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly,/mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
-+	var/static/list/edibles = typecacheof(list(/mob/living/simple_animal/butterfly, /mob/living/simple_animal/cockroach)) //list of atoms, however turfs won't affect AI, but will affect consumption.
- 
- /mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target?
- 	if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it

code/modules/modular_computers/computers/item/tablet.dm.rej

@@ -1,15 +0,0 @@
-diff a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm	(rejected hunks)
-@@ -12,3 +13,12 @@
- 	slot_flags = SLOT_ID | SLOT_BELT
- 	has_light = TRUE //LED flashlight!
- 	comp_light_luminosity = 2.3 //Same as the PDA
-+	var/finish_color = null
-+
-+/obj/item/device/modular_computer/tablet/update_icon()
-+	..()
-+	if(!finish_color)
-+		finish_color = pick("red","blue","brown","green","black")
-+	icon_state = "tablet-[finish_color]"
-+	icon_state_unpowered = "tablet-[finish_color]"
-+	icon_state_powered = "tablet-[finish_color]"
-\ No newline at end of file

code/modules/paperwork/paper.dm

@@ -399,5 +399,4 @@
 	return
 
 /obj/item/weapon/paper/crumpled/bloody
-	icon_state = "scrap_bloodied"
-
+	icon_state = "scrap_bloodied"

code/modules/paperwork/paper_premade.dm

@@ -4,7 +4,7 @@
 
 /obj/item/weapon/paper/fluff/sop
 	name = "paper- 'Standard Operating Procedure'"
-	info = "Alert Levels:<BR>\nBlue- Emergency<BR>\n\t1. Caused by fire<BR>\n\t2. Caused by manual interaction<BR>\n\tAction:<BR>\n\t\tClose all fire doors. These can only be opened by reseting the alarm<BR>\nRed- Ejection/Self Destruct<BR>\n\t1. Caused by module operating computer.<BR>\n\tAction:<BR>\n\t\tAfter the specified time the module will eject completely.<BR>\n<BR>\nEngine Maintenance Instructions:<BR>\n\tShut off ignition systems:<BR>\n\tActivate internal power<BR>\n\tActivate orbital balance matrix<BR>\n\tRemove volatile liquids from area<BR>\n\tWear a fire suit<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nToxin Laboratory Procedure:<BR>\n\tWear a gas mask regardless<BR>\n\tGet an oxygen tank.<BR>\n\tActivate internal atmosphere<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nDisaster Procedure:<BR>\n\tFire:<BR>\n\t\tActivate sector fire alarm.<BR>\n\t\tMove to a safe area.<BR>\n\t\tGet a fire suit<BR>\n\t\tAfter:<BR>\n\t\t\tAssess Damage<BR>\n\t\t\tRepair damages<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tMeteor Shower:<BR>\n\t\tActivate fire alarm<BR>\n\t\tMove to the back of ship<BR>\n\t\tAfter<BR>\n\t\t\tRepair damage<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tAccidental Reentry:<BR>\n\t\tActivate fire alrms in front of ship.<BR>\n\t\tMove volatile matter to a fire proof area!<BR>\n\t\tGet a fire suit.<BR>\n\t\tStay secure until an emergency ship arrives.<BR>\n<BR>\n\t\tIf ship does not arrive-<BR>\n\t\t\tEvacuate to a nearby safe area!"
+	info = "Alert Levels:<BR>\nBlue- Emergency<BR>\n\t1. Caused by fire<BR>\n\t2. Caused by manual interaction<BR>\n\tAction:<BR>\n\t\tClose all fire doors. These can only be opened by resetting the alarm<BR>\nRed- Ejection/Self Destruct<BR>\n\t1. Caused by module operating computer.<BR>\n\tAction:<BR>\n\t\tAfter the specified time the module will eject completely.<BR>\n<BR>\nEngine Maintenance Instructions:<BR>\n\tShut off ignition systems:<BR>\n\tActivate internal power<BR>\n\tActivate orbital balance matrix<BR>\n\tRemove volatile liquids from area<BR>\n\tWear a fire suit<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nToxin Laboratory Procedure:<BR>\n\tWear a gas mask regardless<BR>\n\tGet an oxygen tank.<BR>\n\tActivate internal atmosphere<BR>\n<BR>\n\tAfter<BR>\n\t\tDecontaminate<BR>\n\t\tVisit medical examiner<BR>\n<BR>\nDisaster Procedure:<BR>\n\tFire:<BR>\n\t\tActivate sector fire alarm.<BR>\n\t\tMove to a safe area.<BR>\n\t\tGet a fire suit<BR>\n\t\tAfter:<BR>\n\t\t\tAssess Damage<BR>\n\t\t\tRepair damages<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tMeteor Shower:<BR>\n\t\tActivate fire alarm<BR>\n\t\tMove to the back of ship<BR>\n\t\tAfter<BR>\n\t\t\tRepair damage<BR>\n\t\t\tIf needed, Evacuate<BR>\n\tAccidental Reentry:<BR>\n\t\tActivate fire alarms in front of ship.<BR>\n\t\tMove volatile matter to a fire proof area!<BR>\n\t\tGet a fire suit.<BR>\n\t\tStay secure until an emergency ship arrives.<BR>\n<BR>\n\t\tIf ship does not arrive-<BR>\n\t\t\tEvacuate to a nearby safe area!"
 
 /obj/item/weapon/paper/fluff/shuttles/daniel
 	info = "i love daniel<br>daniel is my best friend<br><br>you are tearing me apart elise"
@@ -16,6 +16,7 @@
 	name = "paper- 'Greetings from Billy Bob'"
 	info = "<B>Hey fellow botanist!</B><BR>\n<BR>\nI didn't trust the station folk so I left<BR>\na couple of weeks ago. But here's some<BR>\ninstructions on how to operate things here.<BR>\nYou can grow plants and each iteration they become<BR>\nstronger, more potent and have better yield, if you<BR>\nknow which ones to pick. Use your botanist's analyzer<BR>\nfor that. You can turn harvested plants into seeds<BR>\nat the seed extractor, and replant them for better stuff!<BR>\nSometimes if the weed level gets high in the tray<BR>\nmutations into different mushroom or weed species have<BR>\nbeen witnessed. On the rare occassion even weeds mutate!<BR>\n<BR>\nEither way, have fun!<BR>\n<BR>\nBest regards,<BR>\nBilly Bob Johnson.<BR>\n<BR>\nPS.<BR>\nHere's a few tips:<BR>\nIn nettles, potency = damage<BR>\nIn amanitas, potency = deadliness + side effect<BR>\nIn Liberty caps, potency = drug power + effect<BR>\nIn chilis, potency = heat<BR>\n<B>Nutrients keep mushrooms alive!</B><BR>\n<B>Water keeps weeds such as nettles alive!</B><BR>\n<B>All other plants need both.</B>"
 
+
 /obj/item/weapon/paper/fluff/jobs/security/beepsky_mom
 	name = "Note from Beepsky's Mom"
 	info = "01001001 00100000 01101000 01101111 01110000 01100101 00100000 01111001 01101111 01110101 00100000 01110011 01110100 01100001 01111001 00100000 01110011 01100001 01100110 01100101 00101110 00100000 01001100 01101111 01110110 01100101 00101100 00100000 01101101 01101111 01101101 00101110"
@@ -48,7 +49,6 @@
 	name = "paper- 'Chemical Information'"
 	info = "Known Onboard Toxins:<BR>\n\tGrade A Semi-Liquid Plasma:<BR>\n\t\tHighly poisonous. You cannot sustain concentrations above 15 units.<BR>\n\t\tA gas mask fails to filter plasma after 50 units.<BR>\n\t\tWill attempt to diffuse like a gas.<BR>\n\t\tFiltered by scrubbers.<BR>\n\t\tThere is a bottled version which is very different<BR>\n\t\t\tfrom the version found in canisters!<BR>\n<BR>\n\t\tWARNING: Highly Flammable. Keep away from heat sources<BR>\n\t\texcept in a enclosed fire area!<BR>\n\t\tWARNING: It is a crime to use this without authorization.<BR>\nKnown Onboard Anti-Toxin:<BR>\n\tAnti-Toxin Type 01P: Works against Grade A Plasma.<BR>\n\t\tBest if injected directly into bloodstream.<BR>\n\t\tA full injection is in every regular Med-Kit.<BR>\n\t\tSpecial toxin Kits hold around 7.<BR>\n<BR>\nKnown Onboard Chemicals (other):<BR>\n\tRejuvenation T#001:<BR>\n\t\tEven 1 unit injected directly into the bloodstream<BR>\n\t\t\twill cure unconscious and sleep toxins.<BR>\n\t\tIf administered to a dying patient it will prevent<BR>\n\t\t\tfurther damage for about units*3 seconds.<BR>\n\t\t\tit will not cure them or allow them to be cured.<BR>\n\t\tIt can be administeredd to a non-dying patient<BR>\n\t\t\tbut the chemicals disappear just as fast.<BR>\n\tMorphine T#054:<BR>\n\t\t5 units wilkl induce precisely 1 minute of sleep.<BR>\n\t\t\tThe effect are cumulative.<BR>\n\t\tWARNING: It is a crime to use this without authorization"
 
-
 	/*
 	*	Stations
 	*/

code/modules/power/cable.dm

@@ -76,7 +76,7 @@ By design, d1 is the smallest direction and d2 is the highest
 
 	d2 = text2num( copytext( icon_state, dash+1 ) )
 
-	var/turf/T = src.loc			// hide if turf is not intact
+	var/turf/T = get_turf(src)			// hide if turf is not intact
 
 	if(level==1) hide(T.intact)
 	GLOB.cable_list += src //add it to the global cable list
@@ -115,14 +115,8 @@ By design, d1 is the smallest direction and d2 is the highest
 	else
 		icon_state = "[d1]-[d2]"
 
-
-// Items usable on a cable :
-//   - Wirecutters : cut it duh !
-//   - Cable coil : merge cables
-//   - Multitool : get the power currently passing through the cable
-//
-/obj/structure/cable/attackby(obj/item/W, mob/user, params)
-	var/turf/T = src.loc
+/obj/structure/cable/proc/handlecable(obj/item/W, mob/user, params)
+	var/turf/T = get_turf(src)
 	if(T.intact)
 		return
 	if(istype(W, /obj/item/weapon/wirecutters))
@@ -141,6 +135,12 @@ By design, d1 is the smallest direction and d2 is the highest
 			return
 		coil.cable_join(src, user)
 
+	else if(istype(W, /obj/item/weapon/twohanded/rcl))
+		var/obj/item/weapon/twohanded/rcl/R = W
+		if(R.loaded)
+			R.loaded.cable_join(src, user)
+			R.is_empty(user)
+
 	else if(istype(W, /obj/item/device/multitool))
 		if(powernet && (powernet.avail > 0))		// is it powered?
 			to_chat(user, "<span class='danger'>[powernet.avail]W in power network.</span>")
@@ -150,6 +150,15 @@ By design, d1 is the smallest direction and d2 is the highest
 
 	src.add_fingerprint(user)
 
+// Items usable on a cable :
+//   - Wirecutters : cut it duh !
+//   - Cable coil : merge cables
+//   - Multitool : get the power currently passing through the cable
+//
+/obj/structure/cable/attackby(obj/item/W, mob/user, params)
+	handlecable(W, user, params)
+
+
 // shock the user with probability prb
 /obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1)
 	if(!prob(prb))
@@ -507,6 +516,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 // General procedures
 ///////////////////////////////////
 
+
 //you can use wires to heal robotics
 /obj/item/stack/cable_coil/attack(mob/living/carbon/human/H, mob/user)
 	if(!istype(H))
@@ -564,11 +574,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	return new path (location)
 
 // called when cable_coil is clicked on a turf
-/obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user)
+/obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user, dirnew)
 	if(!isturf(user.loc))
 		return
 
-	if(!T.can_have_cabling())
+	if(!isturf(T) || T.intact || !T.can_have_cabling())
 		to_chat(user, "<span class='warning'>You can only lay cables on catwalks and plating!</span>")
 		return
 
@@ -580,47 +590,50 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 		to_chat(user, "<span class='warning'>You can't lay cable at a place that far away!</span>")
 		return
 
-	else
-		var/dirn
-
+	var/dirn
+	if(!dirnew) //If we weren't given a direction, come up with one! (Called as null from catwalk.dm and floor.dm)
 		if(user.loc == T)
-			dirn = user.dir			// if laying on the tile we're on, lay in the direction we're facing
+			dirn = user.dir //If laying on the tile we're on, lay in the direction we're facing
 		else
 			dirn = get_dir(T, user)
+	else
+		dirn = dirnew
 
-		for(var/obj/structure/cable/LC in T)
-			if(LC.d2 == dirn && LC.d1 == 0)
-				to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
-				return
+	for(var/obj/structure/cable/LC in T)
+		if(LC.d2 == dirn && LC.d1 == 0)
+			to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
+			return
 
-		var/obj/structure/cable/C = get_new_cable(T)
+	var/obj/structure/cable/C = get_new_cable(T)
 
-		//set up the new cable
-		C.d1 = 0 //it's a O-X node cable
-		C.d2 = dirn
-		C.add_fingerprint(user)
-		C.update_icon()
+	//set up the new cable
+	C.d1 = 0 //it's a O-X node cable
+	C.d2 = dirn
+	C.add_fingerprint(user)
+	C.update_icon()
 
-		//create a new powernet with the cable, if needed it will be merged later
-		var/datum/powernet/PN = new()
-		PN.add_cable(C)
+	//create a new powernet with the cable, if needed it will be merged later
+	var/datum/powernet/PN = new()
+	PN.add_cable(C)
 
-		C.mergeConnectedNetworks(C.d2) //merge the powernet with adjacents powernets
-		C.mergeConnectedNetworksOnTurf() //merge the powernet with on turf powernets
+	C.mergeConnectedNetworks(C.d2) //merge the powernet with adjacents powernets
+	C.mergeConnectedNetworksOnTurf() //merge the powernet with on turf powernets
 
-		if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
-			C.mergeDiagonalsNetworks(C.d2)
+	if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
+		C.mergeDiagonalsNetworks(C.d2)
 
+	use(1)
 
-		use(1)
+	if(C.shock(user, 50))
+		if(prob(50)) //fail
+			new /obj/item/stack/cable_coil(get_turf(C), 1, C.color)
+			C.deconstruct()
 
-		if (C.shock(user, 50))
-			if (prob(50)) //fail
-				C.deconstruct()
+	return C
 
 // called when cable_coil is click on an installed obj/cable
 // or click on a turf that already contains a "node" cable
-/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user)
+/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user, var/showerror = TRUE)
 	var/turf/U = user.loc
 	if(!isturf(U))
 		return
@@ -644,7 +657,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	// one end of the clicked cable is pointing towards us
 	if(C.d1 == dirn || C.d2 == dirn)
 		if(!U.can_have_cabling())						//checking if it's a plating or catwalk
-			to_chat(user, "<span class='warning'>You can only lay cables on catwalks and plating!</span>")
+			if (showerror)
+				to_chat(user, "<span class='warning'>You can only lay cables on catwalks and plating!</span>")
 			return
 		if(U.intact)						//can't place a cable if it's a plating with a tile on it
 			to_chat(user, "<span class='warning'>You can't lay cable there unless the floor tiles are removed!</span>")
@@ -657,7 +671,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 
 			for(var/obj/structure/cable/LC in U)		// check to make sure there's not a cable there already
 				if(LC.d1 == fdirn || LC.d2 == fdirn)
-					to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
+					if (showerror)
+						to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
 					return
 
 			var/obj/structure/cable/NC = get_new_cable (U)
@@ -701,7 +716,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 			if(LC == C)			// skip the cable we're interacting with
 				continue
 			if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) )	// make sure no cable matches either direction
-				to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
+				if (showerror)
+					to_chat(user, "<span class='warning'>There's already a cable at that position!</span>")
+
 				return
 
 

code/modules/power/singularity/collector.dm

@@ -18,6 +18,9 @@ GLOBAL_LIST_EMPTY(rad_collectors)
 	var/locked = FALSE
 	var/drainratio = 1
 
+/obj/machinery/power/rad_collector/anchored
+	anchored = TRUE
+
 /obj/machinery/power/rad_collector/New()
 	..()
 	GLOB.rad_collectors += src

code/modules/power/singularity/emitter.dm

@@ -33,6 +33,19 @@
 
 	var/datum/effect_system/spark_spread/sparks
 
+/obj/machinery/power/emitter/anchored
+	anchored = TRUE
+
+/obj/machinery/power/emitter/ctf
+	name = "Energy Cannon"
+	active = TRUE
+	active_power_usage = FALSE
+	idle_power_usage = FALSE
+	locked = TRUE
+	req_access_txt = "100"
+	state = 2
+	use_power = FALSE
+
 /obj/machinery/power/emitter/New()
 	..()
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/emitter(null)

code/modules/surgery/organ_manipulation.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm	(rejected hunks)
-@@ -78,7 +78,7 @@
- 		current_type = "extract"
- 		var/list/organs = target.getorganszone(target_zone)
- 		if(!organs.len)
--			to_chat(user, "<span class='notice'>There are no removeable organs in [target]'s [parse_zone(target_zone)]!</span>")
-+			to_chat(user, "<span class='notice'>There are no removable organs in [target]'s [parse_zone(target_zone)]!</span>")
- 			return -1
- 		else
- 			for(var/obj/item/organ/O in organs)