Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

code/game/gamemodes/game_mode.dm

@@ -62,6 +62,8 @@ Devices and Tools;
 Whitespace:Seperator;
 Implants;
 /obj/item/weapon/storage/syndie_kit/imp_freedom:3:Freedom Implant;
+/obj/item/weapon/implant/explosive:6:Explosive Implant (DANGER!);
+/obj/item/weapon/implant/compressed:4:Compressed Matter Implant;
 /obj/item/weapon/storage/syndie_kit/imp_uplink:10:Uplink Implant (Contains 5 Telecrystals);
 Whitespace:Seperator;
 (Pointless) Badassery;
@@ -419,4 +421,4 @@ proc/display_roundstart_logout_report()
 
 	for(var/mob/M in mob_list)
 		if(M.client && M.client.holder)
-			M << msg
+			M << msg

code/game/machinery/adv_med.dm

@@ -296,7 +296,7 @@
 							AN = "[e.broken_description]:"
 						if(e.open)
 							open = "Open:"
-						if(e.implant)
+						if(e.implants.len)
 							imp = "Implanted:"
 						if(!AN && !open && !infected & !imp)
 							AN = "None:"

code/game/machinery/pipe/construction.dm

@@ -20,6 +20,9 @@ Buildable meters
 #define PIPE_PASSIVE_GATE       15
 #define PIPE_VOLUME_PUMP        16
 #define PIPE_HEAT_EXCHANGE      17
+#define PIPE_MTVALVE			18
+#define PIPE_MANIFOLD4W			19
+#define PIPE_CAP				20
 
 /obj/item/pipe
 	name = "pipe"
@@ -75,6 +78,12 @@ Buildable meters
 			src.pipe_type = PIPE_VOLUME_PUMP
 		else if(istype(make_from, /obj/machinery/atmospherics/unary/heat_exchanger))
 			src.pipe_type = PIPE_HEAT_EXCHANGE
+		else if(istype(make_from, /obj/machinery/atmospherics/tvalve))
+			src.pipe_type = PIPE_MTVALVE
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/manifold4w))
+			src.pipe_type = PIPE_MANIFOLD4W
+		else if(istype(make_from, /obj/machinery/atmospherics/pipe/cap))
+			src.pipe_type = PIPE_CAP
 	else
 		src.pipe_type = pipe_type
 		src.dir = dir
@@ -105,6 +114,9 @@ Buildable meters
 		"passive gate", \
 		"volume pump", \
 		"heat exchanger", \
+		"t-valve", \
+		"4-way manifold", \
+		"pipe cap", \
 	)
 	name = nlist[pipe_type+1] + " fitting"
 	var/list/islist = list( \
@@ -126,6 +138,9 @@ Buildable meters
 		"passivegate", \
 		"volumepump", \
 		"heunary", \
+		"mtvalve", \
+		"manifold4w", \
+		"cap", \
 	)
 	icon_state = islist[pipe_type + 1]
 
@@ -149,6 +164,8 @@ Buildable meters
 			dir = 1
 		else if(dir==8)
 			dir = 4
+	else if (pipe_type == PIPE_MANIFOLD4W)
+		dir = 2
 	//src.pipe_dir = get_pipe_dir()
 	return
 
@@ -188,10 +205,14 @@ Buildable meters
 			return dir //dir|acw
 		if(PIPE_CONNECTOR,PIPE_UVENT,PIPE_SCRUBBER,PIPE_HEAT_EXCHANGE)
 			return dir
+		if(PIPE_MANIFOLD4W)
+			return dir|flip|cw|acw
 		if(PIPE_MANIFOLD)
 			return flip|cw|acw
-		if(PIPE_GAS_FILTER, PIPE_GAS_MIXER)
+		if(PIPE_GAS_FILTER, PIPE_GAS_MIXER,PIPE_MTVALVE)
 			return dir|flip|cw
+		if(PIPE_CAP)
+			return flip
 	return 0
 
 /obj/item/pipe/proc/get_pdir() //endpoints for regular pipes
@@ -241,6 +262,8 @@ Buildable meters
 			dir = 1
 		else if(dir==8)
 			dir = 4
+	else if (pipe_type == PIPE_MANIFOLD4W)
+		dir = 2
 	var/pipe_dir = get_pipe_dir()
 
 	for(var/obj/machinery/atmospherics/M in src.loc)
