Merge branch 'DOGSHIT-LAPTOP' of github.com:vero5123/cmss13 into DOGS…

…HIT-LAPTOP

code/game/machinery/computer/medical.dm

@@ -146,7 +146,7 @@
 			return TRUE
 
 /obj/structure/machinery/computer/double_id/med_data/proc/print_paper()
-	playsound(src.loc, 'sound/machines/fax.ogg', 15, 1)
+	playsound(loc, 'sound/machines/fax.ogg', 15, 1)
 	var/contents = {"<center><h4>Medical Report</h4></center>
 								<u>Prepared By:</u> [user_id_card?.registered_name ? user_id_card.registered_name : "Unknown"]<br>
 								<u>For:</u> [target_id_card.registered_name ? target_id_card.registered_name : "Unregistered"]<br>
@@ -177,7 +177,7 @@
 	med_report.info += contents
 	med_report.update_icon()
 
-	visible_message(SPAN_NOTICE("\The [src] prints out a paper."))
+	visible_message(SPAN_NOTICE("[src] prints out a paper."))
 	return TRUE
 
 /obj/structure/machinery/computer/double_id/med_data/ui_static_data(mob/user)

code/game/machinery/computer/security.dm

@@ -74,7 +74,7 @@
 		if(operable())
 			visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGOUT: Session end confirmed.\"")
 		else
-			to_chat(usr, "You remove \the [user_id_card] from \the [src].")
+			to_chat(usr, "You remove [user_id_card] from [src].")
 		authenticated = FALSE
 		user_id_card = null
 	else

code/game/machinery/medical_pod/autodoc.dm

@@ -286,8 +286,8 @@
 	var/human_ref = WEAKREF(H)
 	N = retrieve_record(record_id_ref = H.record_id_ref, mob_ref = human_ref, record_type = RECORD_TYPE_MEDICAL)
 	if(isnull(N))
-		visible_message("\The [src] buzzes: No records found for occupant.")
-		src.go_out() //kick them out too.
+		visible_message("[src] buzzes: No records found for occupant.")
+		go_out() //kick them out too.
 		return
 
 	var/list/surgery_todo_list = N.fields["autodoc_manual"]

code/game/machinery/medical_pod/bodyscanner.dm

@@ -181,8 +181,8 @@
 
 	N.fields["last_tgui_scan_result"] = last_health_display.ui_data(user, DETAIL_LEVEL_BODYSCAN)
 	N.fields[MOB_AUTODOC_DATA] = generate_autodoc_surgery_list(H)
-	visible_message(SPAN_NOTICE("\The [src] pings as it stores the scan report of [H.real_name]"))
-	playsound(src.loc, 'sound/machines/screen_output1.ogg', 25)
+	visible_message(SPAN_NOTICE("[src] pings as it stores the scan report of [H.real_name]"))
+	playsound(loc, 'sound/machines/screen_output1.ogg', 25)
 
 	last_health_display.look_at(user, DETAIL_LEVEL_BODYSCAN, bypass_checks = TRUE)
 

code/modules/cm_marines/marines_consoles.dm

@@ -73,7 +73,7 @@
 		if(operable()) // Powered. Console can response.
 			visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGOUT: Session end confirmed.\"")
 		else
-			to_chat(usr, "You remove \the [user_id_card] from \the [src].")
+			to_chat(usr, "You remove [user_id_card] from [src].")
 		authenticated = FALSE // No card - no access
 		user_id_card = null
 
@@ -86,7 +86,7 @@
 			target_id_card.name = text("[target_id_card.registered_name]'s ID Card ([target_id_card.assignment])")
 			visible_message("[SPAN_BOLD("[src]")] states, \"CARD EJECT: Data imprinted. Updating database... Success.\"")
 		else
-			to_chat(usr, "You remove \the [target_id_card] from \the [src].")
+			to_chat(usr, "You remove [target_id_card] from [src].")
 		target_id_card = null
 
 	else
@@ -636,7 +636,7 @@
 	return data
 
 /obj/structure/machinery/computer/double_id/squad_changer/attack_alien(mob/living/carbon/xenomorph/xeno_user)
-	xeno_user.visible_message(SPAN_NOTICE("You hear a beep as [xeno_user]'s limb is scanned to \the [name]."))
+	xeno_user.visible_message(SPAN_NOTICE("You hear a beep as [xeno_user]'s limb is scanned to [name]."))
 	visible_message("[SPAN_BOLD("[src]")] states, \"SCAN ENTRY: Unknown lifeform detected! Forbidden operation!\"")
 	playsound(xeno_user.loc, 'sound/machines/screen_output1.ogg', 25, 1)
 	return XENO_ATTACK_ACTION
@@ -651,7 +651,7 @@
 	if(!user_id_card || !target_id_card || person_to_modify || user.name == user_id_card.registered_name)
 		return
 
-	user.visible_message(SPAN_NOTICE("You hear a beep as [user]'s hand is scanned to \the [name]."))
+	user.visible_message(SPAN_NOTICE("You hear a beep as [user]'s hand is scanned to [name]."))
 	visible_message("[SPAN_BOLD("[src]")] states, \"SCAN ENTRY: Scanned, please stay close until operation's end.\"")
 	playsound(user.loc, 'sound/machines/screen_output1.ogg', 25, 1)
 	person_to_modify = user

code/modules/mob/living/carbon/human/human.dm

@@ -19,7 +19,7 @@
 	prev_gender = gender // Debug for plural genders
 
 	if(SSticker?.mode?.hardcore)
-		hardcore = TRUE //For WO disposing of corpsess
+		hardcore = TRUE //For WO disposing of corpses
 
 /mob/living/carbon/human/initialize_pass_flags(datum/pass_flags_container/PF)
 	..()