diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm
index 1d04692c0360..607a6e517a7c 100644
--- a/code/datums/ammo/misc.dm
+++ b/code/datums/ammo/misc.dm
@@ -191,7 +191,7 @@
for(var/obj/item/reagent_container/food/drinks/cans/souto/S in P.contents)
M.put_in_active_hand(S)
for(var/mob/O in viewers(GLOB.world_view_size, P)) //find all people in view.
- O.show_message(SPAN_DANGER("[M] catches the [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught.
+ O.show_message(SPAN_DANGER("[M] catches [S]!"), SHOW_MESSAGE_VISIBLE) //Tell them the can was caught.
return //Can was caught.
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/datums/emergency_calls/cryo_marines.dm b/code/datums/emergency_calls/cryo_marines.dm
index 4e997292f74d..fb8d4b8a5a69 100644
--- a/code/datums/emergency_calls/cryo_marines.dm
+++ b/code/datums/emergency_calls/cryo_marines.dm
@@ -50,34 +50,34 @@
human.client?.prefs.copy_all_to(human, JOB_SQUAD_LEADER, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/leader/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Squad Leader in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else if (heavies < max_heavies && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(human.client, JOB_SQUAD_SPECIALIST, time_required_for_job))))
heavies++
human.client?.prefs.copy_all_to(human, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/spec/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else if (medics < max_medics && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(human.client, JOB_SQUAD_MEDIC, time_required_for_job))))
medics++
human.client?.prefs.copy_all_to(human, JOB_SQUAD_MEDIC, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/medic/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Hospital Corpsman in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else if (engineers < max_engineers && (!mind || (HAS_FLAG(human.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(human.client, JOB_SQUAD_ENGI, time_required_for_job))))
engineers++
human.client?.prefs.copy_all_to(human, JOB_SQUAD_ENGI, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/engineer/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are an Engineer in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
else
human.client?.prefs.copy_all_to(human, JOB_SQUAD_MARINE, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/pfc/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Rifleman in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
sleep(10)
diff --git a/code/datums/emergency_calls/cryo_marines_heavy.dm b/code/datums/emergency_calls/cryo_marines_heavy.dm
index 2081d9564c50..42f25a461254 100644
--- a/code/datums/emergency_calls/cryo_marines_heavy.dm
+++ b/code/datums/emergency_calls/cryo_marines_heavy.dm
@@ -41,31 +41,31 @@
leaders++
arm_equipment(H, /datum/equipment_preset/uscm/leader_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Squad Leader in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(H.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
heavies++
arm_equipment(H, /datum/equipment_preset/uscm/specialist_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(smartgunners < max_smartgunners && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
smartgunners++
arm_equipment(H, /datum/equipment_preset/uscm/smartgunner_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Smartgunner in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(engineers < max_engineers && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(H.client, JOB_SQUAD_ENGI, time_required_for_job))
engineers++
arm_equipment(H, /datum/equipment_preset/uscm/engineer_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are an Engineer in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job))
medics++
arm_equipment(H, /datum/equipment_preset/uscm/medic_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Hospital Corpsman in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else
arm_equipment(H, /datum/equipment_preset/uscm/private_equipped/cryo, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Rifleman in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(H, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
sleep(10)
to_chat(H, SPAN_BOLD("Objectives: [objectives]"))
diff --git a/code/datums/emergency_calls/cryo_spec.dm b/code/datums/emergency_calls/cryo_spec.dm
index 6cc7c905efbc..8d563b0693f8 100644
--- a/code/datums/emergency_calls/cryo_spec.dm
+++ b/code/datums/emergency_calls/cryo_spec.dm
@@ -34,7 +34,7 @@
human.client?.prefs.copy_all_to(human, JOB_SQUAD_SPECIALIST, TRUE, TRUE)
arm_equipment(human, /datum/equipment_preset/uscm/spec/cryo, mind == null, TRUE)
to_chat(human, SPAN_ROLE_HEADER("You are a Weapons Specialist in the USCM"))
- to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(human, SPAN_ROLE_BODY("Your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(human, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
sleep(10)
diff --git a/code/datums/emergency_calls/tank_crew.dm b/code/datums/emergency_calls/tank_crew.dm
index fb437c179e48..f8d20051c244 100644
--- a/code/datums/emergency_calls/tank_crew.dm
+++ b/code/datums/emergency_calls/tank_crew.dm
@@ -24,11 +24,10 @@
sleep(5)
arm_equipment(H, /datum/equipment_preset/uscm/tank/full, TRUE, TRUE)
to_chat(H, SPAN_ROLE_HEADER("You are a Vehicle Crewman in the USCM"))
- to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
+ to_chat(H, SPAN_ROLE_BODY("You are here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]. Listen to the chain of command."))
to_chat(H, SPAN_BOLDWARNING("If you wish to cryo or ghost upon spawning in, you must ahelp and inform staff so you can be replaced."))
sleep(10)
to_chat(H, SPAN_BOLD("Objectives: [objectives]"))
GLOB.data_core.manifest_inject(H) //Put people in crew manifest
-
diff --git a/code/datums/emergency_calls/whiskey_outpost.dm b/code/datums/emergency_calls/whiskey_outpost.dm
index 5c46ace04d6c..c6a7e4947756 100644
--- a/code/datums/emergency_calls/whiskey_outpost.dm
+++ b/code/datums/emergency_calls/whiskey_outpost.dm
@@ -28,23 +28,23 @@
if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
leader = mob
arm_equipment(mob, /datum/equipment_preset/dust_raider/leader, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Squad Leader in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Squad Leader in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST, time_required_for_job))
heavies++
arm_equipment(mob, /datum/equipment_preset/dust_raider/specialist, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Specialist in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Specialist in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN, time_required_for_job))
smartgunners++
arm_equipment(mob, /datum/equipment_preset/dust_raider/smartgunner, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Smartgunner in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Smartgunner in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if(engineers < max_engineers && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(mob.client, JOB_SQUAD_ENGI, time_required_for_job))
engineers++
arm_equipment(mob, /datum/equipment_preset/dust_raider/engineer, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are an Engineer in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are an Engineer in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else if (medics < max_medics && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job))
medics++
arm_equipment(mob, /datum/equipment_preset/dust_raider/medic, TRUE, TRUE)
- to_chat(mob, SPAN_BOLDNOTICE("You are a Hospital Corpsman in the USCM, your squad is here to assist in the defence of the [SSmapping.configs[GROUND_MAP].map_name]."))
+ to_chat(mob, SPAN_BOLDNOTICE("You are a Hospital Corpsman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
else
arm_equipment(mob, /datum/equipment_preset/dust_raider/private, TRUE, TRUE)
to_chat(mob, SPAN_BOLDNOTICE("You are a Rifleman in the USCM, your squad is here to assist in the defence of [SSmapping.configs[GROUND_MAP].map_name]."))
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 16825ab8a7ba..207310ac34c5 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -166,15 +166,15 @@
/datum/teleport/instant/science/teleportChecks()
if(istype(teleatom, /obj/item/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
- teleatom.visible_message(SPAN_DANGER("The [teleatom] bounces off of the portal!"))
+ teleatom.visible_message(SPAN_DANGER("[teleatom] bounces off of the portal!"))
return 0
if(length(teleatom.search_contents_for(/obj/item/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom
- MM.visible_message(SPAN_DANGER("The [MM] bounces off of the portal!"),SPAN_DANGER("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
+ MM.visible_message(SPAN_DANGER("[MM] bounces off of the portal!"),SPAN_DANGER("Something you are carrying seems to be unable to pass through the portal. Better drop it if you want to go through."))
else
- teleatom.visible_message(SPAN_DANGER("The [teleatom] bounces off of the portal!"))
+ teleatom.visible_message(SPAN_DANGER("[teleatom] bounces off of the portal!"))
return 0
if(is_admin_level(destination.z))
diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 32cb026a0b25..d62d688fcfc5 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -98,7 +98,7 @@ update_flag
/obj/structure/machinery/portable_atmospherics/canister/attackby(obj/item/W as obj, mob/user as mob)
if(!HAS_TRAIT(W, TRAIT_TOOL_WRENCH) && !istype(W, /obj/item/tank) && !istype(W, /obj/item/device/analyzer))
- visible_message(SPAN_DANGER("[user] hits the [src] with a [W]!"))
+ visible_message(SPAN_DANGER("[user] hits [src] with [W]!"))
update_health(W.force)
src.add_fingerprint(user)
..()
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 715e9c2a86e5..55df45c70ccc 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -152,7 +152,7 @@
if(X.id == id)
X.score(side, 3)// 3 points for dunking a mob
// no break, to update multiple scoreboards
- visible_message(SPAN_DANGER("[user] dunks [M] into the [src]!"))
+ visible_message(SPAN_DANGER("[user] dunks [M] into [src]!"))
return
else if (istype(W, /obj/item) && get_dist(src,user)<2)
user.drop_inv_item_to_loc(W, loc)
@@ -160,7 +160,7 @@
if(X.id == id)
X.score(side)
// no break, to update multiple scoreboards
- visible_message(SPAN_NOTICE("[user] dunks [W] into the [src]!"))
+ visible_message(SPAN_NOTICE("[user] dunks [W] into [src]!"))
return
/obj/structure/holohoop/BlockedPassDirs(atom/movable/mover, target_dir)
diff --git a/code/game/machinery/computer/research.dm b/code/game/machinery/computer/research.dm
index 2c8a5689b495..1ba696eeee9c 100644
--- a/code/game/machinery/computer/research.dm
+++ b/code/game/machinery/computer/research.dm
@@ -29,7 +29,7 @@
if(!N.grant)
return
GLOB.chemical_data.update_credits(N.grant)
- visible_message(SPAN_NOTICE("[user] scans the [N.name] on the [src], collecting the [N.grant] research credits."))
+ visible_message(SPAN_NOTICE("[user] scans the [N.name] on [src], collecting the [N.grant] research credits."))
N.grant = 0
qdel(N)
return
@@ -61,7 +61,7 @@
visible_message(SPAN_NOTICE("[user] swipes their ID card on \the [src], but it is refused."))
return
if(card.clearance_access <= GLOB.chemical_data.clearance_level || (card.clearance_access == 6 && GLOB.chemical_data.clearance_level >= 5 && GLOB.chemical_data.clearance_x_access))
- visible_message(SPAN_NOTICE("[user] swipes the clearance card on the [src], but nothing happens."))
+ visible_message(SPAN_NOTICE("[user] swipes the clearance card on [src], but nothing happens."))
return
if(user.real_name != card.registered_name)
visible_message(SPAN_WARNING("WARNING: ILLEGAL CLEARANCE USER DETECTED. CARD DATA HAS BEEN WIPED."))
@@ -220,4 +220,3 @@
GLOB.chemical_data.update_credits(purchase_cost * -1)
visible_message(SPAN_NOTICE("Clearance Level X Acquired."))
playsound(loc, pick('sound/machines/computer_typing1.ogg','sound/machines/computer_typing2.ogg','sound/machines/computer_typing3.ogg'), 5, 1)
-
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 4e362ef12fac..b03ba1e8e195 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -557,7 +557,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
if(istype(attacking_item, /obj/item/clothing/mask/cigarette))
if(isElectrified())
var/obj/item/clothing/mask/cigarette/L = attacking_item
- L.light(SPAN_NOTICE("[user] lights their [L] on an electrical arc from the [src]"))
+ L.light(SPAN_NOTICE("[user] lights their [L] on an electrical arc from [src]"))
return
if(!isRemoteControlling(user))
@@ -568,7 +568,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
add_fingerprint(user)
if(istype(attacking_item, /obj/item/weapon/zombie_claws) && (welded || locked))
- user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on the [src]!"), \
+ user.visible_message(SPAN_NOTICE("[user] starts tearing into the door on [src]!"), \
SPAN_NOTICE("You start prying your hand into the gaps of the door with your fingers... This will take about 30 seconds."), \
SPAN_NOTICE("You hear tearing noises!"))
@@ -845,7 +845,7 @@ GLOBAL_LIST_INIT(airlock_wire_descriptions, list(
for(var/i in resin_door_shmushereds)
if(istype(x,i)) //I would like to just use a if(locate() in ) here but Im not gonna add every child to GLOB.resin_door_shmushereds so it works
playsound(loc, "alien_resin_break", 25)
- visible_message(SPAN_WARNING("The [src.name] closes on the [x], shmushing it!"))
+ visible_message(SPAN_WARNING("The [src.name] closes on [x], shmushing it!"))
if(isturf(x))
var/turf/closed/wall/resin_wall_to_destroy = x
resin_wall_to_destroy.dismantle_wall()
diff --git a/code/game/machinery/fusion_engine.dm b/code/game/machinery/fusion_engine.dm
index 8e3097ef52d1..d7c7cc4c7d18 100644
--- a/code/game/machinery/fusion_engine.dm
+++ b/code/game/machinery/fusion_engine.dm
@@ -156,13 +156,13 @@
/obj/structure/machinery/power/fusion_engine/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/fuelCell))
if(is_on)
- to_chat(user, SPAN_WARNING("The [src] needs to be turned off first."))
+ to_chat(user, SPAN_WARNING("[src] needs to be turned off first."))
return TRUE
if(!fusion_cell)
if(user.drop_inv_item_to_loc(O, src))
fusion_cell = O
update_icon()
- to_chat(user, SPAN_NOTICE("You load the [src] with the [O]."))
+ to_chat(user, SPAN_NOTICE("You load [src] with [O]."))
return TRUE
else
to_chat(user, SPAN_WARNING("You need to remove the fuel cell from [src] first."))
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 4b863bec043d..e16d2cacf63b 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -101,7 +101,7 @@
for(var/datum/reagent/chem in beaker.reagents.reagent_list)
reagentnames += ";[chem.name]"
- log_admin("[key_name(user)] put a [beaker] into [src], containing [reagentnames] at ([src.loc.x],[src.loc.y],[src.loc.z]).")
+ log_admin("[key_name(user)] put \a [beaker] into [src], containing [reagentnames] at ([src.loc.x],[src.loc.y],[src.loc.z]).")
to_chat(user, "You attach \the [container] to \the [src].")
update_beam()
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index 0c4b8a973e83..a18f5db8af43 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -89,7 +89,7 @@
to_chat(user, SPAN_DANGER("That probably won't blend."))
return 1
user.visible_message("[user] put [what] into [src].", \
- "You put the [what] into [src].")
+ "You put [what] into [src].")
user.drop_held_item()
what.forceMove(src)
@@ -118,4 +118,3 @@
src.processing = 0
src.visible_message(SPAN_NOTICE("\the [src] finished processing."), \
"You hear the food processor stopping/")
-
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index 33e6e9749e48..a886b59f501f 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -620,8 +620,8 @@ Buildable meters
playsound(src.loc, 'sound/items/Ratchet.ogg', 25, 1)
user.visible_message( \
- "[user] fastens the [src].", \
- SPAN_NOTICE("You have fastened the [src]."), \
+ "[user] fastens [src].", \
+ SPAN_NOTICE("You have fastened [src]."), \
"You hear ratchet.")
qdel(src) // remove the pipe item
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index dd45ad597800..69b21964a4f4 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -66,7 +66,7 @@
return
else if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER))
open = !open
- user.visible_message(SPAN_NOTICE("[user] [open ? "opens" : "closes"] the hatch on the [src]."), SPAN_NOTICE("You [open ? "open" : "close"] the hatch on the [src]."))
+ user.visible_message(SPAN_NOTICE("[user] [open ? "opens" : "closes"] the hatch on [src]."), SPAN_NOTICE("You [open ? "open" : "close"] the hatch on [src]."))
update_icon()
if(!open && user.interactee == src)
close_browser(user, "spaceheater")
@@ -107,7 +107,7 @@
start_processing()
else
stop_processing()
- user.visible_message(SPAN_NOTICE("[user] switches [on ? "on" : "off"] the [src]."),SPAN_NOTICE("You switch [on ? "on" : "off"] the [src]."))
+ user.visible_message(SPAN_NOTICE("[user] switches [on ? "on" : "off"] [src]."),SPAN_NOTICE("You switch [on ? "on" : "off"] [src]."))
update_icon()
return
@@ -186,4 +186,3 @@
name = "radiator"
desc = "It's a radiator. It heats the room through convection with hot water. This one has a red handle."
icon_state = "radiator-r"
-
diff --git a/code/game/machinery/vending/vending.dm b/code/game/machinery/vending/vending.dm
index b6c4da03640c..8629ce2bb2be 100644
--- a/code/game/machinery/vending/vending.dm
+++ b/code/game/machinery/vending/vending.dm
@@ -208,23 +208,23 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
update_icon()
return TRUE
else if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
else if(stat & BROKEN)
- to_chat(user, SPAN_NOTICE("You start to unscrew the [src]'s broken panel."))
+ to_chat(user, SPAN_NOTICE("You start to unscrew [src]'s broken panel."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop unscrewing the [src]'s broken panel."))
+ to_chat(user, SPAN_WARNING("You stop unscrewing [src]'s broken panel."))
return FALSE
- to_chat(user, SPAN_NOTICE("You unscrew the [src]'s broken panel and remove it, exposing many broken wires."))
+ to_chat(user, SPAN_NOTICE("You unscrew [src]'s broken panel and remove it, exposing many broken wires."))
stat &= ~BROKEN
stat |= REPAIR_STEP_ONE
return TRUE
else if(stat & REPAIR_STEP_FOUR)
- to_chat(user, SPAN_NOTICE("You start to fasten the [src]'s new panel."))
+ to_chat(user, SPAN_NOTICE("You start to fasten [src]'s new panel."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop fastening the [src]'s new panel."))
+ to_chat(user, SPAN_WARNING("You stop fastening [src]'s new panel."))
return FALSE
- to_chat(user, SPAN_NOTICE("You fasten the [src]'s new panel, fully repairing the vendor."))
+ to_chat(user, SPAN_NOTICE("You fasten [src]'s new panel, fully repairing the vendor."))
stat &= ~REPAIR_STEP_FOUR
stat |= FULLY_REPAIRED
update_icon()
@@ -235,17 +235,17 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return FALSE
else if(HAS_TRAIT(item, TRAIT_TOOL_WIRECUTTERS))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
else if(stat == WORKING && panel_open)
attack_hand(user)
return
else if(stat & REPAIR_STEP_ONE)
- to_chat(user, SPAN_NOTICE("You start to remove the [src]'s broken wires."))
+ to_chat(user, SPAN_NOTICE("You start to remove [src]'s broken wires."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop removing the [src]'s broken wires."))
+ to_chat(user, SPAN_WARNING("You stop removing [src]'s broken wires."))
return FALSE
- to_chat(user, SPAN_NOTICE("You remove the [src]'s broken broken wires."))
+ to_chat(user, SPAN_NOTICE("You remove [src]'s broken broken wires."))
stat &= ~REPAIR_STEP_ONE
stat |= REPAIR_STEP_TWO
return TRUE
@@ -255,20 +255,20 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return FALSE
else if(istype(item, /obj/item/stack/cable_coil))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
var/obj/item/stack/cable_coil/CC = item
if(stat & REPAIR_STEP_TWO)
if(CC.amount < 5)
to_chat(user, SPAN_WARNING("You need more cable coil to replace the removed wires."))
- to_chat(user, SPAN_NOTICE("You start to replace the [src]'s removed wires."))
+ to_chat(user, SPAN_NOTICE("You start to replace [src]'s removed wires."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop replacing the [src]'s removed wires."))
+ to_chat(user, SPAN_WARNING("You stop replacing [src]'s removed wires."))
return FALSE
if(!CC || !CC.use(5))
to_chat(user, SPAN_WARNING("You need more cable coil to replace the removed wires."))
return FALSE
- to_chat(user, SPAN_NOTICE("You remove the [src]'s broken broken wires."))
+ to_chat(user, SPAN_NOTICE("You remove [src]'s broken broken wires."))
stat &= ~REPAIR_STEP_TWO
stat |= REPAIR_STEP_THREE
return TRUE
@@ -278,18 +278,18 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return
else if(istype(item, /obj/item/stack/sheet/metal))
if(!skillcheck(user, SKILL_ENGINEER, SKILL_ENGINEER_ENGI))
- to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src]."))
+ to_chat(user, SPAN_WARNING("You do not understand how to repair the broken [src.name]."))
return FALSE
var/obj/item/stack/sheet/metal/M = item
if(stat & REPAIR_STEP_THREE)
- to_chat(user, SPAN_NOTICE("You start to construct a new panel for the [src]."))
+ to_chat(user, SPAN_NOTICE("You start to construct a new panel for [src]."))
if(!do_after(user, 3 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD, numticks = 3))
- to_chat(user, SPAN_WARNING("You stop constructing a new panel for the [src]."))
+ to_chat(user, SPAN_WARNING("You stop constructing a new panel for [src]."))
return FALSE
if(!M || !M.use(1))
to_chat(user, SPAN_WARNING("You a sheet of metal to construct a new panel."))
return FALSE
- to_chat(user, SPAN_NOTICE("You construct a new panel for the [src]."))
+ to_chat(user, SPAN_NOTICE("You construct a new panel for [src]."))
stat &= ~REPAIR_STEP_THREE
stat |= REPAIR_STEP_FOUR
return TRUE
@@ -306,9 +306,9 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
switch (anchored)
if (0)
anchored = TRUE
- user.visible_message("[user] tightens the bolts securing the [src] to the floor.", "You tighten the bolts securing the [src] to the floor.")
+ user.visible_message("[user] tightens the bolts securing [src] to the floor.", "You tighten the bolts securing [src] to the floor.")
if (1)
- user.visible_message("[user] unfastens the bolts securing the [src] to the floor.", "You unfasten the bolts securing the [src] to the floor.")
+ user.visible_message("[user] unfastens the bolts securing [src] to the floor.", "You unfasten the bolts securing [src] to the floor.")
anchored = FALSE
return
else if(HAS_TRAIT(item, TRAIT_TOOL_MULTITOOL) || HAS_TRAIT(item, TRAIT_TOOL_WIRECUTTERS))
@@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return
if(user.drop_inv_item_to_loc(item, src))
coin = item
- to_chat(user, SPAN_NOTICE(" You insert the [item] into the [src]"))
+ to_chat(user, SPAN_NOTICE("You insert [item] into [src]"))
tgui_interact(user)
return
else if(istype(item, /obj/item/spacecash))
@@ -422,9 +422,9 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
if(is_tipped_over)
if(user.action_busy)
return
- user.visible_message(SPAN_NOTICE("[user] begins to heave the [src] back into place!"), SPAN_NOTICE("You start heaving the [src] back into place..."))
+ user.visible_message(SPAN_NOTICE("[user] begins to heave [src] back into place!"), SPAN_NOTICE("You start heaving [src] back into place..."))
if(do_after(user, 80, INTERRUPT_NO_NEEDHAND, BUSY_ICON_FRIENDLY))
- user.visible_message(SPAN_NOTICE("[user] rights the [src]!"), SPAN_NOTICE("You right the [src]!"))
+ user.visible_message(SPAN_NOTICE("[user] rights [src]!"), SPAN_NOTICE("You right [src]!"))
flip_back()
return
@@ -534,7 +534,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
return
if(coin.string_attached)
if(prob(50))
- to_chat(user, SPAN_NOTICE("You successfully pull the coin out before the [src] could swallow it."))
+ to_chat(user, SPAN_NOTICE("You successfully pull the coin out before [src] could swallow it."))
user.put_in_hands(coin)
else
to_chat(user, SPAN_NOTICE("You weren't able to pull the coin out fast enough, the machine ate it, string and all."))
@@ -882,8 +882,8 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
S.remove_from_storage(item_to_stock, user.loc)
qdel(item_to_stock)
- user.visible_message(SPAN_NOTICE("[user] stocks the [src] with \a [product.product_name]."),
- SPAN_NOTICE("You stock the [src] with \a [product.product_name]."))
+ user.visible_message(SPAN_NOTICE("[user] stocks [src] with \a [product.product_name]."),
+ SPAN_NOTICE("You stock [src] with \a [product.product_name]."))
product.amount++
return //We found our item, no reason to go on.
@@ -967,7 +967,7 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
if (!throw_item)
return 0
INVOKE_ASYNC(throw_item, /atom/movable/proc/throw_atom, target, 16, SPEED_AVERAGE, src)
- visible_message(SPAN_WARNING("The [src] launches \the [throw_item] at [target]!"))
+ visible_message(SPAN_WARNING("[src] launches [throw_item] at [target]!"))
playsound(src, "sound/machines/vending.ogg", 40, TRUE)
return 1
@@ -988,14 +988,14 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
switch(wire)
if(VENDING_WIRE_EXTEND)
extended_inventory = TRUE
- visible_message(SPAN_NOTICE("A weak yellow light turns off underneath the [src]."))
+ visible_message(SPAN_NOTICE("A weak yellow light turns off underneath [src]."))
if(VENDING_WIRE_SHOCK)
seconds_electrified = -1
- visible_message(SPAN_DANGER("Electric arcs shoot off from the [src]!"))
+ visible_message(SPAN_DANGER("Electric arcs shoot off from [src]!"))
if (VENDING_WIRE_SHOOT_INV)
if(!shoot_inventory)
shoot_inventory = TRUE
- visible_message(SPAN_WARNING("The [src] begins whirring noisily."))
+ visible_message(SPAN_WARNING("[src] begins whirring noisily."))
/obj/structure/machinery/vending/proc/mend(wire)
wires |= getWireFlag(wire)
@@ -1003,24 +1003,24 @@ GLOBAL_LIST_EMPTY_TYPED(total_vending_machines, /obj/structure/machinery/vending
switch(wire)
if(VENDING_WIRE_EXTEND)
extended_inventory = FALSE
- visible_message(SPAN_NOTICE("A weak yellow light turns on underneath the [src]."))
+ visible_message(SPAN_NOTICE("A weak yellow light turns on underneath [src]."))
if(VENDING_WIRE_SHOCK)
seconds_electrified = 0
if (VENDING_WIRE_SHOOT_INV)
shoot_inventory = FALSE
- visible_message(SPAN_NOTICE("The [src] stops whirring."))
+ visible_message(SPAN_NOTICE("[src] stops whirring."))
/obj/structure/machinery/vending/proc/pulse(wire)
switch(wire)
if(VENDING_WIRE_EXTEND)
extended_inventory = !extended_inventory
- visible_message(SPAN_NOTICE("A weak yellow light turns [extended_inventory ? "on" : "off"] underneath the [src]."))
+ visible_message(SPAN_NOTICE("A weak yellow light turns [extended_inventory ? "on" : "off"] underneath [src]."))
if (VENDING_WIRE_SHOCK)
seconds_electrified = 30
- visible_message(SPAN_DANGER("Electric arcs shoot off from the [src]!"))
+ visible_message(SPAN_DANGER("Electric arcs shoot off from [src]!"))
if (VENDING_WIRE_SHOOT_INV)
shoot_inventory = !shoot_inventory
if(shoot_inventory)
- visible_message(SPAN_WARNING("The [src] begins whirring noisily."))
+ visible_message(SPAN_WARNING("[src] begins whirring noisily."))
else
- visible_message(SPAN_NOTICE("The [src] stops whirring."))
+ visible_message(SPAN_NOTICE("[src] stops whirring."))
diff --git a/code/game/objects/items/circuitboards/computer.dm b/code/game/objects/items/circuitboards/computer.dm
index 40c66bc0fa6a..08dcfc6964a6 100644
--- a/code/game/objects/items/circuitboards/computer.dm
+++ b/code/game/objects/items/circuitboards/computer.dm
@@ -287,14 +287,12 @@
/obj/item/circuitboard/computer/rdconsole/attackby(obj/item/I as obj, mob/user as mob)
if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER))
- user.visible_message(SPAN_NOTICE("\the [user] adjusts the jumper on the [src]'s access protocol pins."), SPAN_NOTICE("You adjust the jumper on the access protocol pins."))
+ user.visible_message(SPAN_NOTICE("[user] adjusts the jumper on [src]'s access protocol pins."), SPAN_NOTICE("You adjust the jumper on the access protocol pins."))
if(src.build_path == /obj/structure/machinery/computer/rdconsole/core)
src.name = "Circuit Board (RD Console - Robotics)"
src.build_path = /obj/structure/machinery/computer/rdconsole/robotics
- to_chat(user, SPAN_NOTICE(" Access protocols set to robotics."))
+ to_chat(user, SPAN_NOTICE("Access protocols set to robotics."))
else
src.name = "Circuit Board (RD Console)"
src.build_path = /obj/structure/machinery/computer/rdconsole/core
- to_chat(user, SPAN_NOTICE(" Access protocols set to default."))
-
-
+ to_chat(user, SPAN_NOTICE("Access protocols set to default."))
diff --git a/code/game/objects/items/circuitboards/machine.dm b/code/game/objects/items/circuitboards/machine.dm
index ad4c31cb11e9..248d0d5c8885 100644
--- a/code/game/objects/items/circuitboards/machine.dm
+++ b/code/game/objects/items/circuitboards/machine.dm
@@ -141,7 +141,7 @@ to destroy them and players will be able to make replacements.
if(HAS_TRAIT(I, TRAIT_TOOL_SCREWDRIVER))
machine_dir = turn(machine_dir, 90)
init_dirs = machine_dir
- user.visible_message(SPAN_NOTICE("\The [user] adjusts the jumper on the [src]'s port configuration pins."), SPAN_NOTICE("You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)]."))
+ user.visible_message(SPAN_NOTICE("[user] adjusts the jumper on [src]'s port configuration pins."), SPAN_NOTICE("You adjust the jumper on the port configuration pins. Now set to [dir2text(machine_dir)]."))
return
/obj/item/circuitboard/machine/unary_atmos/get_examine_text(mob/user)
@@ -300,5 +300,3 @@ to destroy them and players will be able to make replacements.
// Board itself is high tech. Coils have to be ordered from cargo or salvaged from existing SMESs.
frame_desc = "Requires 1 superconducting magnetic coil and 30 wires."
req_components = list(/obj/item/stock_parts/smes_coil = 1, /obj/item/stack/cable_coil = 30)
-
-
diff --git a/code/game/objects/items/devices/cloaking.dm b/code/game/objects/items/devices/cloaking.dm
index 05e7786744e2..b0c5ed799977 100644
--- a/code/game/objects/items/devices/cloaking.dm
+++ b/code/game/objects/items/devices/cloaking.dm
@@ -47,12 +47,12 @@
src.add_fingerprint(user)
if(chameleon_on)
user.alpha = 25
- to_chat(user, SPAN_NOTICE("You activate the [src]."))
+ to_chat(user, SPAN_NOTICE("You activate [src]."))
spark_system.start()
src.icon_state = "shield1"
else
user.alpha = initial(user.alpha)
- to_chat(user, SPAN_NOTICE("You deactivate the [src]."))
+ to_chat(user, SPAN_NOTICE("You deactivate [src]."))
src.icon_state = "shield0"
spark_system.start()
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 40ef8792aedb..3f285b358fb2 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -121,7 +121,7 @@
if(target.status != LIGHT_OK)
if(CanUse(U))
if(!Use(U)) return
- to_chat(U, SPAN_NOTICE("You replace the [target.fitting] with the [src]."))
+ to_chat(U, SPAN_NOTICE("You replace the [target.fitting] with [src]."))
if(target.status != LIGHT_EMPTY)
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index d388e06b9fa7..e0f65a4b31ec 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -110,7 +110,7 @@
cell.add_fingerprint(user)
cell.update_icon()
- to_chat(user, "You remove the [src.cell].")
+ to_chat(user, "You remove [cell].")
src.cell = null
updateicon()
return
@@ -121,7 +121,7 @@
else
turn_on()
if (on)
- to_chat(user, "You switch on the [src].")
+ to_chat(user, "You switch on [src].")
/obj/item/device/suit_cooling_unit/attackby(obj/item/W as obj, mob/user as mob)
if (HAS_TRAIT(W, TRAIT_TOOL_SCREWDRIVER))
@@ -137,12 +137,12 @@
if (istype(W, /obj/item/cell))
if(cover_open)
if(cell)
- to_chat(user, "There is a [cell] already installed here.")
+ to_chat(user, "There is \a [cell] already installed here.")
else
if(user.drop_held_item())
W.forceMove(src)
cell = W
- to_chat(user, "You insert the [cell].")
+ to_chat(user, "You insert [cell].")
updateicon()
return
@@ -169,7 +169,7 @@
if (cover_open)
if(cell)
- . += "The panel is open, exposing the [cell]."
+ . += "The panel is open, exposing [cell]."
else
. += "The panel is open."
diff --git a/code/game/objects/items/devices/teleportation.dm b/code/game/objects/items/devices/teleportation.dm
index c65286969786..793f399ecdf0 100644
--- a/code/game/objects/items/devices/teleportation.dm
+++ b/code/game/objects/items/devices/teleportation.dm
@@ -49,7 +49,7 @@
return
var/turf/current_location = get_turf(usr)//What turf is the user on?
if(!current_location || is_admin_level(current_location.z))//If turf was not found or they're on z level 2.
- to_chat(usr, "The [src] is malfunctioning.")
+ to_chat(usr, "[src] is malfunctioning.")
return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
usr.set_interaction(src)
@@ -177,4 +177,3 @@
P.creator = src
src.add_fingerprint(user)
return
-
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index b3d433727946..6fc526936809 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -47,7 +47,7 @@
user.temp_drop_inv_item(A)
attached_device = A
A.forceMove(src)
- to_chat(user, SPAN_NOTICE("You attach the [item] to the valve controls and secure it."))
+ to_chat(user, SPAN_NOTICE("You attach [item] to the valve controls and secure it."))
A.holder = src
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
diff --git a/code/game/objects/items/explosives/explosive.dm b/code/game/objects/items/explosives/explosive.dm
index 0c482e8db9e7..4483372c9b85 100644
--- a/code/game/objects/items/explosives/explosive.dm
+++ b/code/game/objects/items/explosives/explosive.dm
@@ -262,8 +262,8 @@
if(falloff_mode == EXPLOSION_FALLOFF_SHAPE_LINEAR)
falloff_mode = EXPLOSION_FALLOFF_SHAPE_EXPONENTIAL
- to_chat(usr, SPAN_NOTICE("You enable the [src]'s blast wave dampener, limiting the blast radius."))
+ to_chat(usr, SPAN_NOTICE("You enable [src]'s blast wave dampener, limiting the blast radius."))
else
falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR
- to_chat(usr, SPAN_NOTICE("You disable the [src]'s blast wave dampener, restoring the blast radius to full."))
+ to_chat(usr, SPAN_NOTICE("You disable [src]'s blast wave dampener, restoring the blast radius to full."))
playsound(loc, 'sound/items/Screwdriver2.ogg', 25, 0, 6)
diff --git a/code/game/objects/items/explosives/grenades/chem_grenade.dm b/code/game/objects/items/explosives/grenades/chem_grenade.dm
index e975603d45d8..48430aacecc9 100644
--- a/code/game/objects/items/explosives/grenades/chem_grenade.dm
+++ b/code/game/objects/items/explosives/grenades/chem_grenade.dm
@@ -1,5 +1,5 @@
/obj/item/explosive/grenade/custom
- name = "Custom grenade"
+ name = "custom grenade"
icon_state = "grenade_custom"
desc = "A custom chemical grenade with an M40 casing. This one is made to fit into underslung grenade launchers, but can also be thrown by hand."
w_class = SIZE_SMALL
@@ -17,7 +17,7 @@
..()
/obj/item/explosive/grenade/custom/large
- name = "Large Custom Grenade"
+ name = "large custom grenade"
desc = "A custom chemical grenade with an M15 casing. This casing has a higher explosive capacity than the M40 variant."
icon_state = "large_grenade_custom"
allowed_containers = list(/obj/item/reagent_container/glass)
@@ -33,7 +33,7 @@
/obj/item/explosive/grenade/custom/metal_foam
- name = "Metal-Foam Grenade"
+ name = "metal-foam grenade"
desc = "Used for emergency sealing of air breaches."
assembly_stage = ASSEMBLY_LOCKED
harmful = FALSE
@@ -56,7 +56,7 @@
update_icon()
/obj/item/explosive/grenade/custom/incendiary
- name = "Incendiary Grenade"
+ name = "incendiary grenade"
desc = "Used for clearing rooms of living things."
assembly_stage = ASSEMBLY_LOCKED
has_blast_wave_dampener = FALSE
@@ -79,7 +79,7 @@
update_icon()
/obj/item/explosive/grenade/custom/flare
- name = "M40-F flare grenade"
+ name = "\improper M40-F flare grenade"
desc = "Chemical flare in a grenade form, designed for compatibility with most standard issue launchers."
assembly_stage = ASSEMBLY_LOCKED
has_blast_wave_dampener = FALSE
@@ -103,7 +103,7 @@
update_icon()
/obj/item/explosive/grenade/custom/large/flare
- name = "M15-F flare grenade"
+ name = "\improper M15-F flare grenade"
desc = "Chemical flare in a grenade form, expanded variant. The casing is too large to fit most launchers."
assembly_stage = ASSEMBLY_LOCKED
has_blast_wave_dampener = FALSE
diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm
index 45478f2828f4..768a32c003fa 100644
--- a/code/game/objects/items/explosives/mine.dm
+++ b/code/game/objects/items/explosives/mine.dm
@@ -309,7 +309,7 @@
map_deployed = TRUE
/obj/item/explosive/mine/custom
- name = "Custom mine"
+ name = "custom mine"
desc = "A custom chemical mine built from an M20 casing."
icon_state = "m20_custom"
customizable = TRUE
diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
index ac0a2263cd5c..071ff3458a91 100644
--- a/code/game/objects/items/explosives/plastic.dm
+++ b/code/game/objects/items/explosives/plastic.dm
@@ -184,7 +184,7 @@
//vehicle interior stuff checks
if(SSinterior.in_interior(target))
- to_chat(user, SPAN_WARNING("It's too cramped in here to deploy \the [src]."))
+ to_chat(user, SPAN_WARNING("It's too cramped in here to deploy [src]."))
return FALSE
if(istype(target, /obj/effect) || istype(target, /obj/structure/machinery))
@@ -195,7 +195,7 @@
if(istype(target, /turf/closed/wall))
var/turf/closed/wall/W = target
if(W.hull)
- to_chat(user, SPAN_WARNING("You are unable to stick \the [src] to the [W]!"))
+ to_chat(user, SPAN_WARNING("You are unable to stick [src] to [W]!"))
return FALSE
if(istype(target, /obj/structure/window))
@@ -301,7 +301,7 @@
prime(TRUE)
/obj/item/explosive/plastic/custom
- name = "Custom plastic explosive"
+ name = "custom plastic explosive"
desc = "A custom plastic explosive."
icon_state = "custom_plastic_explosive"
overlay_image = "custom_plastic_explosive_sensing"
diff --git a/code/game/objects/items/frames/camera.dm b/code/game/objects/items/frames/camera.dm
index 59bc2844868e..efe697c3944b 100644
--- a/code/game/objects/items/frames/camera.dm
+++ b/code/game/objects/items/frames/camera.dm
@@ -167,7 +167,7 @@
to_chat(user, SPAN_WARNING("\The [WT] needs to be on!"))
return 0
- to_chat(user, SPAN_NOTICE("You start to weld the [src].."))
+ to_chat(user, SPAN_NOTICE("You start to weld [src].."))
playsound(src.loc, 'sound/items/Welder.ogg', 25, 1)
WT.eyecheck(user)
if(do_after(user, 20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
diff --git a/code/game/objects/items/lightstick.dm b/code/game/objects/items/lightstick.dm
index 70418049994b..89ce2c00762e 100644
--- a/code/game/objects/items/lightstick.dm
+++ b/code/game/objects/items/lightstick.dm
@@ -22,7 +22,7 @@
/obj/item/lightstick/Crossed(mob/living/O)
if(anchored && prob(trample_chance) && can_trample)
if(!istype(O,/mob/living/carbon/xenomorph/larva))
- visible_message(SPAN_DANGER("[O] tramples the [src]!"))
+ visible_message(SPAN_DANGER("[O] tramples [src]!"))
playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
if(istype(O,/mob/living/carbon/xenomorph))
if(prob(40))
@@ -46,17 +46,17 @@
if(!anchored)//If planted
return
- to_chat(user, "You start pulling out \the [src].")
- if(!do_after(user,20, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
+ to_chat(user, "You start pulling out [src].")
+ if(!do_after(user, 2 SECONDS, INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
return
anchored = FALSE
- user.visible_message("[user.name] removes \the [src] from the ground.","You remove the [src] from the ground.")
+ user.visible_message("[user.name] removes [src] from the ground.", "You remove [src] from the ground.")
icon_state = "lightstick_[s_color][anchored]"
set_light(0)
pixel_x = 0
pixel_y = 0
- playsound(user, 'sound/weapons/Genhit.ogg', 25, 1)
+ playsound(user, 'sound/weapons/Genhit.ogg', 25, TRUE)
//Red
/obj/item/lightstick/planted
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index 50c5cd75551b..1699cb24ef39 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -134,7 +134,7 @@
return
stored_item = object
mobber.drop_inv_item_to_loc(object, src)
- to_chat(mobber, SPAN_NOTICE("You slide the [object] into [src]."))
+ to_chat(mobber, SPAN_NOTICE("You slide [object] into [src]."))
playsound(mobber, 'sound/weapons/gun_shotgun_shell_insert.ogg', 15, TRUE)
update_icon()
break
diff --git a/code/game/objects/items/reagent_containers/food/condiment.dm b/code/game/objects/items/reagent_containers/food/condiment.dm
index a13489f0af1e..7b9358b81826 100644
--- a/code/game/objects/items/reagent_containers/food/condiment.dm
+++ b/code/game/objects/items/reagent_containers/food/condiment.dm
@@ -23,7 +23,7 @@
return FALSE
if(M == user)
- to_chat(M, SPAN_NOTICE(" You swallow some of contents of the [src]."))
+ to_chat(M, SPAN_NOTICE("You swallow some of contents of [src]."))
else if(istype(M, /mob/living/carbon/human))
user.affected_message(M,
@@ -202,7 +202,7 @@
/obj/item/reagent_container/food/condiment/hotsauce/franks
name = "\improper Frank's Red Hot bottle"
desc = "A bottle of Weyland-Yutani brand Frank's Red Hot hot sauce."
- desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce."
+ desc_lore = "Supposedly designed as a middle-ground flavor between ketchup and cayenne, this brand of spicy goodness achieved critical acclaim throughout UA space within both colonies and vessels alike. The sudden and widespread adoption was curiously timed with the near-simultaneous shelving of the original Frank's 'ULTRA' hot sauce."
icon_state = "hotsauce_franks"
item_state = "hotsauce_franks"
diff --git a/code/game/objects/items/reagent_containers/food/fortunecookie.dm b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
index 270bd4d7c44a..6077541acd84 100644
--- a/code/game/objects/items/reagent_containers/food/fortunecookie.dm
+++ b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
@@ -75,7 +75,7 @@
to_chat(user,SPAN_WARNING("[src] is cracked open! How are you gonna slip something in that?"))
else
if(!cookiefortune)
- to_chat(user, SPAN_NOTICE("You slip the paper into the [src]."))
+ to_chat(user, SPAN_NOTICE("You slip the paper into [src]."))
cookiefortune = W
user.drop_inv_item_to_loc(W, src)
else
diff --git a/code/game/objects/items/reagent_containers/food/sandwich.dm b/code/game/objects/items/reagent_containers/food/sandwich.dm
index 1b7d61eaddad..511c0c042be1 100644
--- a/code/game/objects/items/reagent_containers/food/sandwich.dm
+++ b/code/game/objects/items/reagent_containers/food/sandwich.dm
@@ -18,7 +18,7 @@
/obj/item/reagent_container/food/snacks/csandwich/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W, /obj/item/reagent_container/food/snacks/csandwich))
//No sandwitch inception, it causes some bugs...
- to_chat(user, SPAN_NOTICE(" You can't put a [W] in the [src]."))
+ to_chat(user, SPAN_NOTICE("You can't put \a [W] in [src]."))
return
var/sandwich_limit = 4