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

code/game/jobs/departments.dm

@@ -0,0 +1 @@
+var/list/departments = list("Command", "Medical", "Engineering", "Security", "Civilian", "Cargo")

code/game/machinery/cloning.dm

@@ -3,6 +3,8 @@
 
 //Potential replacement for genetics revives or something I dunno (?)
 
+#define CLONE_BIOMASS 150
+
 /obj/machinery/clonepod
 	anchored = 1
 	name = "cloning pod"
@@ -18,6 +20,7 @@
 	var/mess = 0 //Need to clean out it if it's full of exploded clone.
 	var/attempting = 0 //One clone attempt at a time thanks
 	var/eject_wait = 0 //Don't eject them as soon as they are created fuckkk
+	var/biomass = CLONE_BIOMASS
 
 //The return of data disks?? Just for transferring between genetics machine/cloning machine.
 //TO-DO: Make the genetics machine accept them.
@@ -271,6 +274,12 @@
 		src.locked = 0
 		src.go_out()
 		return
+	else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat))
+		user << "\blue \The [src] processes \the [W]."
+		biomass += 50
+		user.drop_item()
+		del(W)
+		return
 	else
 		..()
 
@@ -328,6 +337,9 @@
 	domutcheck(src.occupant) //Waiting until they're out before possible monkeyizing.
 	src.occupant.add_side_effect("Bad Stomach") // Give them an extra side-effect for free.
 	src.occupant = null
+
+	src.biomass -= CLONE_BIOMASS
+
 	return
 
 /obj/machinery/clonepod/proc/malfunction()

code/game/machinery/computer/cloning.dm

@@ -202,6 +202,9 @@
 
 				dat += "Lock status: <a href='byond://?src=\ref[src];lock=1'>[src.scanner.locked ? "Locked" : "Unlocked"]</a><br>"
 
+			if (!isnull(src.pod1))
+				dat += "Biomass: <i>[src.pod1.biomass]</i><br>"
+
 			// Database
 			dat += "<h4>Database Functions</h4>"
 			dat += "<a href='byond://?src=\ref[src];menu=2'>View Records</a><br>"
@@ -243,8 +246,12 @@
 					dat += "<br>" //Keeping a line empty for appearances I guess.
 
 				dat += {"<b>UI:</b> [src.active_record.fields["UI"]]<br>
-				<b>SE:</b> [src.active_record.fields["SE"]]<br><br>
-				<a href='byond://?src=\ref[src];clone=\ref[src.active_record]'>Clone</a><br>"}
+				<b>SE:</b> [src.active_record.fields["SE"]]<br><br>"}
+
+				if(pod1 && pod1.biomass >= CLONE_BIOMASS)
+					dat += {"<a href='byond://?src=\ref[src];clone=\ref[src.active_record]'>Clone</a><br>"}
+				else
+					dat += {"<b>Unsufficient biomass</b><br>"}
 
 		if(4)
 			if (!src.active_record)
@@ -378,6 +385,8 @@
 				temp = "Error: No Clonepod detected."
 			else if(pod1.occupant)
 				temp = "Error: Clonepod is currently occupied."
+			else if(pod1.biomass < CLONE_BIOMASS)
+				temp = "Error: Not enough biomass."
 			else if(pod1.mess)
 				temp = "Error: Clonepod malfunction."
 			else if(!config.revival_cloning)
@@ -389,6 +398,7 @@
 				del(C)
 				menu = 1
 			else
+
 				var/mob/selected = find_dead_player("[C.fields["ckey"]]")
 				selected << 'chime.ogg'	//probably not the best sound but I think it's reasonable
 				var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No")

code/game/objects/items/devices/radio/intercom.dm

@@ -4,7 +4,7 @@
 	icon_state = "intercom"
 	anchored = 1
 	w_class = 4.0
-	canhear_range = 2
+	canhear_range = 7
 	var/number = 0
 	var/anyai = 1
 	var/mob/living/silicon/ai/ai = list()