shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix many instances of "the the"

Browse Source
This commit is contained in:
Jordan Brown
2017-10-13 10:40:52 -04:00
committed by CitadelStationBot
parent 692e226d24
commit bd7a0d65b5
60 changed files with 869 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/experimentor.dm
+4 -4
View File
@@ -113,7 +113,7 @@
if(!is_insertion_ready(user))
return
if(!checkCircumstances(O))
to_chat(user, "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>")
to_chat(user, "<span class='warning'>[O] is not yet valid for [src] and must be completed!</span>")
return
if(!O.origin_tech)
to_chat(user, "<span class='warning'>This doesn't seem to have a tech origin!</span>")
@@ -125,7 +125,7 @@
if(!user.transferItemToLoc(O, src))
return
loaded_item = O
to_chat(user, "<span class='notice'>You add the [O.name] to the machine.</span>")
to_chat(user, "<span class='notice'>You add [O] to the machine.</span>")
flick("h_lathe_load", src)
@@ -687,13 +687,13 @@
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
/obj/item/relic/proc/teleport(mob/user)
to_chat(user, "<span class='notice'>The [src] begins to vibrate!</span>")
to_chat(user, "<span class='notice'>[src] begins to vibrate!</span>")
addtimer(CALLBACK(src, .proc/do_teleport, user), rand(10, 30))
/obj/item/relic/proc/do_teleport(mob/user)
var/turf/userturf = get_turf(user)
if(loc == user && userturf.z != ZLEVEL_CENTCOM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
visible_message("<span class='notice'>The [src] twists and bends, relocating itself!</span>")
visible_message("<span class='notice'>[src] twists and bends, relocating itself!</span>")
throwSmoke(userturf)
do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg')
throwSmoke(get_turf(user))
code/modules/research/rdmachines.dm
+6 -6
View File
@@ -74,7 +74,7 @@
//whether the machine can have an item inserted in its current state.
/obj/machinery/r_n_d/proc/is_insertion_ready(mob/user)
if(panel_open)
to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened!</span>")
to_chat(user, "<span class='warning'>You can't load [src] while it's opened!</span>")
return
if (disabled)
return
@@ -84,19 +84,19 @@
console.SyncRDevices()
if(!linked_console)
to_chat(user, "<span class='warning'>The [name] must be linked to an R&D console first!</span>")
to_chat(user, "<span class='warning'>[src] must be linked to an R&D console first!</span>")
return
if (busy)
to_chat(user, "<span class='warning'>The [src.name] is busy right now.</span>")
to_chat(user, "<span class='warning'>[src] is busy right now.</span>")
return
if(stat & BROKEN)
to_chat(user, "<span class='warning'>The [src.name] is broken.</span>")
to_chat(user, "<span class='warning'>[src] is broken.</span>")
return
if(stat & NOPOWER)
to_chat(user, "<span class='warning'>The [src.name] has no power.</span>")
to_chat(user, "<span class='warning'>[src] has no power.</span>")
return
if(loaded_item)
to_chat(user, "<span class='warning'>The [src] is already loaded.</span>")
to_chat(user, "<span class='warning'>[src] is already loaded.</span>")
return
return 1