Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard

code/_onclick/hud/_defines.dm

@@ -61,6 +61,21 @@
 #define ui_borg_module "EAST-2:26,SOUTH+1:7"
 #define ui_borg_panel "EAST-1:28,SOUTH+1:7"
 
+#define ui_ai_core "SOUTH:6,WEST:16"
+#define ui_ai_camera_list "SOUTH:6,WEST+1:16"
+#define ui_ai_track_with_camera "SOUTH:6,WEST+2:16"
+#define ui_ai_camera_light "SOUTH:6,WEST+3:16"
+#define ui_ai_crew_monitor "SOUTH:6,WEST+4:16"
+#define ui_ai_crew_manifest "SOUTH:6,WEST+5:16"
+#define ui_ai_alerts "SOUTH:6,WEST+6:16"
+#define ui_ai_announcement "SOUTH:6,WEST+7:16"
+#define ui_ai_shuttle "SOUTH:6,WEST+8:16"
+#define ui_ai_state_laws "SOUTH:6,WEST+9:16"
+#define ui_ai_pda_send "SOUTH:6,WEST+10:16"
+#define ui_ai_pda_log "SOUTH:6,WEST+11:16"
+#define ui_ai_take_picture "SOUTH:6,WEST+12:16"
+#define ui_ai_view_images "SOUTH:6,WEST+13:16"
+
 //Gun buttons
 #define ui_gun1 "EAST-2:26,SOUTH+2:7"
 #define ui_gun2 "EAST-1:28, SOUTH+3:7"

code/_onclick/hud/ai.dm

@@ -0,0 +1,135 @@
+/datum/hud/proc/ai_hud()
+	adding = list()
+	other = list()
+
+	var/obj/screen/using
+
+//AI core
+	using = new /obj/screen()
+	using.name = "AI Core"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "ai_core"
+	using.screen_loc = ui_ai_core
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Camera list
+	using = new /obj/screen()
+	using.name = "Show Camera List"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "camera"
+	using.screen_loc = ui_ai_camera_list
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Track
+	using = new /obj/screen()
+	using.name = "Track With Camera"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "track"
+	using.screen_loc = ui_ai_track_with_camera
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Camera light
+	using = new /obj/screen()
+	using.name = "Toggle Camera Light"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "camera_light"
+	using.screen_loc = ui_ai_camera_light
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Crew Monitorting
+	using = new /obj/screen()
+	using.name = "Crew Monitorting"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "crew_monitor"
+	using.screen_loc = ui_ai_crew_monitor
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Crew Manifest
+	using = new /obj/screen()
+	using.name = "Show Crew Manifest"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "manifest"
+	using.screen_loc = ui_ai_crew_manifest
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Alerts
+	using = new /obj/screen()
+	using.name = "Show Alerts"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "alerts"
+	using.screen_loc = ui_ai_alerts
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Announcement
+	using = new /obj/screen()
+	using.name = "Announcement"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "announcement"
+	using.screen_loc = ui_ai_announcement
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Shuttle
+	using = new /obj/screen()
+	using.name = "Call Emergency Shuttle"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "call_shuttle"
+	using.screen_loc = ui_ai_shuttle
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Laws
+	using = new /obj/screen()
+	using.name = "State Laws"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "state_laws"
+	using.screen_loc = ui_ai_state_laws
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//PDA message
+	using = new /obj/screen()
+	using.name = "PDA - Send Message"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "pda_send"
+	using.screen_loc = ui_ai_pda_send
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//PDA log
+	using = new /obj/screen()
+	using.name = "PDA - Show Message Log"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "pda_receive"
+	using.screen_loc = ui_ai_pda_log
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//Take image
+	using = new /obj/screen()
+	using.name = "Take Image"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "take_picture"
+	using.screen_loc = ui_ai_take_picture
+	using.layer = SCREEN_LAYER
+	adding += using
+
+//View images
+	using = new /obj/screen()
+	using.name = "View Images"
+	using.icon = 'icons/mob/screen_ai.dmi'
+	using.icon_state = "view_images"
+	using.screen_loc = ui_ai_view_images
+	using.layer = SCREEN_LAYER
+	adding += using
+
+	mymob.client.screen += adding + other
+
+	return

code/_onclick/hud/human.dm

@@ -398,7 +398,8 @@
 	if(dna.species == "Human") //no more xenos losing ears/tentacles
 		h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3")
 	undershirt = null
-	underwear = null
+	underwear_top = null
+	underwear_bottom = null
 	socks = null
 	regenerate_icons()
 

code/_onclick/hud/other_mobs.dm

@@ -13,9 +13,6 @@
 	mymob.blind.screen_loc = "1,1"
 	mymob.blind.layer = 0
 
-/datum/hud/proc/ai_hud()
-	return
-
 /datum/hud/proc/blob_hud(ui_style = 'icons/mob/screen1_Midnight.dmi')
 
 	blobpwrdisplay = new /obj/screen()

code/_onclick/hud/screen_objects.dm

@@ -397,6 +397,78 @@
 		if("module3")
 			if(istype(usr, /mob/living/silicon/robot))
 				usr:toggle_module(3)
+
+		if("AI Core")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.view_core()
+
+		if("Show Camera List")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				var/camera = input(AI) in AI.get_camera_list()
+				AI.ai_camera_list(camera)
+
+		if("Track With Camera")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				var/target_name = input(AI) in AI.trackable_mobs()
+				AI.ai_camera_track(target_name)
+
+		if("Toggle Camera Light")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.toggle_camera_light()
+
+		if("Crew Monitorting")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.subsystem_crew_monitor()
+
+		if("Show Crew Manifest")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.ai_roster()
+
+		if("Show Alerts")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.subsystem_alarm_monitor()
+
+		if("Announcement")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.ai_announcement()
+
+		if("Call Emergency Shuttle")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.ai_call_shuttle()
+
+		if("State Laws")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.ai_checklaws()
+
+		if("PDA - Send Message")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.aiPDA.cmd_send_pdamesg(usr)
+
+		if("PDA - Show Message Log")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.aiPDA.cmd_show_message_log(usr)
+
+		if("Take Image")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.take_image()
+
+		if("View Images")
+			if(isAI(usr))
+				var/mob/living/silicon/ai/AI = usr
+				AI.view_images()
 		else
 			return 0
 	return 1