Merge pull request #7187 from Tayyyyyyy/spacepod_cell_message

Notify user when cell inserted into spacepod

code/modules/spacepods/spacepod.dm

@@ -212,7 +212,7 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	deal_damage(15)
 	playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
-	to_chat(user, "<span class='warning'>You slash at \the [src]!</span>")
+	to_chat(user, "<span class='warning'>You slash at [src]!</span>")
 	visible_message("<span class='warning'>The [user] slashes at [src.name]'s armor!</span>")
 	return
 
@@ -253,7 +253,7 @@
 					if(H)
 						H.forceMove(get_turf(src))
 						H.ex_act(severity + 1)
-						to_chat(H, "<span class='warning'>You are forcefully thrown from \the [src]!</span>")
+						to_chat(H, "<span class='warning'>You are forcefully thrown from [src]!</span>")
 			qdel(ion_trail)
 			qdel(src)
 		if(2)
@@ -315,6 +315,7 @@
 			if(battery)
 				to_chat(user, "<span class='notice'>The pod already has a battery.</span>")
 				return
+			to_chat(user, "<span class='notice'>You insert [W] into the pod.</span>")
 			user.drop_item(W)
 			battery = W
 			W.forceMove(src)
@@ -365,9 +366,9 @@
 				if(do_after(user, 20 * W.toolspeed, target = src))
 					if(!src || !WT.remove_fuel(3, user)) return
 					repair_damage(10)
-					to_chat(user, "<span class='notice'>You mend some [pick("dents","bumps","damage")] with \the [WT]</span>")
+					to_chat(user, "<span class='notice'>You mend some [pick("dents","bumps","damage")] with [WT]</span>")
 				return
-			to_chat(user, "<span class='boldnotice'>\The [src] is fully repaired!</span>")
+			to_chat(user, "<span class='boldnotice'>[src] is fully repaired!</span>")
 			return
 
 		if(istype(W, /obj/item/device/lock_buster))
@@ -395,7 +396,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 		to_chat(user, "<span class='notice'>The pod already has a [slot], remove it first.</span>")
 		return
 	else
-		to_chat(user, "<span class='notice'>You insert \the [SPE] into the pod.</span>")
+		to_chat(user, "<span class='notice'>You insert [SPE] into the pod.</span>")
 		user.drop_item(SPE)
 		SPE.forceMove(src)
 		equipment_system.vars[slot] = SPE
@@ -456,7 +457,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 	switch(input(user, "Remove which equipment?", null, null) as null|anything in possible)
 		if("Energy Cell")
 			if(user.put_in_any_hand_if_possible(battery))
-				to_chat(user, "<span class='notice'>You remove \the [battery] from the space pod</span>")
+				to_chat(user, "<span class='notice'>You remove [battery] from the space pod</span>")
 				battery = null
 			else
 				to_chat(user, "<span class='warning'>You need an open hand to do that.</span>")
@@ -479,18 +480,18 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 /obj/spacepod/proc/remove_equipment(mob/user, var/obj/item/device/spacepod_equipment/SPE, var/slot)
 
 	if(passengers.len > max_passengers - SPE.occupant_mod)
-		to_chat(user, "<span class='warning'>Someone is sitting in \the [SPE]!</span>")
+		to_chat(user, "<span class='warning'>Someone is sitting in [SPE]!</span>")
 		return
 
 	var/sum_w_class = 0
 	for(var/obj/item/I in cargo_hold.contents)
 		sum_w_class += I.w_class
 	if(cargo_hold.contents.len > cargo_hold.storage_slots - SPE.storage_mod["slots"] || sum_w_class > cargo_hold.max_combined_w_class - SPE.storage_mod["w_class"])
-		to_chat(user, "<span class='warning'>Empty \the [SPE] first!</span>")
+		to_chat(user, "<span class='warning'>Empty [SPE] first!</span>")
 		return
 
 	if(user.put_in_any_hand_if_possible(SPE))
-		to_chat(user, "<span class='notice'>You remove \the [SPE] from the equipment system.</span>")
+		to_chat(user, "<span class='notice'>You remove [SPE] from the equipment system.</span>")
 		equipment_system.installed_modules -= SPE
 		max_passengers -= SPE.occupant_mod
 		cargo_hold.storage_slots -= SPE.storage_mod["slots"]