@@ -325,6 +348,31 @@ Buildable meters
 			if (M.node3)
 				M.node3.initialize()
 				M.node3.build_network()
+			
+		if(PIPE_MANIFOLD4W)		//4-way manifold
+			var/obj/machinery/atmospherics/pipe/manifold4w/M = new( src.loc )
+			M.dir = dir
+			M.initialize_directions = pipe_dir
+			//M.New()
+			var/turf/T = M.loc
+			M.level = T.intact ? 2 : 1
+			M.initialize()
+			if (!M)
+				usr << "There's nothing to connect this manifold to! (with how the pipe code works, at least one end needs to be connected to something, otherwise the game deletes the segment)"
+				return 1
+			M.build_network()
+			if (M.node1)
+				M.node1.initialize()
+				M.node1.build_network()
+			if (M.node2)
+				M.node2.initialize()
+				M.node2.build_network()
+			if (M.node3)
+				M.node3.initialize()
+				M.node3.build_network()
+			if (M.node4)
+				M.node4.initialize()
+				M.node4.build_network()
 
 		if(PIPE_JUNCTION)
 			var/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction/P = new ( src.loc )
@@ -467,6 +515,36 @@ Buildable meters
 			if (P.node2)
 				P.node2.initialize()
 				P.node2.build_network()
+				
+		if(PIPE_MTVALVE)		//manual t-valve
+			var/obj/machinery/atmospherics/tvalve/V = new(src.loc)
+			V.dir = dir
+			V.initialize_directions = pipe_dir
+			if (pipename)
+				V.name = pipename
+			var/turf/T = V.loc
+			V.level = T.intact ? 2 : 1
+			V.initialize()
+			V.build_network()
+			if (V.node1)
+				V.node1.initialize()
+				V.node1.build_network()
+			if (V.node2)
+				V.node2.initialize()
+				V.node2.build_network()
+			if (V.node3)
+				V.node3.initialize()
+				V.node3.build_network()
+				
+		if(PIPE_CAP)
+			var/obj/machinery/atmospherics/pipe/cap/C = new(src.loc)
+			C.dir = dir
+			C.initialize_directions = pipe_dir
+			C.initialize()
+			C.build_network()
+			if(C.node)
+				C.node.initialize()
+				C.node.build_network()
 
 		if(PIPE_PASSIVE_GATE)		//passive gate
 			var/obj/machinery/atmospherics/binary/passive_gate/P = new(src.loc)
@@ -551,7 +629,7 @@ Buildable meters
 	playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 	user << "\blue You have fastened the meter to the pipe"
 	del(src)
-
+//not sure why these are necessary
 #undef PIPE_SIMPLE_STRAIGHT
 #undef PIPE_SIMPLE_BENT
 #undef PIPE_HE_STRAIGHT
@@ -569,4 +647,6 @@ Buildable meters
 #undef PIPE_GAS_MIXER
 #undef PIPE_PASSIVE_GATE
 #undef PIPE_VOLUME_PUMP
-#undef PIPE_OUTLET_INJECT
+#undef PIPE_OUTLET_INJECT
+#undef PIPE_MTVALVE
+//#undef PIPE_MANIFOLD4W

code/game/machinery/pipe/pipe_dispenser.dm

@@ -19,6 +19,9 @@
 <A href='?src=\ref[src];make=1;dir=5'>Bent Pipe</A><BR>
 <A href='?src=\ref[src];make=5;dir=1'>Manifold</A><BR>
 <A href='?src=\ref[src];make=8;dir=1'>Manual Valve</A><BR>
+<A href='?src=\ref[src];make=20;dir=1'>Pipe Cap</A><BR>
+<A href='?src=\ref[src];make=19;dir=1'>4-Way Manifold</A><BR>
+<A href='?src=\ref[src];make=18;dir=1'>Manual T-Valve</A><BR>
 <b>Devices:</b><BR>
 <A href='?src=\ref[src];make=4;dir=1'>Connector</A><BR>
 <A href='?src=\ref[src];make=7;dir=1'>Unary Vent</A><BR>
@@ -37,8 +40,9 @@
 <b>Insulated pipes:</b><BR>
 <A href='?src=\ref[src];make=11;dir=1'>Pipe</A><BR>
 <A href='?src=\ref[src];make=12;dir=5'>Bent Pipe</A><BR>
