Merge branch 'master' into inspace

code/datums/organs/organ_external.dm

@@ -426,8 +426,22 @@
 				else
 					H.icon_state = initial(H.icon_state)+"_l"
 
-			var/lol = pick(cardinal)
-			step(H,lol)
+			if(status & ORGAN_ROBOT)
+				del H
+				switch(body_part)
+					if(LEG_RIGHT)
+						H = new /obj/item/robot_parts/r_leg(owner.loc)
+					if(LEG_LEFT)
+						H = new /obj/item/robot_parts/l_leg(owner.loc)
+					if(ARM_RIGHT)
+						H = new /obj/item/robot_parts/r_arm(owner.loc)
+					if(ARM_LEFT)
+						H = new /obj/item/robot_parts/l_arm(owner.loc)
+
+			if(H)
+				var/lol = pick(cardinal)
+				step(H,lol)
+				
 			destspawn = 1
 			if(status & ORGAN_ROBOT)
 				owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\
@@ -514,10 +528,15 @@
 	proc/emp_act(severity)
 		if(!(status & ORGAN_ROBOT))
 			return
-		if(prob(30*severity))
+		var/probability = 30
+		var/damage = 15
+		if(severity == 2)
+			probability = 1
+			damage = 3
+		if(prob(probability))
 			droplimb(1)
 		else
-			take_damage(4(4-severity), 0, 1, used_weapon = "EMP")
+			take_damage(damage, 0, 1, used_weapon = "EMP")
 
 	proc/getDisplayName()
 		switch(name)

code/defines/obj/weapon.dm

@@ -789,7 +789,7 @@
 	desc = "A cane used by a true gentlemen."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "cane"
-	item_state = "cane"
+	item_state = "stick"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	force = 5.0
 	throwforce = 7.0

code/game/dna.dm

@@ -188,7 +188,9 @@
 	return result
 
 /proc/setblock(istring, blocknumber, replacement, blocksize)
-	if(!istring || !blocknumber || !replacement || !blocksize)	return 0
+	if(!blocknumber)
+		return istring
+	if(!istring || !replacement || !blocksize)	return 0
 	var/result = getleftblocks(istring, blocknumber, blocksize) + replacement + getrightblocks(istring, blocknumber, blocksize)
 	return result
 

code/game/gamemodes/events.dm

@@ -36,40 +36,6 @@
 			spawn(700)
 				meteor_wave()
 				spawn_meteors()
-
-		/*if(2)
-			command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/granomalies.ogg')
-			var/turf/T = pick(blobstart)
-			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
-			spawn(rand(50, 300))
-				del(bh)*/
-		/*
-		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
-			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
-			world << sound('sound/AI/spanomalies.ogg')
-			var/list/turfs = new
-			var/turf/picked
-			for(var/turf/simulated/floor/T in world)
-				if(T.z == 1)
-					turfs += T
-			for(var/turf/simulated/floor/T in turfs)
-				if(prob(20))
-					spawn(50+rand(0,3000))
-						picked = pick(turfs)
-						var/obj/effect/portal/P = new /obj/effect/portal( T )
-						P.target = picked
-						P.creator = null
-						P.icon = 'icons/obj/objects.dmi'
-						P.failchance = 0
-						P.icon_state = "anom"
-						P.name = "wormhole"
-						spawn(rand(300,600))
-							del(P)
-		*/
-		if(3)
-			if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.
-				space_ninja_arrival()//Handled in space_ninja.dm. Doesn't announce arrival, all sneaky-like.
 		if(4)
 			mini_blob_event()
 
@@ -524,4 +490,4 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
 		world << "Finished processing FIREDOORS. Processed: [firedoornum]"
 
 	world << "Ion Storm Main Done"
-	*/
+	*/

code/game/gamemodes/events/miniblob.dm

@@ -9,7 +9,7 @@
 	blobevent = 1
 	spawn(0)
 		dotheblobbaby()
-	spawn(3000)
+	spawn(12000) // blob event can last up to 20 minutes
 		blobevent = 0
 	spawn(rand(1000, 2000)) //Delayed announcements to keep the crew on their toes.
 		command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert")
@@ -25,5 +25,5 @@
 				if(B.z != 1)
 					continue
 				B.Life()
-		spawn(70)
-			dotheblobbaby()
+		spawn(280) // advance 1 tile every 30 seconds
+			dotheblobbaby()

