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/power/singularity/collector.dm
+5 -1
View File
@@ -76,13 +76,17 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
<<<<<<< HEAD
to_chat(user, "<span class='notice'>The [W.name] detects that [last_power]W were recently produced.</span>")
=======
to_chat(user, "<span class='notice'>[W] detects that [last_power]W is being processed.</span>")
>>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe
return TRUE
else if(istype(W, /obj/item/device/analyzer) && loaded_tank)
atmosanalyzer_scan(loaded_tank.air_contents, user)
else if(istype(W, /obj/item/tank/internals/plasma))
if(!anchored)
to_chat(user, "<span class='warning'>The [src] needs to be secured to the floor first!</span>")
to_chat(user, "<span class='warning'>[src] needs to be secured to the floor first!</span>")
return TRUE
if(loaded_tank)
to_chat(user, "<span class='warning'>There's already a plasma tank loaded!</span>")
code/modules/power/singularity/emitter.dm
+2 -2
View File
@@ -137,7 +137,7 @@
else
to_chat(user, "<span class='warning'>The controls are locked!</span>")
else
to_chat(user, "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>")
to_chat(user, "<span class='warning'>[src] needs to be firmly secured to the floor first!</span>")
return 1
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
@@ -349,7 +349,7 @@
locked = FALSE
emagged = TRUE
if(user)
user.visible_message("[user.name] emags the [src].","<span class='notice'>You short out the lock.</span>")
user.visible_message("[user.name] emags [src].","<span class='notice'>You short out the lock.</span>")
/obj/machinery/power/emitter/prototype
code/modules/power/singularity/field_generator.dm
+7 -7
View File
@@ -63,18 +63,18 @@ field_generator power level display
if(state == FG_WELDED)
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(active >= FG_CHARGING)
to_chat(user, "<span class='warning'>You are unable to turn off the [name] once it is online!</span>")
to_chat(user, "<span class='warning'>You are unable to turn off [src] once it is online!</span>")
return 1
else
user.visible_message("[user.name] turns on the [name].", \
"<span class='notice'>You turn on the [name].</span>", \
user.visible_message("[user] turns on [src].", \
"<span class='notice'>You turn on [src].</span>", \
"<span class='italics'>You hear heavy droning.</span>")
turn_on()
investigate_log("<font color='green'>activated</font> by [user.key].", INVESTIGATE_SINGULO)
add_fingerprint(user)
else
to_chat(user, "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>")
to_chat(user, "<span class='warning'>[src] needs to be firmly secured to the floor first!</span>")
/obj/machinery/field/generator/can_be_unfasten_wrench(mob/user, silent)
if(state == FG_WELDED)
@@ -102,12 +102,12 @@ field_generator power level display
var/obj/item/weldingtool/WT = W
switch(state)
if(FG_UNSECURED)
to_chat(user, "<span class='warning'>The [name] needs to be wrenched to the floor!</span>")
to_chat(user, "<span class='warning'>[src] needs to be wrenched to the floor!</span>")
if(FG_SECURED)
if (WT.remove_fuel(0,user))
playsound(loc, WT.usesound, 50, 1)
user.visible_message("[user.name] starts to weld the [name] to the floor.", \
user.visible_message("[user] starts to weld [src] to the floor.", \
"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
"<span class='italics'>You hear welding.</span>")
if(do_after(user,20*W.toolspeed, target = src) && state == FG_SECURED && WT.isOn())
@@ -117,7 +117,7 @@ field_generator power level display
if(FG_WELDED)
if (WT.remove_fuel(0,user))
playsound(loc, WT.usesound, 50, 1)
user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
user.visible_message("[user] starts to cut [src] free from the floor.", \
"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
"<span class='italics'>You hear welding.</span>")
if(do_after(user,20*W.toolspeed, target = src) && state == FG_WELDED && WT.isOn())