-"}
 
+"}
+//What number the make points to is in the define # at the top of construction.dm in same folder
 
 	user << browse("<HEAD><TITLE>[src]</TITLE></HEAD><TT>[dat]</TT>", "window=pipedispenser")
 	onclose(user, "pipedispenser")

code/game/mecha/mecha.dm

@@ -1153,7 +1153,7 @@
 			src.occupant.client.perspective = MOB_PERSPECTIVE
 		*/
 		src.occupant << browse(null, "window=exosuit")
-		if(istype(mob_container, /obj/item/device/mmi))
+		if(istype(mob_container, /obj/item/device/mmi) || istype(mob_container, /obj/item/device/posibrain))
 			var/obj/item/device/mmi/mmi = mob_container
 			if(mmi.brainmob)
 				occupant.loc = mmi

code/game/objects/items.dm

@@ -186,26 +186,21 @@
 
 	if (!istype(M)) // not sure if this is the right thing...
 		return
+
 	if (can_operate(M))	//Checks if mob is lying down on table for surgery
 		if(istype(M,/mob/living/carbon))
-			if (user.a_intent != "harm")
+			if (user.a_intent != "harm")	//check for Hippocratic Oath
 				if(surgery_steps.len == 0) build_surgery_steps_list()
 				for(var/datum/surgery_step/S in surgery_steps)
-					//check if tool is right or close enough
-					var/right = istype(src, S.required_tool)
-					if (!right && S.allowed_tools)
-						for (var/T in S.allowed_tools)
-							if (istype(src, T))
-								right = 1
-					if(right && S.can_use(user, M, user.zone_sel.selecting, src))	//is this step possible?
-						S.begin_step(user, M, user.zone_sel.selecting, src)
-						if(do_mob(user, M, rand(S.min_duration, S.max_duration)))
-							S.end_step(user, M, user.zone_sel.selecting, src)
-						else
-							S.fail_step(user, M, user.zone_sel.selecting, src)
-						return		  //don't want to do weapony things after surgery
-		if (is_surgery_tool(src))
-			return
+					if( S.isright(src) || S.isacceptable(src) )	 						//check if tool is right or close enough
+						if(S.can_use(user, M, user.zone_sel.selecting, src))			//and if this step is possible
+							S.begin_step(user, M, user.zone_sel.selecting, src)			//start on it
+							if(do_mob(user, M, rand(S.min_duration, S.max_duration)))	//if user did nto move or changed hands
+								S.end_step(user, M, user.zone_sel.selecting, src)		//finish successfully
+							else														//or
+								S.fail_step(user, M, user.zone_sel.selecting, src)		//malpractice~
+							return		  												//don't want to do weapony things after surgery
+
 
 	var/messagesource = M
 

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

@@ -198,6 +198,7 @@
 
 			user.drop_item()
 
+			O.mmi = W
 			O.invisibility = 0
 			O.custom_name = created_name
 			O.updatename("Default")
@@ -212,7 +213,6 @@
 			O.cell = chest.cell
 			O.cell.loc = O
 			W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
-			O.mmi = W
 
 			feedback_inc("cyborg_birth",1)
 

code/game/objects/items/weapons/implants/implant.dm

@@ -1,7 +1,10 @@
 /obj/item/weapon/implant
 	name = "implant"
+	icon = 'device.dmi'
+	icon_state = "implant"
 	var/implanted = null
 	var/mob/imp_in = null
+	var/datum/organ/external/part = null
 	color = "b"
 	var/allow_reagents = 0
 
@@ -23,8 +26,8 @@
 	proc/hear(message, source as mob)
 		return
 
-
-
+	proc/islegal()
+		return 0
 
 /obj/item/weapon/implant/tracking
 	name = "tracking"
@@ -82,6 +85,8 @@ Implant Specifics:<BR>"}
 		if(src.imp_in)
 			src.imp_in.gib()
 
+	islegal()
+		return 0
 //BS12 Explosive
 /obj/item/weapon/implant/explosive
 	name = "explosive implant"
@@ -110,15 +115,18 @@ Implant Specifics:<BR>"}
 		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
 		msg = sanitize_simple(msg, replacechars)
 		if(findtext(msg,phrase))
