From 337049d8fbc922e0f4b59837e3fff9eed7aa6982 Mon Sep 17 00:00:00 2001 From: Crazylemon Date: Mon, 14 Dec 2015 17:25:28 -0800 Subject: [PATCH] Spans and adds good grammar to self-scanner-inserting --- code/game/dna/dna_modifier.dm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 75489ccf64a..bf5e661b299 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -135,13 +135,13 @@ if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other return if (!ishuman(usr)) //Make sure they're a mob that has dna - usr << "\blue Try as you might, you can not climb up into the scanner." + usr << "Try as you might, you can not climb up into the [src]." return if (src.occupant) - usr << "\blue The scanner is already occupied!" + usr << "The [src] is already occupied!" return if (usr.abiotic()) - usr << "\blue Subject cannot have abiotic items on." + usr << "Subject cannot have abiotic items on." return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE @@ -172,19 +172,22 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "\blue The DNA Scanner is already occupied!" + user << "The [src] is already occupied!" return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "\red Subject cannot have abiotic items on." + user << "Subject cannot have abiotic items on." return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the DNA Scanner because they have a slime latched onto their head." + usr << "[L.name] will not fit into the [src] because they have a slime latched onto their head." return - visible_message("[user] puts [L.name] into the DNA Scanner.") + if (L == user) + visible_message("[user] climbs into the [src].") + else + visible_message("[user] puts [L.name] into the [src].") put_in(L) if(user.pulling == L) user.stop_pulling() @@ -207,7 +210,7 @@ return else if(istype(item, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red A beaker is already loaded into the machine." + user << "A beaker is already loaded into the machine." return if(!user.drop_item()) @@ -224,13 +227,13 @@ if (!ismob(G.affecting)) return if (src.occupant) - user << "\blue The scanner is already occupied!" + user << "The scanner is already occupied!" return if (G.affecting.abiotic()) - user << "\blue Subject cannot have abiotic items on." + user << "Subject cannot have abiotic items on." return if(panel_open) - usr << "\blue Close the maintenance panel first." + usr << "Close the maintenance panel first." return put_in(G.affecting) src.add_fingerprint(user) @@ -264,11 +267,11 @@ /obj/machinery/dna_scannernew/proc/go_out() if (!src.occupant) - usr << "The scanner is empty!" + usr << "The scanner is empty!" return if (src.locked) - usr << "The scanner is locked!" + usr << "The scanner is locked!" return if (src.occupant.client)