Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/datums/organs/organ_internal.dm
	code/datums/vote.dm
	code/defines/atom.dm
	code/defines/procs/gamehelpers.dm
	code/defines/turf.dm
	code/game/algorithm.dm
	code/game/cellautomata.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/electricchair.dm
	code/game/turfs/turf.dm
	code/game/vote.dm
	code/hub.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/food/food.dm
	code/modules/food/meat.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/photocopier.dm
	code/setup.dm
	icons/effects/genetics.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/RandomZLevels/fileList.txt

various misc mergefixes and todos

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/assembly/bomb.dm

@@ -1,6 +1,6 @@
 /obj/item/device/onetankbomb
 	name = "bomb"
-	icon = 'tank.dmi'
+	icon = 'icons/obj/tank.dmi'
 	item_state = "assembly"
 	throwforce = 5
 	w_class = 3.0
@@ -66,6 +66,8 @@
 		return
 	if(status)
 		bombtank.ignite()	//if its not a dud, boom (or not boom if you made shitty mix) the ignite proc is below, in this file
+	else
+		bombtank.release()
 
 /obj/item/device/onetankbomb/HasProximity(atom/movable/AM as mob|obj)
 	if(bombassembly)

code/modules/assembly/shock_kit.dm

@@ -1,56 +1,46 @@
 /obj/item/assembly/shock_kit
-	name = "Shock Kit"
-	desc = "This appears to be made from both an Electric Pack and a Helmet."
+	name = "electrohelmet assembly"
+	desc = "This appears to be made from both an electropack and a helmet."
 	icon_state = "shock_kit"
 	var/obj/item/clothing/head/helmet/part1 = null
 	var/obj/item/device/radio/electropack/part2 = null
-	var/status = 0.0
+	var/status = 0
 	w_class = 5.0
 	flags = FPRINT | TABLEPASS| CONDUCT
 
 /obj/item/assembly/shock_kit/Del()
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
+	del(part1)
+	del(part2)
 	..()
 	return
 
 /obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
+	if(istype(W, /obj/item/weapon/wrench) && !status)
+		var/turf/T = loc
+		if(ismob(T))
 			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
+		part1.loc = T
+		part2.loc = T
+		part1.master = null
+		part2.master = null
+		part1 = null
+		part2 = null
 		del(src)
 		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (!src.status)
-		user.show_message("\blue The shock pack is now secured!", 1)
-	else
-		user.show_message("\blue The shock pack is now unsecured!", 1)
-	src.add_fingerprint(user)
+	if(istype(W, /obj/item/weapon/screwdriver))
+		status = !status
+		user << "<span class='notice'>[src] is now [status ? "secured" : "unsecured"]!</span>"
+	add_fingerprint(user)
 	return
 
 /obj/item/assembly/shock_kit/attack_self(mob/user as mob)
-	src.part1.attack_self(user, src.status)
-	src.part2.attack_self(user, src.status)
-	src.add_fingerprint(user)
+	part1.attack_self(user, status)
+	part2.attack_self(user, status)
+	add_fingerprint(user)
 	return
 
 /obj/item/assembly/shock_kit/receive_signal()
-	//*****
-	//world << "Shock kit got r_signal"
-	if (istype(src.loc, /obj/structure/stool/bed/chair/e_chair))
-		var/obj/structure/stool/bed/chair/e_chair/C = src.loc
-		//world << "Shock kit sending shock to EC"
+	if(istype(loc, /obj/structure/stool/bed/chair/e_chair))
+		var/obj/structure/stool/bed/chair/e_chair/C = loc
 		C.shock()
 	return