code/game/gamemodes/objective.dm

@@ -106,6 +106,7 @@ datum/objective/mutiny/rp
 
 	// less violent rev objectives
 	check_completion()
+		var/rval = 1
 		if(target && target.current)
 			if(target.current.stat == DEAD || target.current.handcuffed || !ishuman(target.current))
 				return 1
@@ -115,9 +116,9 @@ datum/objective/mutiny/rp
 					return 1
 			var/turf/T = get_turf(target.current)
 			if(T && (T.z != 1))			//If they leave the station they count as dead for this
-				return 2
+				rval = 2
 			return 0
-		return 1
+		return rval
 
 datum/objective/anti_revolution/execute
 	find_target()

code/game/jobs/job/assistant.dm

@@ -12,4 +12,8 @@
 		if(!H)	return 0
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1

code/game/jobs/job/civilian.dm

@@ -57,6 +57,10 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/chefhat(H), slot_head)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/chef(H), slot_belt)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -80,6 +84,10 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/device/analyzer/plant_analyzer(H), slot_s_store)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/botanist(H), slot_belt)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -105,6 +113,10 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
 		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
 		H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -127,6 +139,10 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/cargo(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -251,6 +267,10 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/janitor(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/janitor(H), slot_belt)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -273,6 +293,10 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/librarian(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/weapon/barcodescanner(H), slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 

code/game/jobs/job/civilian_chaplain.dm

@@ -18,6 +18,10 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		spawn(0)
 			var/religion_name = "Christianity"
 			var/new_religion = copytext(sanitize(input(H, "You are the Chaplain. Would you like to change your religion? Default is Christianity, in SPACE.", "Name change", religion_name)),1,MAX_NAME_LEN)

code/game/jobs/job/medical.dm

@@ -99,6 +99,10 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/chemist(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/chemist(H), slot_wear_suit)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -122,6 +126,10 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/geneticist(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/genetics(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 /*

code/game/jobs/job/science.dm

@@ -18,6 +18,10 @@
 		H.equip_to_slot_or_del(new /obj/item/device/pda/heads/rd(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/weapon/clipboard(H), slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
 
@@ -41,6 +45,8 @@
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/toxins(H), slot_belt)
 		H.equip_to_slot_or_del(new /obj/item/clothing/suit/labcoat/science(H), slot_wear_suit)
-//		H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(H), slot_wear_mask)
-//		H.equip_to_slot_or_del(new /obj/item/weapon/tank/oxygen(H), slot_l_hand)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1

code/game/machinery/constructable_frame.dm

@@ -154,7 +154,7 @@
 									update_desc()
 									break
 							user << desc
-							if(P.loc != src && !istype(P, /obj/item/weapon/cable_coil))
+							if(P && P.loc != src && !istype(P, /obj/item/weapon/cable_coil))
 								user << "\red You cannot add that component to the machine!"
 
 

code/game/objects/items/weapons/storage/belt.dm

@@ -95,7 +95,8 @@
 		"/obj/item/stack/medical",
 		"/obj/item/device/flashlight/pen",
 		"/obj/item/clothing/mask/surgical",
-		"/obj/item/clothing/gloves/latex"
+		"/obj/item/clothing/gloves/latex",
+        "/obj/item/weapon/reagent_containers/hypospray/autoinjector"
 	)
 
 
@@ -153,4 +154,4 @@
 	storage_slots = 1
 	can_hold = list(
 		"/obj/item/clothing/mask/luchador"
-		)
+		)

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

@@ -10,6 +10,8 @@
 	w_class = 3
 	var/charges = 10
 	var/status = 0
+	var/mob/foundmob = "" //Used in throwing proc.
+
 	origin_tech = "combat=2"
 
 
@@ -99,7 +101,12 @@
 				H.apply_effect(10, STUTTER, 0)
 				charges--
 
-				H.visible_message("<span class='danger'>[src], thrown by ([src.fingerprintslast]) hits [H] with stunning end!</span>")
+				for(var/mob/M in player_list) if(M.key == src.fingerprintslast)
+					foundmob = M
+					break
+
+				H.visible_message("<span class='danger'>[src], thrown by [foundmob.name], strikes [H] and stuns them!</span>")
+
 				H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by thrown [src.name] (([src.fingerprintslast]))</font>"
 				log_attack("<font color='red'>Flying [src.name], thrown by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])</font>" )
 

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -134,7 +134,7 @@
 	w_class = 2.0
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
-	volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
+	volume = 2 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
 
 
 	New()

code/modules/admin/admin.dm

@@ -173,26 +173,54 @@ var/global/floorIsLava = 0
 /datum/player_info/var/content // text content of the information
 /datum/player_info/var/timestamp // Because this is bloody annoying
 
+#define PLAYER_NOTES_ENTRIES_PER_PAGE 50
 /datum/admins/proc/PlayerNotes()
 	set category = "Admin"
 	set name = "Player Notes"
-	var/dat = "<B>Player notes</B><HR><table>"
 	if (!istype(src,/datum/admins))
 		src = usr.client.holder
 	if (!istype(src,/datum/admins))
 		usr << "Error: you are not an admin!"
 		return
+	PlayerNotesPage(1)
 
+/datum/admins/proc/PlayerNotesPage(page)
+	var/dat = "<B>Player notes</B><HR>"
 	var/savefile/S=new("data/player_notes.sav")
 	var/list/note_keys
 	S >> note_keys
 	if(!note_keys)
 		dat += "No notes found."
 	else
+		dat += "<table>"
 		sortList(note_keys)
-		for(var/t in note_keys)
+
+		// Display the notes on the current page
+		var/number_pages = note_keys.len / PLAYER_NOTES_ENTRIES_PER_PAGE
+		// Emulate ceil(why does BYOND not have ceil)
+		if(number_pages != round(number_pages))
+			number_pages = round(number_pages) + 1
+		var/page_index = page - 1
+		if(page_index < 0 || page_index >= number_pages)
+			return
+
+		var/lower_bound = page_index * PLAYER_NOTES_ENTRIES_PER_PAGE + 1
+		var/upper_bound = (page_index + 1) * PLAYER_NOTES_ENTRIES_PER_PAGE
+		upper_bound = min(upper_bound, note_keys.len)
+		for(var/index = lower_bound, index <= upper_bound, index++)
+			var/t = note_keys[index]
 			dat += "<tr><td><a href='?src=\ref[src];notes=show;ckey=[t]'>[t]</a></td></tr>"
-	dat += "</table>"
+
+		dat += "</table><br>"
+
+		// Display a footer to select different pages
+		for(var/index = 1, index <= number_pages, index++)
+			if(index == page)
+				dat += "<b>"
+			dat += "<a href='?src=\ref[src];notes=list;index='[index]'>[index]</a> "
+			if(index == page)
+				dat += "</b>"
+
 	usr << browse(dat, "window=player_notes;size=400x400")
 
 
@@ -1123,4 +1151,4 @@ proc/move_alien_ship()
 		alien_ship_location = 0
 	else
 		alien_ship_location = 1
-	return
+	return

code/modules/admin/holder2.dm

@@ -2706,4 +2706,6 @@ var/list/admin_datums = list()
 		switch(href_list["notes"])
 			if("show")
 				show_player_info(ckey)
+			if("list")
+				PlayerNotesPage(href_list["index"])
 		return

code/modules/awaymissions/zlevel.dm

@@ -28,10 +28,12 @@ proc/createRandomZlevel()
 	//	var/value = null
 
 		if (pos)
-			name = lowertext(copytext(t, 1, pos))
+            // No, don't do lowertext here, that breaks paths on linux
+			name = copytext(t, 1, pos)
 		//	value = copytext(t, pos + 1)
 		else
-			name = lowertext(t)
+            // No, don't do lowertext here, that breaks paths on linux
+			name = t
 
 		if (!name)
 			continue
@@ -56,4 +58,4 @@ proc/createRandomZlevel()
 
 	else
 		world << "\red \b No away missions found."
-		return
+		return

code/modules/mob/living/carbon/human/life.dm

@@ -140,7 +140,7 @@
 							if(D.data["donor"] == src)
 								B = D
 								break
-					var/datum/reagent/nutriment/F = locate() in vessel.reagent_list
+					var/datum/reagent/nutriment/F = locate() in reagents.reagent_list
 					if(F != null)
 						if(F.volume >= 1)
 							// nutriment speeds it up quite a bit
@@ -274,7 +274,7 @@
 				if(E.name == "l_hand" || E.name == "l_arm")
 					if(hand && equipped())
 						drop_item()
-						emote("custom v drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
+						emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
 						var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 						spark_system.set_up(5, 0, src)
 						spark_system.attach(src)
@@ -284,7 +284,7 @@
 				else if(E.name == "r_hand" || E.name == "r_arm")
 					if(!hand && equipped())
 						drop_item()
-						emote("custom v drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
+						emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
 						var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 						spark_system.set_up(5, 0, src)
 						spark_system.attach(src)

code/modules/mob/living/silicon/robot/robot_items.dm

@@ -0,0 +1,122 @@
+// A special tray for the service droid. Allow droid to pick up and drop items as if they were using the tray normally
+// Click on table to unload, click on item to load. Otherwise works identically to a tray.
+// Unlike the base item "tray", robotrays ONLY pick up food, drinks and condiments.
+
+/obj/item/weapon/tray/robotray
+	name = "RoboTray"
+	desc = "An autoloading tray specialized for carrying refreshments."
+
+/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob)
+	if ( !target )
+		return
+	// pick up items, mostly copied from base tray pickup proc
+	// see code\game\objects\items\weapons\kitchen.dm line 241
+	if ( istype(target,/obj/item))
+		if ( !isturf(target.loc) ) // Don't load up stuff if it's inside a container or mob!
+			return
+		var turf/pickup = target.loc
+
+		var addedSomething = 0
+
+		for(var/obj/item/weapon/reagent_containers/food/I in pickup)
+
+
+			if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) )
+				var/add = 0
+				if(I.w_class == 1.0)
+					add = 1
+				else if(I.w_class == 2.0)
+					add = 3
+				else
+					add = 5
+				if(calc_carry() + add >= max_carry)
+					break
+
+				I.loc = src
+				carrying.Add(I)
+				overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer)
+				addedSomething = 1
+		if ( addedSomething )
+			user.visible_message("\blue [user] load some items onto their service tray.")
+
+		return
+
+	// Unloads the tray, copied from base item's proc dropped() and altered
+	// see code\game\objects\items\weapons\kitchen.dm line 263
+
+	if ( isturf(target) || istype(target,/obj/structure/table) )
+		var foundtable = istype(target,/obj/structure/table/)
+		if ( !foundtable ) //it must be a turf!
+			for(var/obj/structure/table/T in target)
+				foundtable = 1
+				break
+
+		var turf/dropspot
+		if ( !foundtable ) // don't unload things onto walls or other silly places.
+			dropspot = user.loc
+		else if ( isturf(target) ) // they clicked on a turf with a table in it
+			dropspot = target
+		else					// they clicked on a table
+			dropspot = target.loc
+
+
+		overlays = null
+
+		var droppedSomething = 0
+
+		for(var/obj/item/I in carrying)
+			I.loc = dropspot
+			carrying.Remove(I)
+			droppedSomething = 1
+			if(!foundtable && isturf(dropspot))
+				// if no table, presume that the person just shittily dropped the tray on the ground and made a mess everywhere!
+				spawn()
+					for(var/i = 1, i <= rand(1,2), i++)
+						if(I)
+							step(I, pick(NORTH,SOUTH,EAST,WEST))
+							sleep(rand(2,4))
+		if ( droppedSomething )
+			if ( foundtable )
+				user.visible_message("\blue [user] unloads their service tray.")
+			else
+				user.visible_message("\blue [user] drops all the items on their tray.")
+
+	return ..()
+
+
+
+
+// A special pen for service droids. Can be toggled to switch between normal writting mode, and paper rename mode
+// Allows service droids to rename paper items.
+
+/obj/item/weapon/pen/robopen
+	desc = "A black ink printing attachment with a paper naming mode."
+	name = "Printing Pen"
+	var/mode = 1
+
+/obj/item/weapon/pen/robopen/attack_self(mob/user as mob)
+	playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
+	if (mode == 1)
+		mode = 2
+		user << "Changed printing mode to 'Rename Paper'"
+		return
+	if (mode == 2)
+		mode = 1
+		user << "Changed printing mode to 'Write Paper'"
+
+// Copied over from paper's rename verb
+// see code\modules\paperwork\paper.dm line 62
+
+/obj/item/weapon/pen/robopen/proc/RenamePaper(mob/user as mob,obj/paper as obj)
+	if ( !user || !paper )
+		return
+	var/n_name = input(user, "What would you like to label the paper?", "Paper Labelling", null)  as text
+	if ( !user || !paper )
+		return
+
+	n_name = copytext(n_name, 1, 32)
+	if(( get_dist(user,paper) <= 1  && user.stat == 0))
+		paper.name = "paper[(n_name ? text("- '[n_name]'") : null)]"
+	add_fingerprint(user)
+	return
+

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -170,7 +170,7 @@
 		..()
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
-		src.modules += new /obj/item/weapon/pen(src)
+		src.modules += new /obj/item/weapon/pen/robopen(src)
 
 		var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
 		M.matter = 30
@@ -182,7 +182,7 @@
 		L.light_on = 1
 		src.modules += L
 
-		src.modules += new /obj/item/weapon/tray(src)
+		src.modules += new /obj/item/weapon/tray/robotray(src)
 		src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
 		src.emag = new /obj/item/weapon/reagent_containers/food/drinks/beer(src)
 

code/modules/mob/transform_procs.dm

@@ -29,7 +29,7 @@
 	dna = null
 	O.dna.uni_identity = "00600200A00E0110148FC01300B009"
 	//O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8"
-	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*13)]BB8"
+	O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8"
 	O.loc = loc
 	O.viruses = viruses
 	viruses = list()

code/modules/paperwork/paper.dm

@@ -264,7 +264,10 @@
 		clown = 1
 
 	if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
-		user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]")
+		if ( istype(P, /obj/item/weapon/pen/robopen) && P:mode == 2 )
+			P:RenamePaper(user,src)
+		else
+			user << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links][stamps]</BODY></HTML>", "window=[name]")
 		//openhelp(user)
 		return
 	else if(istype(P, /obj/item/weapon/stamp))

code/modules/power/port_gen.dm

@@ -213,12 +213,22 @@ display round(lastgen) and plasmatank amount
 				user << "\blue You open the access panel."
 			else
 				user << "\blue You close the access panel."
-		else if(istype(O, /obj/item/weapon/crowbar) && !open)
+		else if(istype(O, /obj/item/weapon/crowbar) && open)
 			var/obj/machinery/constructable_frame/machine_frame/new_frame = new /obj/machinery/constructable_frame/machine_frame(src.loc)
 			for(var/obj/item/I in component_parts)
 				if(I.reliability < 100)
 					I.crit_fail = 1
 				I.loc = src.loc
+			while ( sheets > 0 )
+				var/obj/item/stack/sheet/G = new sheet_path(src.loc)
+
+				if ( sheets > 50 )
+					G.amount = 50
+				else
+					G.amount = sheets
+
+				sheets -= G.amount
+
 			new_frame.state = 2
 			new_frame.icon_state = "box_1"
 			del(src)

code/modules/projectiles/projectile.dm

@@ -87,19 +87,19 @@
 					visible_message("\red [A.name] is hit by the [src.name] in the [def_zone]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
 
 			if(istype(firer, /mob))
-				M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]</font>")
+				M.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
+				firer.attack_log += "\[[time_stamp()]\] <b>[firer]/[firer.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>[src.type]</b>"
+				log_attack("<font color='red'>[firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]</font>")
 
-				log_admin("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]")
-				msg_admin_attack("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG
+				log_admin("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]")
+				msg_admin_attack("ATTACK: [firer] ([firer.ckey]) shot [M] ([M.ckey]) with a [src.type]") //BS12 EDIT ALG
 
 			else
 				M.attack_log += "\[[time_stamp()]\] <b>UNKNOWN SUBJECT (No longer exists)</b> shot <b>[M]/[M.ckey]</b> with a <b>[src]</b>"
-				log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src]</font>")
+				log_attack("<font color='red'>UNKNOWN shot [M] ([M.ckey]) with a [src.type]</font>")
 
 				log_admin("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src]")
-				msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src]") //BS12 EDIT ALG
+				msg_admin_attack("ATTACK: UNKNOWN shot [M] ([M.ckey]) with a [src.type]") //BS12 EDIT ALG
 
 		spawn(0)
 			if(A)

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -93,15 +93,27 @@
 				user << "\red [target] is full."
 				return
 
+
+
+			var/datum/reagent/refill
+			var/datum/reagent/refillName
+			if(isrobot(user))
+				refill = reagents.get_master_reagent_id()
+				refillName = reagents.get_master_reagent_name()
+
 			var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 			user << "\blue You transfer [trans] units of the solution to [target]."
 
 			if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
 				var/mob/living/silicon/robot/bro = user
-				bro.cell.use(30)
-				var/refill = reagents.get_master_reagent_id()
-				spawn(600)
+				var/chargeAmount = max(30,4*trans)
+				bro.cell.use(chargeAmount)
+				user << "Now synthesizing [trans] units of [refillName]..."
+
+
+				spawn(300)
 					reagents.add_reagent(refill, trans)
+					user << "Cyborg [src] refilled."
 
 		return
 

code/modules/recycling/disposal.dm

@@ -1047,21 +1047,6 @@
 		update()
 		return
 
-	New()
-		..()
-		posdir = dir
-		if(icon_state == "pipe-j1s")
-			sortdir = turn(posdir, -90)
-			negdir = turn(posdir, 180)
-		else
-			icon_state = "pipe-j2s"
-			sortdir = turn(posdir, 90)
-			negdir = turn(posdir, 180)
-		dpdir = sortdir | posdir | negdir
-
-		update()
-		return
-
 
 	// next direction to move
 	// if coming in from negdir, then next is primary dir or sortdir

code/modules/recycling/sortingmachinery.dm

@@ -39,8 +39,8 @@
 		return
 
 /obj/item/smallDelivery
-	desc = "A small wrapped package."
-	name = "small parcel"
+	desc = "A wrapped package."
+	name = "parcel"
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "deliverycrateSmall"
 	var/obj/item/wrapped = null

code/modules/research/designs.dm

@@ -547,7 +547,7 @@ datum/design/telecomms_processor
 	build_path = "/obj/item/weapon/circuitboard/telecomms/processor"
 
 datum/design/telecomms_server
-	name = "Circuit Design (Subspace Receiver)"
+	name = "Circuit Design (Telecommunication Server)"
 	desc = "Allows for the construction of Telecommunications Servers."
 	id = "s-server"
 	req_tech = list("programming" = 4, "engineering" = 4)

code/modules/research/xenoarchaeology/artifact_effect.dm

@@ -215,11 +215,12 @@
 			if("celldrain")
 				for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
 					for (var/obj/item/weapon/cell/B in C.contents)
-						B.charge -= 10
-				for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) S.charge -= 20
+						B.charge = max(B.charge-10,0)
+				for (var/obj/machinery/power/smes/S in range (src.aurarange,originator))
+					S.charge = max(S.charge-20,0)
 				for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
 					for (var/obj/item/weapon/cell/D in M.contents)
-						D.charge -= 10
+						D.charge = max(D.charge-10,0)
 						if(prob(10)) M << "\red SYSTEM ALERT: Energy draining field detected!"
 				return 1
 			if("planthelper")
@@ -305,11 +306,12 @@
 			if("celldrain")
 				for (var/obj/machinery/power/apc/C in range(src.aurarange,originator))
 					for (var/obj/item/weapon/cell/B in C.contents)
-						B.charge -= 500
-				for (var/obj/machinery/power/smes/S in range (src.aurarange,originator)) S.charge -= 400
+						B.charge = max(B.charge-500,0)
+				for (var/obj/machinery/power/smes/S in range (src.aurarange,originator))
+					S.charge = max(S.charge-400,0)
 				for (var/mob/living/silicon/robot/M in range(src.aurarange,originator))
 					for (var/obj/item/weapon/cell/D in M.contents)
-						D.charge -= 500
+						D.charge = max(D.charge-500,0)
 						M << "\red SYSTEM ALERT: Severe energy drain detected!"
 				return 1
 			if("planthelper")
@@ -407,11 +409,12 @@
 			if("celldrain")
 				for (var/obj/machinery/power/apc/C in world)
 					for (var/obj/item/weapon/cell/B in C.contents)
-						B.charge -= 250
-				for (var/obj/machinery/power/smes/S in range (src.aurarange,src)) S.charge -= 250
+						B.charge = max(B.charge-250,0)
+				for (var/obj/machinery/power/smes/S in range (src.aurarange,src))
+					S.charge = max(S.charge-250,0)
 				for (var/mob/living/silicon/robot/M in world)
 					for (var/obj/item/weapon/cell/D in M.contents)
-						D.charge -= 250
+						D.charge = max(D.charge-250,0)
 						M << "\red SYSTEM ALERT: Energy drain detected!"
 				return 1
 			if("teleport")