Quick sync (#2587)

* sync since the mirror was down

* fucking byond

* can't forget these

code/modules/power/cell.dm

@@ -1,11 +1,11 @@
 /obj/item/stock_parts/cell
 	name = "power cell"
-	desc = "A rechargeable electrochemical power cell."
+	desc = "A rechargeable electrochemical power cell."
 	icon = 'icons/obj/power.dmi'
 	icon_state = "cell"
 	item_state = "cell"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	origin_tech = "powerstorage=1"
 	force = 5
 	throwforce = 5
@@ -156,7 +156,7 @@
 
 
 /obj/item/stock_parts/cell/blob_act(obj/structure/blob/B)
-	ex_act(EXPLODE_DEVASTATE)
+	ex_act(EXPLODE_DEVASTATE)
 
 /obj/item/stock_parts/cell/proc/get_electrocute_damage()
 	if(charge >= 1000)
@@ -166,7 +166,7 @@
 
 /* Cell variants*/
 /obj/item/stock_parts/cell/crap
-	name = "\improper Nanotrasen brand rechargeable AA battery"
+	name = "\improper Nanotrasen brand rechargeable AA battery"
 	desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
 	maxcharge = 500
 	materials = list(MAT_GLASS=40)
@@ -176,8 +176,21 @@
 	..()
 	charge = 0
 
+/obj/item/stock_parts/cell/upgraded
+	name = "high-capacity power cell"
+	desc = "A power cell with a slightly higher capacity than normal!"
+	maxcharge = 2500
+	materials = list(MAT_GLASS=50)
+	rating = 2
+	chargerate = 1000
+
+/obj/item/stock_parts/cell/upgraded/plus
+	name = "upgraded power cell+"
+	desc = "A power cell with an even higher capacity than the base model!"
+	maxcharge = 5000
+
 /obj/item/stock_parts/cell/secborg
-	name = "security borg rechargeable D battery"
+	name = "security borg rechargeable D battery"
 	origin_tech = null
 	maxcharge = 600	//600 max charge / 100 charge per shot = six shots
 	materials = list(MAT_GLASS=40)
@@ -249,7 +262,7 @@
 
 /obj/item/stock_parts/cell/bluespace
 	name = "bluespace power cell"
-	desc = "A rechargeable transdimensional power cell."
+	desc = "A rechargeable transdimensional power cell."
 	origin_tech = "powerstorage=5;bluespace=4;materials=4;engineering=4"
 	icon_state = "bscell"
 	maxcharge = 40000
@@ -289,7 +302,7 @@
 
 /obj/item/stock_parts/cell/potato
 	name = "potato battery"
-	desc = "A rechargeable starch based power cell."
+	desc = "A rechargeable starch based power cell."
 	icon = 'icons/obj/hydroponics/harvest.dmi'
 	icon_state = "potato"
 	origin_tech = "powerstorage=1;biotech=1"

code/modules/shuttle/emergency.dm

@@ -290,7 +290,7 @@
 		if(SHUTTLE_CALL)
 			if(time_left <= 0)
 				//move emergency shuttle to station
-				if(dock(SSshuttle.getDock("emergency_home")))
+				if(dock(SSshuttle.getDock("emergency_home")) != DOCKING_SUCCESS)
 					setTimer(20)
 					return
 				mode = SHUTTLE_DOCKED

code/modules/shuttle/shuttle.dm

@@ -418,7 +418,7 @@
 	var/obj/docking_port/stationary/S0 = get_docked()
 	var/obj/docking_port/stationary/S1 = assigned_transit
 	if(S1)
-		if(dock(S1))
+		if(dock(S1) != DOCKING_SUCCESS)
 			WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].")
 		else
 			previous = S0
@@ -498,7 +498,7 @@
 
 	if(new_dock.get_docked() == src)
 		remove_ripples()
-		return DOCKING_COMPLETE
+		return DOCKING_SUCCESS
 
 	if(!force)
 		if(!check_dock(new_dock))
@@ -650,11 +650,11 @@
 	// then try again
 	switch(mode)
 		if(SHUTTLE_CALL)
-			if(dock(destination, preferred_direction))
+			if(dock(destination, preferred_direction) != DOCKING_SUCCESS)
 				setTimer(20)
 				return
 		if(SHUTTLE_RECALL)
-			if(dock(previous))
+			if(dock(previous) != DOCKING_SUCCESS)
 				setTimer(20)
 				return
 		if(SHUTTLE_IGNITING)

code/modules/surgery/organs/vocal_cords.dm

@@ -569,6 +569,7 @@
 
 	message_admins("[key_name_admin(user)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
 	log_game("[key_name(user)] has said '[log_message]' with a Voice of God, affecting [english_list(listeners)], with a power multiplier of [power_multiplier].")
+	SSblackbox.add_details("voice_of_god", log_message)
 
 	return cooldown