@@ -697,22 +698,22 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 /obj/spacepod/proc/load_cargo(mob/user, var/obj/O)
 	var/obj/item/device/spacepod_equipment/cargo/ore/C = equipment_system.cargo_system
 	if(!C.storage)
-		to_chat(user, "<span class='notice'>You begin loading \the [O] into \the [src]'s [equipment_system.cargo_system]</span>")
+		to_chat(user, "<span class='notice'>You begin loading [O] into [src]'s [equipment_system.cargo_system]</span>")
 		if(do_after(user, 40, target = src))
 			C.storage = O
 			O.forceMove(C)
-			to_chat(user, "<span class='notice'>You load \the [O] into \the [src]'s [equipment_system.cargo_system]!</span>")
+			to_chat(user, "<span class='notice'>You load [O] into [src]'s [equipment_system.cargo_system]!</span>")
 		else
-			to_chat(user, "<span class='warning'>You fail to load \the [O] into \the [src]'s [equipment_system.cargo_system]</span>")
+			to_chat(user, "<span class='warning'>You fail to load [O] into [src]'s [equipment_system.cargo_system]</span>")
 	else
-		to_chat(user, "<span class='warning'>\The [src] already has \an [C.storage]</span>")
+		to_chat(user, "<span class='warning'>[src] already has \an [C.storage]</span>")
 
 /obj/spacepod/proc/enter_pod(mob/user)
 	if(usr.stat != CONSCIOUS)
 		return 0
 
 	if(equipment_system.lock_system && !unlocked)
-		to_chat(user, "<span class='warning'>\The [src]'s doors are locked!</span>")
+		to_chat(user, "<span class='warning'>[src]'s doors are locked!</span>")
 		return 0
 
 	if(get_dist(src, user) > 2 || get_dist(usr, user) > 1)
@@ -747,7 +748,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 	occupant_sanity_check()
 
 	if(passengers.len <= max_passengers)
-		visible_message("<span class='notice'>[user] starts to climb into \the [src].</span>")
+		visible_message("<span class='notice'>[user] starts to climb into [src].</span>")
 		if(do_after(user, 40, target = src))
 			if(!pilot || pilot == null)
 				user.stop_pulling()
@@ -765,9 +766,9 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 			else
 				to_chat(user, "<span class='notice'>You were too slow. Try better next time, loser.</span>")
 		else
-			to_chat(user, "<span class='notice'>You stop entering \the [src].</span>")
+			to_chat(user, "<span class='notice'>You stop entering [src].</span>")
 	else
-		to_chat(user, "<span class='danger'>You can't fit in \the [src], it's full!</span>")
+		to_chat(user, "<span class='danger'>You can't fit in [src], it's full!</span>")
 
 /obj/spacepod/proc/occupant_sanity_check()  // going to have to adjust this later for cargo refactor
 	if(passengers)
@@ -803,11 +804,11 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 	if(user == pilot)
 		user.forceMove(get_turf(src))
 		pilot = null
-		to_chat(user, "<span class='notice'>You climb out of \the [src].</span>")
+		to_chat(user, "<span class='notice'>You climb out of [src].</span>")
 	if(user in passengers)
 		user.forceMove(get_turf(src))
 		passengers -= user
-		to_chat(user, "<span class='notice'>You climb out of \the [src].</span>")
+		to_chat(user, "<span class='notice'>You climb out of [src].</span>")
 
 /obj/spacepod/verb/lock_pod()
 	set name = "Lock Doors"
@@ -872,7 +873,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 		to_chat(usr, "<span class='notice'>You can't reach the controls from your chair")
 		return
 	if(!equipment_system.weapon_system)
-		to_chat(usr, "<span class='warning'>\The [src] has no weapons!</span>")
+		to_chat(usr, "<span class='warning'>[src] has no weapons!</span>")
 		return
 	equipment_system.weapon_system.fire_weapons()
 
@@ -889,7 +890,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
 		to_chat(usr, "<span class='notice'>You can't reach the controls from your chair")
 		return
 	if(!equipment_system.cargo_system)
-		to_chat(usr, "<span class='warning'>\The [src] has no cargo system!</span>")
+		to_chat(usr, "<span class='warning'>[src] has no cargo system!</span>")
 		return
 	equipment_system.cargo_system.unload()