TG: Tonnes of stuff, please check the changelog.

In short: massive updates to security, the library, hydroponics, the kitchen and
the bar, by Flazeo and Ikarrus
Massive updates to the PA, with Invisty's new sprites, done by Sieve
New sprites for field gens too, also by Invisty
Borg and battery updates by Sieve
Fake gloves by Sieve
I messed around with some pressure_resistance stuff on Dumpdavidson's suggestion
(only in paperwork)

PROBABLY A BUNCH OF OTHER SHIT
Revision: r3505
Author: 	 petethegoat

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

@@ -265,6 +265,11 @@
 		else
 			stat(null, text("No Cell Inserted!"))
 
+		if(module)
+			internal = locate(/obj/item/weapon/tank/jetpack) in module.modules
+			if(internal)
+				stat("Internal Atmosphere Info", internal.name)
+				stat("Tank Pressure", internal.air_contents.return_pressure())
 
 /mob/living/silicon/robot/restrained()
 	return 0

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

@@ -8,6 +8,7 @@
 	var
 		list/modules = list()
 		obj/item/emag = null
+		obj/item/borg/upgrade/jetpack = null
 
 
 	emp_act(severity)
@@ -24,6 +25,8 @@
 		src.modules += new /obj/item/device/flash(src)
 		src.emag = new /obj/item/toy/sword(src)
 		src.emag.name = "Placeholder Emag Item"
+//		src.jetpack = new /obj/item/toy/sword(src)
+//		src.jetpack.name = "Placeholder Upgrade Item"
 		return
 
 
@@ -152,7 +155,7 @@
 		src.modules += new /obj/item/weapon/handcuffs/cyborg(src)
 		src.modules += new /obj/item/weapon/melee/baton(src)
 		src.modules += new /obj/item/weapon/gun/energy/taser/cyborg(src)
-//		src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
+		src.emag = new /obj/item/weapon/gun/energy/laser/cyborg(src)
 		return
 
 
@@ -217,9 +220,10 @@
 		..()
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.emag = new /obj/item/borg/stun(src)
-		src.modules += new /obj/item/weapon/satchel(src)
-		src.modules += new /obj/item/weapon/pickaxe/jackhammer(src)
-		src.modules += new /obj/item/weapon/shovel(src)
+		src.modules += new /obj/item/weapon/satchel/borg(src)
+		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
+//		src.modules += new /obj/item/weapon/shovel(src) Uneeded due to buffed drill
+//		src.jetpack += new/obj/item/weapon/tank/jetpack/carbondioxide(src)
 		return
 
 
@@ -231,5 +235,4 @@
 		src.modules += new /obj/item/weapon/melee/energy/sword(src)
 		src.modules += new /obj/item/weapon/gun/energy/pulse_rifle/destroyer(src)
 		src.modules += new /obj/item/weapon/card/emag(src)
-		src.modules += new /obj/item/weapon/tank/jetpack/oxygen(src)
 		return

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

@@ -5,7 +5,7 @@
 	name = "A borg upgrade module."
 	desc = "Protected by FRM."
 	icon = 'module.dmi'
-	icon_state = "id_mod"
+	icon_state = "cyborg_upgrade"
 	var/construction_time = 120
 	var/construction_cost = list("metal"=10000)
 	var/locked = 0
@@ -19,6 +19,7 @@
 /obj/item/borg/upgrade/reset/
 	name = "Borg module reset board"
 	desc = "Used to reset a borg's module. Destroys any other upgrades applied to the borg."
+	icon_state = "cyborg_upgrade1"
 	require_module = 1
 
 /obj/item/borg/upgrade/reset/action(var/mob/living/silicon/robot/R)
@@ -41,6 +42,7 @@
 	name = "Borg Flash-Supression"
 	desc = "A highly advanced, complicated system for supressing incoming flashes directed at the borg's optical processing system."
 	construction_cost = list("metal"=10000,"gold"=2000,"silver"=3000,"glass"=2000, "diamond"=5000)
+	icon_state = "cyborg_upgrade4"
 	require_module = 1
 
 
@@ -57,6 +59,7 @@
 	name = "Borg emergancy restart module"
 	desc = "Used to force a restart of a disabled-but-repaired borg, bringing it back online."
 	construction_cost = list("metal"=60000 , "glass"=5000)
+	icon_state = "cyborg_upgrade1"
 
 
 /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R)
@@ -77,6 +80,7 @@
 	name = "Borg VTEC Module"
 	desc = "Used to kick in a borgs VTEC systems, increasing their speed."
 	construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 5000)
+	icon_state = "cyborg_upgrade2"
 	require_module = 1
 
 /obj/item/borg/upgrade/vtec/action(var/mob/living/silicon/robot/R)
@@ -91,6 +95,7 @@
 	name = "Borg Rapid Taser Cooling Module"
 	desc = "Used to cool a mounted taser, increasing the potential current in it and thus its recharge rate.."
 	construction_cost = list("metal"=80000 , "glass"=6000 , "gold"= 2000, "diamond" = 500)
+	icon_state = "cyborg_upgrade3"
 	require_module = 1
 
 
@@ -117,4 +122,23 @@
 	else
 		T.recharge_time = max(2 , T.recharge_time - 4)
 
-	return 1
+	return 1
+
+/obj/item/borg/upgrade/jetpack/
+	name = "Mining Borg Jetpack"
+	desc = "A carbon dioxide jetpack suitable for low-gravity mining operations"
+	construction_cost = list("metal"=10000,"plasma"=15000,"uranium" = 20000)
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+
+/obj/item/borg/upgrade/jetpack/action(var/mob/living/silicon/robot/R)
+	if(!istype(R.module, /obj/item/weapon/robot_module/miner))
+		R << "Upgrade mounting error!  No suitable hardpoint detected!"
+		usr << "There's no mounting point for the module!"
+		return 0
+	else
+		R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide
+		for(var/obj/item/weapon/tank/jetpack/carbondioxide in R.module.modules)
+			R.internals = src
+		R.icon_state="Miner+j"
+		return 1

code/modules/mob/simple_animal/crab.dm

@@ -21,7 +21,7 @@
 /mob/living/simple_animal/crab/Life()
 	..()
 	//CRAB movement
-	if(!ckey)
+	if(!ckey && alive)
 		if(isturf(src.loc) && !resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
 			turns_since_move++
 			if(turns_since_move >= turns_per_move)
@@ -34,4 +34,36 @@
 	desc = "It's Coffee, the other pet!"
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
-	response_harm   = "stomps"
+	response_harm   = "stomps"
+
+//LOOK AT THIS - ..()??
+/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(istype(O, /obj/item/weapon/wirecutters))
+		user << "\red \b This kills the crab."
+		health -= 20
+		Die()
+	if(istype(O, /obj/item/stack/medical))
+		if(alive)
+			var/obj/item/stack/medical/MED = O
+			if(health < maxHealth)
+				if(MED.amount >= 1)
+					health = min(maxHealth, health + MED.heal_brute)
+					MED.amount -= 1
+					if(MED.amount <= 0)
+						del(MED)
+					for(var/mob/M in viewers(src, null))
+						if ((M.client && !( M.blinded )))
+							M.show_message("\blue [user] applies the [MED] on [src]")
+		else
+			user << "\blue this [src] is dead, medical items won't bring it back to life."
+	else
+		if(O.force)
+			health -= O.force
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red \b [src] has been attacked with the [O] by [user]. ")
+		else
+			usr << "\red This weapon is ineffective, it does no damage."
+			for(var/mob/M in viewers(src, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\red [user] gently taps [src] with the [O]. ")