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

Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601

Browse Source 
[MIRROR] Fix many instances of "the the"
This commit is contained in:
LetterJay
2017-10-14 15:37:00 -04:00
committed by GitHub
parent 87e8c66d5f d6903bcf3c
commit 45619b0e1b
60 changed files with 901 additions and 903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/awaymissions/mission_code/wildwest.dm
+1 -1
View File
@@ -153,7 +153,7 @@
var/mob/living/carbon/human/M = AM
if(M.stat != DEAD && M.ckey)
visible_message("<span class='warning'>[M] triggered the [src]!</span>")
visible_message("<span class='warning'>[M] triggered [src]!</span>")
triggered = 1
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
code/modules/clothing/chameleon.dm
+1 -1
View File
@@ -383,7 +383,7 @@
randomise_action.UpdateButtonIcon()
/obj/item/clothing/mask/chameleon/drone/attack_self(mob/user)
to_chat(user, "<span class='notice'>The [src] does not have a voice changer.</span>")
to_chat(user, "<span class='notice'>[src] does not have a voice changer.</span>")
/obj/item/clothing/shoes/chameleon
name = "black shoes"
code/modules/clothing/glasses/glasses.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/mob/living/carbon/human/H = src.loc
if(!(H.disabilities & BLIND))
if(H.glasses == src)
to_chat(H, "<span class='danger'>The [src] overloads and blinds you!</span>")
to_chat(H, "<span class='danger'>[src] overloads and blinds you!</span>")
H.flash_act(visual = 1)
H.blind_eyes(3)
H.blur_eyes(5)
code/modules/clothing/suits/armor.dm
+2 -2
View File
@@ -242,7 +242,7 @@
if(world.time < reactivearmor_cooldown)
owner.visible_message("<span class='danger'>The reactive incendiary armor on [owner] activates, but fails to send out flames as it is still recharging its flame jets!</span>")
return
owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out jets of flame!</span>")
owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out jets of flame!</span>")
for(var/mob/living/carbon/C in range(6, owner))
if(C != owner)
C.fire_stacks += 8
@@ -294,7 +294,7 @@
sparks.start()
owner.visible_message("<span class='danger'>The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.</span>")
return
owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out arcs of lightning!</span>")
owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out arcs of lightning!</span>")
tesla_zap(owner,tesla_range,tesla_power,tesla_boom, tesla_stun)
reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
return 1
code/modules/fields/fields.dm
+1 -1
View File
@@ -300,7 +300,7 @@
/obj/item/device/multitool/field_debug/attack_self(mob/user)
operating = !operating
to_chat(user, "You turn the [src] [operating? "on":"off"].")
to_chat(user, "You turn [src] [operating? "on":"off"].")
if(!istype(current) && operating)
setup_debug_field()
else if(!operating)
code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+6 -6
View File
@@ -70,10 +70,10 @@
if(!DG.reagents.total_volume) //glass is empty
qdel(DG)
glasses++
to_chat(user, "<span class='notice'>The [src] accepts the drinking glass, sterilizing it.</span>")
to_chat(user, "<span class='notice'>[src] accepts the drinking glass, sterilizing it.</span>")
else if(istype(O, /obj/item/reagent_containers/food/snacks))
if(isFull())
to_chat(user, "<span class='warning'>The [src] is at full capacity.</span>")
to_chat(user, "<span class='warning'>[src] is at full capacity.</span>")
else
var/obj/item/reagent_containers/food/snacks/S = O
if(!user.transferItemToLoc(S, src))
@@ -87,12 +87,12 @@
if(G.get_amount() >= 1)
G.use(1)
glasses += 4
to_chat(user, "<span class='notice'>The [src] accepts a sheet of glass.</span>")
to_chat(user, "<span class='notice'>[src] accepts a sheet of glass.</span>")
else if(istype(O, /obj/item/storage/bag/tray))
var/obj/item/storage/bag/tray/T = O
for(var/obj/item/reagent_containers/food/snacks/S in T.contents)
if(isFull())
to_chat(user, "<span class='warning'>The [src] is at full capacity.</span>")
to_chat(user, "<span class='warning'>[src] is at full capacity.</span>")
break
else
T.remove_from_storage(S, src)
@@ -138,11 +138,11 @@
if(href_list["mix"])
if(reagents.trans_id_to(mixer, href_list["mix"], portion) == 0)
to_chat(usr, "<span class='warning'>The [mixer] is full!</span>")
to_chat(usr, "<span class='warning'>[mixer] is full!</span>")
if(href_list["transfer"])
if(mixer.reagents.trans_id_to(src, href_list["transfer"], portion) == 0)
to_chat(usr, "<span class='warning'>The [src] is full!</span>")
to_chat(usr, "<span class='warning'>[src] is full!</span>")
updateDialog()
code/modules/holiday/easter.dm
+1 -1
View File
@@ -135,7 +135,7 @@
/obj/item/reagent_containers/food/snacks/egg/attack_self(mob/user)
..()
if(containsPrize)
to_chat(user, "<span class='notice'>You unwrap the [src] and find a prize inside!</span>")
to_chat(user, "<span class='notice'>You unwrap [src] and find a prize inside!</span>")
dispensePrize(get_turf(user))
containsPrize = FALSE
qdel(src)
code/modules/hydroponics/grown/citrus.dm
+1 -1
View File
@@ -109,7 +109,7 @@
/obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("<span class='warning'>[user] primes the [src]!</span>", "<span class='userdanger'>You prime the [src]!</span>")
user.visible_message("<span class='warning'>[user] primes [src]!</span>", "<span class='userdanger'>You prime [src]!</span>")
var/message = "[ADMIN_LOOKUPFLW(user)] primed a combustible lemon for detonation at [A] [ADMIN_COORDJMP(user)]"
GLOB.bombers += message
message_admins(message)
code/modules/mining/equipment/wormhole_jaunter.dm
+2 -2
View File
@@ -71,7 +71,7 @@
triggered = TRUE
if(triggered)
usr.visible_message("<span class='warning'>The [src] overloads and activates!</span>")
usr.visible_message("<span class='warning'>[src] overloads and activates!</span>")
SSblackbox.add_details("jaunter","EMP") // EMP accidental activation
activate(usr)
@@ -81,7 +81,7 @@
SSblackbox.add_details("jaunter","Chasm") // chasm automatic activation
activate(user, FALSE)
else
to_chat(user, "The [src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
to_chat(user, "[src] is not attached to your belt, preventing it from saving you from the chasm. RIP.</span>")
//jaunter tunnel
/obj/effect/portal/wormhole/jaunt_tunnel
code/modules/mob/living/silicon/robot/robot.dm
+1 -1
View File
@@ -1149,7 +1149,7 @@
/mob/living/silicon/robot/buckle_mob(mob/living/M, force = FALSE, check_loc = TRUE)
if(!is_type_in_typecache(M, can_ride_typecache))
M.visible_message("<span class='warning'>[M] really can't seem to mount the [src]...</span>")
M.visible_message("<span class='warning'>[M] really can't seem to mount [src]...</span>")
return
if(!riding_datum)
riding_datum = new /datum/riding/cyborg(src)
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -1
View File
@@ -115,7 +115,7 @@
emagged = TRUE
if(!open)
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the [src]'s controls!</span>")
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] [src]'s controls!</span>")
flick("mulebot-emagged", src)
playsound(src, "sparks", 100, 0)
code/modules/mob/living/simple_animal/guardian/guardian.dm
+1 -1
View File
@@ -143,7 +143,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
qdel(src)
else
to_chat(src, "<span class='danger'>Your summoner has died!</span>")
visible_message("<span class='danger'><B>The [src] dies along with its user!</B></span>")
visible_message("<span class='danger'><B>[src] dies along with its user!</B></span>")
death(TRUE)
qdel(src)
snapback()
code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+1 -1
View File
@@ -70,7 +70,7 @@
/obj/guardian_bomb/proc/detonate(mob/living/user)
if(isliving(user))
if(user != spawner && user != spawner.summoner && !spawner.hasmatchingsummoner(user))
to_chat(user, "<span class='danger'><B>The [src] was boobytrapped!</span></B>")
to_chat(user, "<span class='danger'><B>[src] was boobytrapped!</span></B>")
to_chat(spawner, "<span class='danger'><B>Success! Your trap caught [user]</span></B>")
var/turf/T = get_turf(src)
stored_obj.forceMove(T)
code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+1 -1
View File
@@ -115,7 +115,7 @@
if(proximity_flag && isanimal(target))
var/mob/living/simple_animal/A = target
if(A.buffed || (A.type in banned_mobs) || A.stat)
to_chat(user, "<span class='warning'>Something's interfering with the [src]'s effects. It's no use.</span>")
to_chat(user, "<span class='warning'>Something's interfering with [src]'s effects. It's no use.</span>")
return
A.buffed++
A.maxHealth *= 1.5
code/modules/modular_computers/laptop_vendor.dm
+1 -1
View File
@@ -247,7 +247,7 @@
if(!user.temporarilyRemoveItemFromInventory(c))
return
credits += c.value
visible_message("<span class='info'><span class='name'>[usr]</span> inserts [c.value] credits into the [src].</span>")
visible_message("<span class='info'><span class='name'>[usr]</span> inserts [c.value] credits into [src].</span>")
qdel(c)
return
code/modules/paperwork/contract.dm
+1 -1
View File
@@ -179,7 +179,7 @@
else if(istype(P, /obj/item/stamp))
to_chat(user, "<span class='notice'>You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.</span>")
else if(P.is_hot())
user.visible_message("<span class='danger'>[user] brings [P] next to [src], but [src] does not catch fire!</span>", "<span class='danger'>The [src] refuses to ignite!</span>")
user.visible_message("<span class='danger'>[user] brings [P] next to [src], but [src] does not catch fire!</span>", "<span class='danger'>[src] refuses to ignite!</span>")
else
return ..()
code/modules/paperwork/filingcabinet.dm
+1 -1
View File
@@ -216,4 +216,4 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
sleep(100) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
cooldown = 0
else
to_chat(user, "<span class='warning'>The [src] is jammed, give it a few seconds.</span>")
to_chat(user, "<span class='warning'>[src] is jammed, give it a few seconds.</span>")
code/modules/paperwork/paperplane.dm
+2 -2
View File
@@ -33,7 +33,7 @@
/obj/item/paperplane/suicide_act(mob/living/user)
user.Stun(200)
user.visible_message("<span class='suicide'>[user] jams the [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.adjust_blurriness(6)
user.adjust_eye_damage(rand(6,8))
sleep(10)
@@ -67,7 +67,7 @@
else if(P.is_hot())
if(user.disabilities & CLUMSY && prob(10))
user.visible_message("<span class='warning'>[user] accidentally ignites themselves!</span>", \
"<span class='userdanger'>You miss the [src] and accidentally light yourself on fire!</span>")
"<span class='userdanger'>You miss [src] and accidentally light yourself on fire!</span>")
user.dropItemToGround(P)
user.adjust_fire_stacks(1)
user.IgniteMob()
code/modules/power/floodlight.dm
+4 -4
View File
@@ -10,21 +10,21 @@
/obj/structure/floodlight_frame/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/wrench) && (state == FLOODLIGHT_NEEDS_WRENCHING))
to_chat(user, "<span class='notice'>You secure the [src].</span>")
to_chat(user, "<span class='notice'>You secure [src].</span>")
anchored = TRUE
state = FLOODLIGHT_NEEDS_WIRES
desc = "A bare metal frame looking vaguely like a floodlight. Requires wiring."
else if(istype(O, /obj/item/stack/cable_coil) && (state == FLOODLIGHT_NEEDS_WIRES))
var/obj/item/stack/S = O
if(S.use(5))
to_chat(user, "<span class='notice'>You wire the [src].</span>")
to_chat(user, "<span class='notice'>You wire [src].</span>")
name = "wired [name]"
desc = "A bare metal frame looking vaguely like a floodlight. Requires securing with a screwdriver."
icon_state = "floodlight_c2"
state = FLOODLIGHT_NEEDS_SECURING
else if(istype(O, /obj/item/light/tube) && (state == FLOODLIGHT_NEEDS_LIGHTS))
if(user.transferItemToLoc(O))
to_chat(user, "<span class='notice'>You put lights in the [src].</span>")
to_chat(user, "<span class='notice'>You put lights in [src].</span>")
new /obj/machinery/power/floodlight(src.loc)
qdel(src)
else if(istype(O, /obj/item/screwdriver) && (state == FLOODLIGHT_NEEDS_SECURING))
@@ -79,7 +79,7 @@
if(4)
setting_text = "high power"
if(user)
to_chat(user, "You set the [src] to [setting_text].")
to_chat(user, "You set [src] to [setting_text].")
/obj/machinery/power/floodlight/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/wrench))
code/modules/power/singularity/collector.dm
+2 -2
View File
@@ -79,13 +79,13 @@
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
to_chat(user, "<span class='notice'>The [W.name] detects that [last_power]W is being processed.</span>")
to_chat(user, "<span class='notice'>[W] detects that [last_power]W is being processed.</span>")
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())
code/modules/projectiles/guns/misc/blastcannon.dm
+3 -3
View File
@@ -28,7 +28,7 @@
if(bomb)
bomb.forceMove(user.loc)
user.put_in_hands(bomb)
user.visible_message("<span class='warning'>[user] detaches the [bomb] from the [src]</span>")
user.visible_message("<span class='warning'>[user] detaches [bomb] from [src].</span>")
bomb = null
update_icon()
return ..()
@@ -50,9 +50,9 @@
to_chat(user, "<span class='warning'>What good would an incomplete bomb do?</span>")
return FALSE
if(!user.transferItemToLoc(O, src))
to_chat(user, "<span class='warning'>The [O] seems to be stuck to your hand!</span>")
to_chat(user, "<span class='warning'>[O] seems to be stuck to your hand!</span>")
return FALSE
user.visible_message("<span class='warning'>[user] attaches the [O] to the [src]!</span>")
user.visible_message("<span class='warning'>[user] attaches [O] to [src]!</span>")
bomb = O
update_icon()
return TRUE
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -217,7 +217,7 @@
beaker.reagents.remove_all()
cell.use(total/powerefficiency)
cell.emp_act()
visible_message("<span class='danger'> The [src] malfunctions, spraying chemicals everywhere!</span>")
visible_message("<span class='danger'>[src] malfunctions, spraying chemicals everywhere!</span>")
..()
/obj/machinery/chem_dispenser/constructable
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
code/modules/station_goals/shield.dm
+3 -3
View File
@@ -83,7 +83,7 @@
/obj/machinery/satellite
name = "Defunct Satellite"
name = "\improper Defunct Satellite"
desc = ""
icon = 'icons/obj/machines/satellite.dmi'
icon_state = "sat_inactive"
@@ -104,10 +104,10 @@
/obj/machinery/satellite/proc/toggle(mob/user)
if(!active && !isinspace())
if(user)
to_chat(user, "<span class='warning'>You can only active the [src] in space.</span>")
to_chat(user, "<span class='warning'>You can only activate [src] in space.</span>")
return FALSE
if(user)
to_chat(user, "<span class='notice'>You [active ? "deactivate": "activate"] the [src]</span>")
to_chat(user, "<span class='notice'>You [active ? "deactivate": "activate"] [src].</span>")
active = !active
if(active)
animate(src, pixel_y = 2, time = 10, loop = -1)