Merge remote-tracking branch 'upstream/dev' into CultPorting

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

@@ -291,21 +291,14 @@
 	..()
 	if(istype(W, /obj/item/device/flash))
 		if(istype(user,/mob/living/silicon/robot))
-			user << "\red How do you propose to do that?"
-			return
-		else if(src.flash1 && src.flash2)
-			user << "\blue You have already inserted the eyes!"
-			return
-		else if(src.flash1)
-			user.drop_item()
-			W.loc = src
-			src.flash2 = W
-			user << "\blue You insert the flash into the eye socket!"
+			var/current_module = user.get_active_hand()
+			if(current_module == W)
+				user << "<span class='warning'>How do you propose to do that?</span>"
+				return
+			else
+				add_flashes(W,user)
 		else
-			user.drop_item()
-			W.loc = src
-			src.flash1 = W
-			user << "\blue You insert the flash into the eye socket!"
+			add_flashes(W,user)
 	else if(istype(W, /obj/item/weapon/stock_parts/manipulator))
 		user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!"
 		new /mob/living/simple_animal/spiderbot(get_turf(loc))
@@ -315,6 +308,22 @@
 		return
 	return
 
+/obj/item/robot_parts/head/proc/add_flashes(obj/item/W as obj, mob/user as mob) //Made into a seperate proc to avoid copypasta
+	if(src.flash1 && src.flash2)
+		user << "<span class='notice'>You have already inserted the eyes!</span>"
+		return
+	else if(src.flash1)
+		user.drop_item()
+		W.loc = src
+		src.flash2 = W
+		user << "<span class='notice'>You insert the flash into the eye socket!</span>"
+	else
+		user.drop_item()
+		W.loc = src
+		src.flash1 = W
+		user << "<span class='notice'>You insert the flash into the eye socket!</span>"
+
+
 /obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/weapon/card/emag))
 		if(sabotaged)

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

@@ -28,6 +28,9 @@
 /datum/matter_synth/medicine
 	name = "Medicine Synthesizer"
 
+/datum/matter_synth/nanite
+	name = "Nanite Synthesizer"
+
 /datum/matter_synth/metal
 	name = "Metal Synthesizer"
 

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

@@ -54,14 +54,9 @@ RSF
 		user << "Changed dispensing mode to 'Dice Pack'"
 		return
 	if (mode == 5)
-		mode = 6
+		mode = 1
 		user << "Changed dispensing mode to 'Cigarette'"
 		return
-	if (mode == 6)
-		mode = 1
-		user << "Changed dispensing mode to 'Dosh'"
-		return
-	// Change mode
 
 /obj/item/weapon/rsf/afterattack(atom/A, mob/user as mob, proximity)
 
@@ -84,8 +79,8 @@ RSF
 
 	switch(mode)
 		if(1)
-			product = new /obj/item/weapon/spacecash/c10()
-			used_energy = 200
+			product = new /obj/item/clothing/mask/smokable/cigarette()
+			used_energy = 10
 		if(2)
 			product = new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass()
 			used_energy = 50
@@ -98,9 +93,6 @@ RSF
 		if(5)
 			product = new /obj/item/weapon/storage/pill_bottle/dice()
 			used_energy = 200
-		if(6)
-			product = new /obj/item/clothing/mask/smokable/cigarette()
-			used_energy = 10
 
 	user << "Dispensing [product ? product : "product"]..."
 	product.loc = get_turf(A)

code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm

@@ -5,16 +5,23 @@
 /obj/item/weapon/circuitboard/security
 	name = T_BOARD("security camera monitor")
 	build_path = /obj/machinery/computer/security
-	var/network = list("SS13")
 	req_access = list(access_security)
+	var/list/network
 	var/locked = 1
 	var/emagged = 0
+	
+/obj/item/weapon/circuitboard/security/New()
+	..()
+	network = station_networks
 
 /obj/item/weapon/circuitboard/security/engineering
 	name = T_BOARD("engineering camera monitor")
 	build_path = /obj/machinery/computer/security/engineering
-	network = list("Engineering","Power Alarms","Atmosphere Alarms","Fire Alarms")
 	req_access = list()
+	
+/obj/item/weapon/circuitboard/security/engineering/New()
+	..()
+	network = engineering_networks
 
 /obj/item/weapon/circuitboard/security/mining
 	name = T_BOARD("mining camera monitor")

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

@@ -249,6 +249,10 @@
 	src.add_fingerprint(user)
 	return
 
+/obj/structure/closet/attack_ai(mob/user)
+	if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) // Robots can open/close it, but not the AI.
+		attack_hand(user)
+
 /obj/structure/closet/relaymove(mob/user as mob)
 	if(user.stat || !isturf(src.loc))
 		return

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

@@ -24,5 +24,6 @@
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
 		new /obj/item/weapon/wirecutters/clippers(src)
+		new /obj/item/weapon/reagent_containers/spray/plantbgone(src)
 //		new /obj/item/weapon/bee_net(src) //No more bees, March 2014
 		return