Map Changes:

Fixed AI Satellite. Turret controls are aligned properly now, several cameras re-added.
Switched Warden and HoS areas; they are now properly attached to their respective offices thanks to AtomicTroop.
Nuke Storage now has access to maintenance.
Air alarm map fixes thanks to Blade_.

Icon Updates:

Color adjustment on riveted walls.
Updated decal sprites acquired from a Russian SS13 build (with permission).
Alien meatspike sprite updated.
Fixed plague doctor gas mask in clothing code. Probably requires further revision.
Removed kobold.dmi from obj. Empty file.
Removed kobold.dmi from mob. Copy of sprites in mob, mob.dmi.
Removed techpriest.dmi as the actual sprite is contained in robots.dmi.
Removed sectoid.dmi from mob. Moved sprite to xcomalien.dmi.
Removed golems.dmi from mob. Moved sprites to misc, old_or_unused.dmi.
Removed junk.dmi. Moved sprite to misc, old_or_unused.dmi.
More updated female sprites.
Better female underwear sprites acquired from a Russian SS13 build (with permission). Modified to fit new female base models.

Icon Additions:

Added female AI Hologram and holopad (mob/mob.dmi and obj/stationobs.dmi).
Added elevator door (obj/doors/Doorele.dmi).
Added space ninja gear. 
Facepalm display acquired from a Russian SS13 build (with permission).
Awesomeface AI display added.
Rig mining sprites acquired from a Russian SS13 build (with permission). Added item holding sprites for the suit. Rig suit replaces space suit which spawns in Engineering.
Robocop sprites acquired from a Russian SS13 build (with permission).
ed209 sprites acquired from a Russian SS13 build (with permission). Unused at the moment.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@511 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/mob/living/silicon/hivebot.dm

@@ -34,7 +34,7 @@
 /mob/living/silicon/hive_mainframe
 	name = "Robot Mainframe"
 	voice_name = "synthesized voice"
-	icon = 'hivebot.dmi'
+
 	icon_state = "hive_main"
 	health = 200
 	var/health_max = 200

code/defines/obj/clothing.dm

@@ -109,7 +109,15 @@
 	icon_state = "black"
 	item_state = "swat_gl"
 	siemens_coefficient = 0.30
+	protective_temperature = 1100
+	heat_transfer_coefficient = 0.05
 
+/obj/item/clothing/gloves/space_ninja
+	desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance."
+	name = "ninja gloves"
+	icon_state = "s-ninja"
+	item_state = "swat_gl"
+	siemens_coefficient = 0
 	protective_temperature = 1100
 	heat_transfer_coefficient = 0.05
 
@@ -242,6 +250,12 @@
 	item_state = "space"
 	permeability_coefficient = 0.01
 
+/obj/item/clothing/head/helmet/space/rig
+	desc = "A special helmet designed for work in a hazardous, low-pressure environment."
+	name = "rig helmet"
+	icon_state = "rig"
+	item_state = "rig_helm"
+
 /obj/item/clothing/head/helmet/space/syndicate
 	name = "red space helmet"
 	icon_state = "syndicate"
@@ -304,18 +318,11 @@
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 
-/obj/item/clothing/mask/plaguedoctor
+/obj/item/clothing/mask/gas/plaguedoctor
 	name = "Plague doctor mask"
 	desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
 	icon_state = "plaguedoctor"
-	flags = FPRINT|TABLEPASS|SUITSPACE|MASKCOVERSMOUTH|MASKCOVERSEYES
-	w_class = 3.0
-	see_face = 0.0
 	item_state = "gas_mask"
-	protective_temperature = 500
-	heat_transfer_coefficient = 0.01
-	gas_transfer_coefficient = 0.01
-	permeability_coefficient = 0.01
 
 /obj/item/clothing/mask/gas/emergency
 	name = "emergency gas mask"
@@ -327,6 +334,13 @@
 	desc = "A close-fitting tactical mask that can filter some environmental toxins or be connected to an air supply."
 	icon_state = "swat"
 
+/obj/item/clothing/mask/gas/space_ninja
+	name = "ninja mask"
+	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
+	icon_state = "s-ninja"
+	item_state = "s-ninja_mask"
+	vchange = 1
+
 /obj/item/clothing/mask/gas/voice
 	name = "gas mask"
 	desc = "A close-fitting mask that can filter some environmental toxins or be connected to an air supply."
@@ -670,11 +684,24 @@
 	protective_temperature = 1000
 	heat_transfer_coefficient = 0.02
 
+/obj/item/clothing/suit/space/rig
+	name = "rig suit"
+	desc = "A special suit that protects against hazardous, low pressure environments."
+	icon_state = "rig"
+	item_state = "rig_suit"
+	w_class = 4//bulky item
+
 /obj/item/clothing/suit/space/syndicate
 	name = "red space suit"
 	icon_state = "syndicate"
 	item_state = "space_suit_syndicate"
 
+/obj/item/clothing/suit/space/space_ninja
+	name = "ninja suit"
+	desc = "A unique suit of nano-enhanced armor designed specifically for Spider-Clan assassins."
+	icon_state = "s-ninja"
+	item_state = "s-ninja_suit"
+
 //Themed space suits for different nuke rounds (WIP)
 
 /obj/item/clothing/head/helmet/space/pirate

code/game/machinery/status_display.dm

@@ -300,6 +300,10 @@
 					set_picture("ai_off")
 				if("Problems?")
 					set_picture("ai_trollface")
+				if("Awesome")
+					set_picture("ai_awesome")
+				if("Facepalm")
+					set_picture("ai_facepalm")
 				if("Friend Computer")
 					set_picture("ai_friend")
 

code/game/verbs/AI_status.dm

@@ -5,7 +5,7 @@
 	if(usr.stat == 2)
 		usr <<"You cannot change your emotional status because you are dead!"
 		return
-	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Friend Computer")
+	var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
 	var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
 	for (var/obj/machinery/ai_status_display/AISD in world) //change status
 		spawn( 0 )

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

@@ -57,9 +57,13 @@
 		if("Security")
 			src.module = new /obj/item/weapon/robot_module/security(src)
 			src.hands.icon_state = "security"
-			var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Armored")
+			var/icontype = input("Select an icon!", "Robot", null, null) in list("Standard", "Armored", "Robocop", "Robocop Red")
 			if(icontype == "Armored")
 				src.icon_state = "Security"
+			else if(icontype == "Robocop")
+				src.icon_state = "Security2"
+			else if(icontype == "Robocop Red")
+				src.icon_state = "Security3"
 			else
 				src.icon_state = "robot"
 			src.modtype = "Sec"