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 09:41:54 -05: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>")