Merge branch 'master' into donoritemmodularization

2017-12-04 20:17:02 -05:00
parent 2f313bb92f e7da4615d6
commit f57e02ce95
569 changed files with 8426 additions and 5523 deletions
@@ -25,6 +25,7 @@
 	see_in_dark = 8
 	med_hud = DATA_HUD_MEDICAL_BASIC
 	sec_hud = DATA_HUD_SECURITY_BASIC
+	d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
 	mob_size = MOB_SIZE_LARGE
 	var/list/network = list("SS13")
 	var/obj/machinery/camera/current = null
@@ -88,8 +89,7 @@
 	. = ..()
 	if(!target_ai) //If there is no player/brain inside.
 		new/obj/structure/AIcore/deactivated(loc) //New empty terminal.
-		qdel(src)//Delete AI.
-		return
+		return INITIALIZE_HINT_QDEL //Delete AI.

 	if(L && istype(L, /datum/ai_laws))
 		laws = L
@@ -31,15 +31,6 @@
 	else
 		return ..()

-/mob/living/silicon/ai/handle_inherent_channels(message, message_mode, language)
-	. = ..()
-	if(.)
-		return .
-
-	if(message_mode == MODE_HOLOPAD)
-		holopad_talk(message, language)
-		return 1
-
 //For holopads only. Usable by AI.
 /mob/living/silicon/ai/proc/holopad_talk(message, language)

@@ -79,6 +79,12 @@
 	. = ..()
 	. += slowdown

+/mob/living/silicon/pai/can_unbuckle()
+	return FALSE
+
+/mob/living/silicon/pai/can_buckle()
+	return FALSE
+
 /mob/living/silicon/pai/Destroy()
 	GLOB.pai_list -= src
 	return ..()
@@ -1151,8 +1151,7 @@
 	if(!is_type_in_typecache(M, can_ride_typecache))
 		M.visible_message("<span class='warning'>[M] really can't seem to mount [src]...</span>")
 		return
-	if(!riding_datum)
-		riding_datum = new /datum/riding/cyborg(src)
+	var/datum/component/riding/riding_datum = LoadComponent(/datum/component/riding/cyborg)
 	if(buckled_mobs)
 		if(buckled_mobs.len >= max_buckled_mobs)
 			return
@@ -1175,7 +1174,8 @@

 /mob/living/silicon/robot/unbuckle_mob(mob/user)
 	if(iscarbon(user))
-		if(riding_datum)
+		GET_COMPONENT(riding_datum, /datum/component/riding)
+		if(istype(riding_datum))
 			riding_datum.unequip_buckle_inhands(user)
 			riding_datum.restore_position(user)
 	. = ..(user)
@@ -25,7 +25,6 @@
 	var/clean_on_move = FALSE

 	var/did_feedback = FALSE
-	var/feedback_key

 	var/hat_offset = -3

@@ -227,8 +226,7 @@
 	R.notify_ai(NEW_MODULE)
 	if(R.hud_used)
 		R.hud_used.update_robot_modules_display()
-	if(feedback_key && !did_feedback)
-		SSblackbox.inc(feedback_key, 1)
+	SSblackbox.record_feedback("tally", "cyborg_modules", 1, R.module)

 /obj/item/robot_module/standard
 	name = "Standard"
@@ -254,7 +252,6 @@
 		/obj/item/clockwork/weapon/ratvarian_spear,
 		/obj/item/clockwork/replica_fabricator/cyborg)
 	moduleselect_icon = "standard"
-	feedback_key = "cyborg_standard"
 	hat_offset = -3

 /obj/item/robot_module/medical
@@ -285,7 +282,6 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "medical"
 	moduleselect_icon = "medical"
-	feedback_key = "cyborg_medical"
 	can_be_pushed = FALSE
 	hat_offset = 3

@@ -321,7 +317,6 @@
 		/obj/item/clockwork/replica_fabricator/cyborg)
 	cyborg_base_icon = "engineer"
 	moduleselect_icon = "engineer"
-	feedback_key = "cyborg_engineering"
 	magpulsing = TRUE
 	hat_offset = INFINITY // No hats

@@ -338,7 +333,6 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "sec"
 	moduleselect_icon = "security"
-	feedback_key = "cyborg_security"
 	can_be_pushed = FALSE
 	hat_offset = 3

@@ -359,7 +353,6 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "k9"
 	moduleselect_icon = "k9"
-	feedback_key = "cyborg_k9"
 	can_be_pushed = FALSE
 	hat_offset = INFINITY

@@ -395,7 +388,6 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "medihound"
 	moduleselect_icon = "medihound"
-	feedback_key = "cyborg_medihound"
 	can_be_pushed = FALSE
 	hat_offset = INFINITY

@@ -418,7 +410,6 @@
 		/obj/item/clockwork/replica_fabricator/cyborg)
 	cyborg_base_icon = "scrubpup"
 	moduleselect_icon = "scrubpup"
-	feedback_key = "cyborg_scrubpup"
 	hat_offset = INFINITY
 	clean_on_move = TRUE

@@ -467,7 +458,6 @@
 		/obj/item/clockwork/weapon/ratvarian_spear)
 	cyborg_base_icon = "peace"
 	moduleselect_icon = "standard"
-	feedback_key = "cyborg_peacekeeper"
 	can_be_pushed = FALSE
 	hat_offset = -2

@@ -496,7 +486,6 @@
 		/obj/item/clockwork/replica_fabricator/cyborg)
 	cyborg_base_icon = "janitor"
 	moduleselect_icon = "janitor"
-	feedback_key = "cyborg_janitor"
 	hat_offset = -5
 	clean_on_move = TRUE

@@ -548,7 +537,6 @@
 		/obj/item/borg/sight/xray/truesight_lens)
 	moduleselect_icon = "service"
 	special_light_key = "service"
-	feedback_key = "cyborg_service"
 	hat_offset = 0

 /obj/item/robot_module/butler/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
@@ -601,7 +589,6 @@
 		/obj/item/borg/sight/xray/truesight_lens)
 	cyborg_base_icon = "miner"
 	moduleselect_icon = "miner"
-	feedback_key = "cyborg_miner"
 	hat_offset = 0

 /obj/item/robot_module/syndicate
@@ -19,8 +19,3 @@
 /mob/living/silicon/robot/experience_pressure_difference(pressure_difference, direction)
 	if(!magpulse)
 		return ..()
-
-/mob/living/silicon/robot/Moved()
-	. = ..()
-	if(riding_datum)
-		riding_datum.on_vehicle_move()
@@ -57,14 +57,3 @@
 		return MODE_ROBOT
 	else
 		return .
-
-/mob/living/silicon/handle_inherent_channels(message, message_mode)
-	. = ..()
-	if(.)
-		return .
-
-	if(message_mode == MODE_BINARY)
-		if(binarycheck())
-			robot_talk(message)
-		return 1
-	return 0
@@ -33,7 +33,7 @@

 	var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
 	var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
-	var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud
+	var/d_hud = DATA_HUD_DIAGNOSTIC_BASIC //Determines the diag hud to use

 	var/law_change_counter = 0
 	var/obj/machinery/camera/builtInCamera = null
@@ -42,8 +42,8 @@
 /mob/living/silicon/Initialize()
 	. = ..()
 	GLOB.silicon_mobs += src
-	var/datum/atom_hud/data/diagnostic/diag_hud = GLOB.huds[DATA_HUD_DIAGNOSTIC]
-	diag_hud.add_to_hud(src)
+	for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
+		diag_hud.add_to_hud(src)
 	diag_hud_set_status()
 	diag_hud_set_health()