-			if(istype(imp_in, /mob/))
-				var/mob/T = imp_in
-				T.gib()
-			explosion(get_turf(imp_in), 1, 3, 4, 6, 3)
-			var/turf/t = get_turf(imp_in)
-			if(t)
-				t.hotspot_expose(3500,125)
+			activate()
 			del(src)
 
+	activate()
+		if(istype(imp_in, /mob/))
+			var/mob/T = imp_in
+			T.gib()
+		explosion(get_turf(imp_in), 1, 3, 4, 6, 3)
+		var/turf/t = get_turf(imp_in)
+		if(t)
+			t.hotspot_expose(3500,125)
+
 	implanted(mob/source as mob)
 		phrase = input("Choose activation phrase:") as text
 		var/list/replacechars = list("'" = "","\"" = "",">" = "","<" = "","(" = "",")" = "")
@@ -127,6 +135,8 @@ Implant Specifics:<BR>"}
 		usr << "The implanted explosive implant in [source] can be activated by saying something containing the phrase ''[src.phrase]'', <B>say [src.phrase]</B> to attempt to activate."
 		return 1
 
+	islegal()
+		return 0
 
 /obj/item/weapon/implant/chem
 	name = "chem"
@@ -266,14 +276,16 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	process()
 		if (!implanted) return
 		var/mob/M = imp_in
-		var/area/t = get_area(M)
 
 		if(isnull(M)) // If the mob got gibbed
-			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
-			a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
-			del(a)
-			processing_objects.Remove(src)
+			activate()
 		else if(M.stat == 2)
+			activate("death")
+
+	activate(var/cause)
+		var/mob/M = imp_in
+		var/area/t = get_area(M)
+		if(cause == "death")
 			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 			if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
 				//give the syndies a bit of stealth
@@ -282,7 +294,11 @@ the implant may become unstable and either pre-maturely inject the subject or si
 				a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
 			del(a)
 			processing_objects.Remove(src)
-
+		else
+			var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+			a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
+			del(a)
+			processing_objects.Remove(src)
 
 	implanted(mob/source as mob)
 		mobname = source.real_name
@@ -314,13 +330,20 @@ the implant may become unstable and either pre-maturely inject the subject or si
 
 		if (emote == src.activation_emote)
 			source << "The air glows as \the [src.scanned.name] uncompresses."
-			var/turf/t = get_turf(source)
-			src.scanned.loc = t
-			del src
+			activate()
+
+	activate()
+		var/turf/t = get_turf(src)
+		src.scanned.loc = t
+		if (part) part.implants -= src
+		del src
 
 	implanted(mob/source as mob)
 		src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
-		source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
+		if (source.mind)
+			source.mind.store_memory("Freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate.", 0, 0)
 		source << "The implanted freedom implant can be activated by using the [src.activation_emote] emote, <B>say *[src.activation_emote]</B> to attempt to activate."
 		return 1
 
+	islegal()
+		return 0

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

@@ -40,6 +40,11 @@
 					src.imp.loc = M
 					src.imp.imp_in = M
 					src.imp.implanted = 1
+					if (ishuman(M))
+						var/mob/living/carbon/human/H = M
+						var/datum/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+						affected.implants += src.imp
+						imp.part = affected
 
 				src.imp = null
 				update()
@@ -107,6 +112,10 @@
 
 /obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
 	if(istype(A,/obj/item) && imp)
+		var/obj/item/weapon/implant/compressed/c = imp
+		if (c.scanned)
+			user << "\red Something is already scanned inside the implant!"
+			return
 		imp:scanned = A
 		A.loc.contents.Remove(A)
 		update()

code/game/verbs/ooc.dm

@@ -53,7 +53,7 @@
 					if(holder.rights & R_ADMIN)
 						C << "<font color=[config.allow_admin_ooccolor ? holder.ooccolor :"#b82e00" ]><b><span class='prefix'>OOC:</span> <EM>[key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
 						//todo: other adminranks OOC
-					if(holder.rights & R_MOD)
+					else if(holder.rights & R_MOD)
 						C << "<font color=#184880><b><span class='prefix'>OOC:</span> <EM>[key][holder.fakekey ? "/([holder.fakekey])" : ""]:</EM> <span class='message'>[msg]</span></b></font>"
 
 				else