cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[READY] Mass English Fixes PHASE 1 (#16484)

Browse Source 
* fixes contractions to proper english in negative.dm

* fixes possessives in miscellaneous.dm

* fixes capitalization in brain_item.dm

* fixes capitalization in liver.dm

* Fixes negative.dm typo

* adds a missing i to ai _DEFINES

* Fixes typo in cargo defines to spell auxiliary properly

* fixes contractions in code\datums\action.dm

* fixes capitalization in code\datums\components\religious_tool.dm

* Fixes spelling of sudoriferous in code\datums\diseases\advance\symptoms\fire.dm

* changes necrotizing tissues and organs to necrosing tissues and organs in code\datums\diseases\advance\symptoms\flesh_eating.dm

necrosing is proper english here

* Fixes a missing letter in code\datums\diseases\advance\symptoms\itching.dm

* Changes s to z in code\datums\diseases\advance\symptoms\radiation.dm

* Updates clarity in code\datums\diseases\brainrot.dm

* spells vengeance properly in code\datums\diseases\parrotpossession.dm

* fixes grammar in code\datums\diseases\wizarditis.dm

* fixes the spelling of "casualties" in code\datums\ert.dm

* removes extra t in code\datums\martial\cqc.dm

* Updates code\datums\martial\flying_fang.dm to match style of previous code

* adds t to code\datums\mutations\antenna.dm

* spells agitation right in code\datums\mutations\hulk.dm

* spells perceive right in code\datums\mutations\sight.dm

* fixes a contraction in code\datums\ruins\lavaland.dm

* changes "unbreachable" to "impenetrable" and "tradestation" to "trade station", as well as fixing a typo in code\datums\ruins\space.dm

* fixes typos in code\datums\shuttles.dm

* fixes a typo in code\datums\station_traits\negative_traits.dm

* Fixes a typo in code\datums\station_traits\positive_traits.dm

* Fixes spelling in code\datums\wires\mech_fabricator.dm

* fixes typo in code\datums\wounds\burns.dm

* resanguination is not a real word

* fixes typo in code\game\gamemodes\changeling\traitor_chan.dm

* fixes typos in code\game\gamemodes\clock_cult\clock_cult.dm

* fixes spelling in code\game\gamemodes\cult\cult.dm

* adds an s to posses in code\game\gamemodes\eldritch_cult\eldritch_cult.dm

* fixes a spelling mistake in code\game\gamemodes\hivemind\radar.dm

* fixes a typo in code\game\gamemodes\malfunction\malf.dm

* fixes spelling mistake in code\game\gamemodes\wizard\wizard.dm

* Fixes a spelling mistake in code\game\machinery\bounty_board.dm

* fixes whatever the fuck medical kiosks were spelling wise

* removes a t and lowercases bluespace as it isn't a proper noun in code\game\machinery\sci_bombardment.dm

* Fixes spelling mistake in code\game\machinery\shuttle\shuttle_heater.dm

* Fixes spelling issue in code\game\machinery\stasis.dm

* Fixes spelling issue in code\game\machinery\telecomms\computers\logbrowser.dm

* oranges can't fucking spell in code\game\mecha\equipment\tools\medical_tools.dm

* authentication is now spelled correctly in code\game\mecha\mech_fabricator.dm

* fixes spelling mistake in code\game\mecha\mecha.dm

* Updates "Defence" to "Defense" to be more in line with sprite information

* Fixes spelling issue in code\game\objects\items\grenades\chem_grenade.dm

* updates mecha defence mode to defense mode to be more in line with what is written as the icon_state

* Fixes english in code\game\objects\items\implants\implant_greytide.dm

* fixes spelling issue in code\game\objects\items\robot\robot_parts.dm

* fixes spelling issues in code\game\objects\items\storage\lockbox.dm

* Revert "Changes s to z in code\datums\diseases\advance\symptoms\radiation.dm"

This reverts commit 170f514f67 to change the z back to an s

* updates an extra m in object path in code\game\objects\structures\signs\signs_departments.dm

* spelling fix in code\game\objects\structures\crates_lockers\closets\bodybag.dm

* spells otherworldly correctly in code\game\objects\items\twohanded.dm

* food service is 2 separate words in code\game\objects\structures\crates_lockers\closets\job_closets.dm

* Fixes a spelling mistake in code\game\objects\items\toys.dm

* Fixes spelling of Nanotrasen in code\game\objects\items\supermatter_delaminator.dm

* Adderall is a proper noun in code\game\objects\items\sharpener.dm

* fixes spelling mistake in code\game\objects\items\religion.dm

* code\game\objects\items\puzzle_pieces.dm

* Janitalia is a proper noun

* Fixes spelling of occurrence in code\game\objects\items\miscellaneous.dm

* fixes the spelling of nurture and fixes a title in code\game\objects\items\manuals.dm

* @cuackles can't capitalize in code\game\objects\items\holy_weapons.dm

* nobody can spell environment in code\game\objects\items\holosign_creator.dm

* code\game\objects\items\gems.dm spelling fix

* spelling fix in code\game\objects\items\cards_ids.dm

* spelling fix code\game\objects\items\airlock_painter.dm

* map object paths updated for the one letter change to an object path

* more fixes

* Revert "updates an extra m in object path in code\game\objects\structures\signs\signs_departments.dm"

This reverts commit 98cb63b396.

* Revert "map object paths updated for the one letter change to an object path"

This reverts commit f4220a3505.

* Update mecha_topic.dm

* i hate myself
This commit is contained in:
Redd
2022-11-26 10:52:14 -05:00
committed by GitHub
parent 34413dded2
commit 9d88851f02
71 changed files with 100 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/ai.dm
View File

@@ -15,7 +15,7 @@
//AI Project Categories.
#define AI_PROJECT_HUDS "Sensor HUDs"
#define AI_PROJECT_CAMERAS "Visiblity Upgrades"
#define AI_PROJECT_CAMERAS "Visibility Upgrades"
#define AI_PROJECT_INDUCTION "Induction"
#define AI_PROJECT_SURVEILLANCE "Surveillance"
#define AI_PROJECT_EFFICIENCY "Efficiency"

6
code/__DEFINES/cargo.dm
View File

@@ -41,8 +41,8 @@ GLOBAL_LIST_INIT(podstyles, list(\
list(POD_SHAPE_NORML, "darkpod", TRUE, "syndicate", "red", RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\
list(POD_SHAPE_NORML, "darkpod", TRUE, "deathsquad", "blue", RUBBLE_NORMAL, "\improper Deathsquad drop pod", "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\
list(POD_SHAPE_NORML, "pod", TRUE, "cultist", "red", RUBBLE_NORMAL, "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\
list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\
list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible."),\
list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxiliary payload hatch on the side, though manually opening it is likely impossible."),\
list(POD_SHAPE_OTHER, "box", TRUE, FALSE, FALSE, RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\
list(POD_SHAPE_NORML, "clownpod", TRUE, "clown", "green", RUBBLE_NORMAL, "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\
list(POD_SHAPE_OTHER, "orange", TRUE, FALSE, FALSE, RUBBLE_NONE, "\improper Orange", "An angry orange."),\
@@ -51,4 +51,4 @@ GLOBAL_LIST_INIT(podstyles, list(\
list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, FALSE, FALSE, "rl_click", "give_po")\
))
GLOBAL_LIST_INIT(junkmail_messages, world.file2list("strings/junkmail.txt"))
GLOBAL_LIST_INIT(junkmail_messages, world.file2list("strings/junkmail.txt"))

2
code/datums/action.dm
View File

@@ -564,7 +564,7 @@
I.attack_self(owner)
else
if (owner.get_num_arms() <= 0)
to_chat(owner, span_warning("You dont have any usable hands!"))
to_chat(owner, span_warning("You don't have any usable hands!"))
else
to_chat(owner, span_warning("Your hands are full!"))

2
code/datums/components/religious_tool.dm
View File

@@ -145,5 +145,5 @@
if(!easy_access_sect.rites_list)
return //if we dont have rites it doesnt do us much good if the object can be used to invoke them!
if(operation_flags & RELIGION_TOOL_INVOKE)
examine_list += "List of available Rites:"
examine_list += "List of available rites:"
examine_list += easy_access_sect.rites_list

2
code/datums/diseases/advance/symptoms/fire.dm
View File

@@ -104,7 +104,7 @@ Bonus
/datum/symptom/alkali
name = "Alkali perspiration"
desc = "The virus attaches to sudoriparous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation."
desc = "The virus attaches to sudoriferous glands, synthesizing a chemical that bursts into flames when reacting with water, leading to self-immolation."
stealth = 2
resistance = -2
stage_speed = -2

2
code/datums/diseases/advance/symptoms/flesh_eating.dm
View File

@@ -14,7 +14,7 @@ Bonus
/datum/symptom/flesh_eating
name = "Necrotizing Fasciitis"
desc = "The virus aggressively attacks body cells, necrotizing tissues and organs."
desc = "The virus aggressively attacks body cells, necrosing tissues and organs."
stealth = -3
resistance = -4
stage_speed = 0

2
code/datums/diseases/advance/symptoms/itching.dm
View File

@@ -31,7 +31,7 @@ BONUS
var/scratch = FALSE
threshold_descs = list(
"Transmission 6" = "Increases frequency of itching.",
"Stage Speed 7" = "The host will scrath itself when itching, causing superficial damage.",
"Stage Speed 7" = "The host will scratch itself when itching, causing superficial damage.",
)
/datum/symptom/itching/Start(datum/disease/advance/A)

2
code/datums/diseases/brainrot.dm
View File

@@ -8,7 +8,7 @@
agent = "Cryptococcus Cosmosis"
viable_mobtypes = list(/mob/living/carbon/human)
cure_chance = 15//higher chance to cure, since two reagents are required
desc = "This disease destroys the braincells, causing brain fever, brain necrosis and general intoxication."
desc = "This disease destroys the brain's cells, causing brain fever, brain necrosis and general intoxication."
required_organs = list(/obj/item/organ/brain)
severity = DISEASE_SEVERITY_HARMFUL

2
code/datums/diseases/parrotpossession.dm
View File

@@ -7,7 +7,7 @@
cure_text = "Holy Water."
cures = list(/datum/reagent/water/holywater)
cure_chance = 20
agent = "Avian Vengence"
agent = "Avian Vengeance"
viable_mobtypes = list(/mob/living/carbon/human)
desc = "Subject is possessed by the vengeful spirit of a parrot. Call the priest."
severity = DISEASE_SEVERITY_MEDIUM

2
code/datums/diseases/wizarditis.dm
View File

@@ -9,7 +9,7 @@
viable_mobtypes = list(/mob/living/carbon/human)
disease_flags = CAN_CARRY|CAN_RESIST|CURABLE
permeability_mod = 0.75
desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, humanlike, condition."
desc = "Some speculate that this virus is the cause of the Space Wizard Federation's existence. Subjects affected show the signs of mental retardation, yelling obscure sentences or total gibberish. On late stages subjects sometime express the feelings of inner power, and, cite, 'the ability to control the forces of cosmos themselves!' A gulp of strong, manly spirits usually reverts them to normal, human-like condition."
severity = DISEASE_SEVERITY_HARMFUL
required_organs = list(/obj/item/bodypart/head)

2
code/datums/ert.dm
View File

@@ -37,7 +37,7 @@
opendoors = FALSE
code = "Blue"
rename_team = "Peacekeeping Force"
mission = "Enforce space law. Occupy the station. Minimize crew casulties."
mission = "Enforce space law. Occupy the station. Minimize crew casualties."
polldesc = "the Peacekeeping Force"
teamsize = 5 // redundant but keeping this here for clarity
leader_role = /datum/antagonist/ert/occupying/commander

2
code/datums/martial/cqc.dm
View File

@@ -341,7 +341,7 @@
to_chat(usr, "[span_notice("Slam")]: Grab Harm. Slam opponent into the ground, knocking them down and dealing decent stamina damage.")
to_chat(usr, "[span_notice("CQC Kick")]: Disarm Harm. Knocks opponent away and slows them. Deals heavy stamina damage to prone opponents, as well as muting them for a short time.")
to_chat(usr, "[span_notice("Restrain")]: Grab Grab. Locks opponents into a restraining position, making your grab harder to break out of. Disarm to begin a chokehold which deal gradual oxygen damage until the opponent is unconscious, with the damage increasing based on their stamina damage. Failing to complete the chokehold will weaken and possibly break your grab.")
to_chat(usr, "[span_notice("Pressure")]: Disarm Grab. Disables the targetted limb or a random limb if the head or chest are targetted, as well as forcing the target to drop anything they are holding.")
to_chat(usr, "[span_notice("Pressure")]: Disarm Grab. Disables the targeted limb or a random limb if the head or chest are targeted, as well as forcing the target to drop anything they are holding.")
to_chat(usr, "[span_notice("Consecutive CQC")]: Harm Harm Harm Harm Harm. Offensive move, deals bonus stamina damage and knocking down on the last hit.")
to_chat(usr, "<b><i>In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to counter attacks done to you. Beware, counter-attacks are tiring and you won't be able to defend yourself forever!</i></b>")

2
code/datums/martial/flying_fang.dm
View File

@@ -249,7 +249,7 @@
to_chat(usr, "[span_notice("Tail Slap")]: Disarm Disarm Disarm. High armor piercing attack that causes a short slow followed by a knockdown. Deals heavy stamina damage.")
to_chat(usr, "[span_notice("Neck Bite")]: Grab Harm. Target must be prone. Stuns you and your target for a short period, dealing heavy brute damage and bleeding. If the target is not in crit, this attack will heal you.")
to_chat(usr, "<spna class='notice'>Leap</span>: Action: Jump at a target, with a successful hit stunning them and preventing you from moving for a few seconds.")
to_chat(usr, "[span_notice("Leap")]: Action: Jump at a target, with a successful hit stunning them and preventing you from moving for a few seconds.")
/datum/martial_art/flyingfang/teach(mob/living/carbon/human/H,make_temporary=0)
..()

2
code/datums/mutations/antenna.dm
View File

@@ -51,7 +51,7 @@
/obj/effect/proc_holder/spell/targeted/mindread/cast(list/targets, mob/living/carbon/human/user = usr)
for(var/mob/living/M in targets)
if(usr.anti_magic_check(FALSE, FALSE, TRUE, 0) || M.anti_magic_check(FALSE, FALSE, TRUE, 0))
to_chat(usr, span_warning("As you reach out with your mind, you're suddenly stopped by a vision of a massive tinfoil wall that streches beyond visible range. It seems you've been foiled."))
to_chat(usr, span_warning("As you reach out with your mind, you're suddenly stopped by a vision of a massive tinfoil wall that stretches beyond visible range. It seems you've been foiled."))
return
if(M.stat == DEAD)
to_chat(user, span_boldnotice("[M] is dead!"))

2
code/datums/mutations/hulk.dm
View File

@@ -48,7 +48,7 @@
/datum/mutation/human/genetics_hulk
name = "Hulk"
desc = "A seemingly dormant genome, but reacts violently to aggitation."
desc = "A seemingly dormant genome, but reacts violently to agitation."
difficulty = 16
instability = 50
class = MUT_OTHER

2
code/datums/mutations/sight.dm
View File

@@ -36,7 +36,7 @@
/datum/mutation/human/thermal
name = "Thermal Vision"
desc = "The user of this genome can visually percieve the unique human thermal signature."
desc = "The user of this genome can visually perceive the unique human thermal signature."
quality = POSITIVE
difficulty = 18
text_gain_indication = span_notice("You can see the heat rising off of your skin...")

2
code/datums/ruins/lavaland.dm
View File

@@ -364,7 +364,7 @@
/datum/map_template/ruin/lavaland/ntsurveyor
name = "Nanotrasen Surveyor"
id = "ntsurveyo"
description = "The most tragic part about it all is the ship didnt even have any donuts"
description = "The most tragic part about it all is the ship didn't even have any donuts"
suffix = "lavaland_surface_ntsurveyor.dmm"
cost = 5
allow_duplicates = FALSE

8
code/datums/ruins/space.dm
View File

@@ -9,7 +9,7 @@
id = "zoo"
suffix = "abandonedzoo.dmm"
name = "Biological Storage Facility"
description = "In case society crumbles, we will be able to restore our zoos to working order with the breeding stock kept in these 100% secure and unbreachable storage facilities. \
description = "In case society crumbles, we will be able to restore our zoos to working order with the breeding stock kept in these 100% secure and impenetrable storage facilities. \
At no point has anything escaped. That's our story, and we're sticking to it."
/datum/map_template/ruin/space/asteroid1
@@ -55,7 +55,7 @@
id = "bigderelict1"
suffix = "bigderelict1.dmm"
name = "Derelict Tradepost"
description = "A once-bustling tradestation that handled imports and exports from nearby stations now lays eerily dormant. \
description = "A once-bustling trade station that handled imports and exports from nearby stations now lays eerily dormant. \
The last received message was a distress call from one of the on-board officers, but we had no success in making contact again."
/datum/map_template/ruin/space/derelict1
@@ -149,7 +149,7 @@
suffix = "spacehotel.dmm"
unpickable = TRUE
name = "The Twin-Nexus Hotel"
description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably."
description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residential staff will not murder them in their sleep. Probably."
/datum/map_template/ruin/space/turreted_outpost
id = "turreted-outpost"
@@ -275,7 +275,7 @@
id = "meow"
suffix = "mrow_thats_right.dmm"
name = "Feline-Human Combination Den"
description = "With heated debates over the legality of the catperson and their status in the workforce, there's always a place for the blackmarket to slip in for some cash. Whether the results \
description = "With heated debates over the legality of the catperson and their status in the workforce, there's always a place for the black market to slip in for some cash. Whether the results \
are morally sound or not is another issue entirely."
/datum/map_template/ruin/space/cloning_facility

4
code/datums/shuttles.dm
View File

@@ -263,7 +263,7 @@
/datum/map_template/shuttle/emergency/arena
suffix = "arena"
name = "The Arena"
description = "The crew must pass through an otherworldy arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle."
description = "The crew must pass through an otherworldly arena to board this shuttle. Expect massive casualties. The source of the Bloody Signal must be tracked down and eliminated to unlock this shuttle."
admin_notes = "RIP AND TEAR."
credit_cost = 10000
emag_buy = TRUE
@@ -392,7 +392,7 @@
/datum/map_template/shuttle/emergency/rollerdome
suffix = "rollerdome"
name = "Uncle Pete's Rollerdome"
description = "Created by a freak accident in which a member of the NT Temporal Discovery Division accidently warped a building from the past into our second Disco Inferno shuttle. \
description = "Created by a freak accident in which a member of the NT Temporal Discovery Division accidentally warped a building from the past into our second Disco Inferno shuttle. \
It resembles a 1990s era rollerdome all the way down to the carpet texture."
admin_notes = "ONLY NINETIES KIDS REMEMBER. Uses the fun balloon and drone from the Emergency Bar."
credit_cost = 2500

2
code/datums/station_traits/negative_traits.dm
View File

@@ -30,7 +30,7 @@
trait_type = STATION_TRAIT_NEGATIVE
weight = 5
show_in_report = TRUE
report_message = "Our workers cleaned out most of the junk in the maintenace areas."
report_message = "Our workers cleaned out most of the junk in the maintenance areas."
blacklist = list(/datum/station_trait/filled_maint)
trait_to_give = STATION_TRAIT_EMPTY_MAINT

2
code/datums/station_traits/positive_traits.dm
View File

@@ -107,7 +107,7 @@
trait_type = STATION_TRAIT_POSITIVE
weight = 5
show_in_report = TRUE
report_message = "Our workers accidentaly forgot more of their personal belongings in the maintenace areas."
report_message = "Our workers accidentaly forgot more of their personal belongings in the maintenance areas."
blacklist = list(/datum/station_trait/empty_maint)
trait_to_give = STATION_TRAIT_FILLED_MAINT

6
code/datums/traits/negative.dm
View File

@@ -656,7 +656,7 @@
/datum/quirk/junkie/check_quirk(datum/preferences/prefs)
if(prefs.pref_species && (prefs.pref_species.reagent_tag == PROCESS_SYNTHETIC)) //can't lose blood if your species doesn't have any
return "You dont process normal chemicals!"
return "You don't process normal chemicals!"
return FALSE
/datum/quirk/junkie/smoker
@@ -766,7 +766,7 @@
/datum/quirk/allergic/check_quirk(datum/preferences/prefs)
if(prefs.pref_species && (prefs.pref_species.reagent_tag == PROCESS_SYNTHETIC)) //can't lose blood if your species doesn't have any
return "You dont process normal chemicals!"
return "You don't process normal chemicals!"
return FALSE
/datum/quirk/kleptomaniac
@@ -797,7 +797,7 @@
desc = "Thinking big words makes brain go hurt."
value = -2
human_only = TRUE
gain_text = "You feel your vocabularly slipping away."
gain_text = "You feel your vocabulary slipping away."
lose_text = "You regrasp the full extent of your linguistic prowess."
medical_record_text = "Patient is affected by partial loss of speech leading to a reduced vocabulary."

2
code/datums/wires/mech_fabricator.dm
View File

@@ -35,7 +35,7 @@
F.hacked = TRUE
addtimer(CALLBACK(F, /obj/machinery/mecha_part_fabricator.proc/reset, wire), 5)
if(WIRE_ZAP)
holder.visible_message(span_danger("[icon2html(F, viewers(holder))] The fabricator's hands shake and twist aggresively, grapping at limbs!"))
holder.visible_message(span_danger("[icon2html(F, viewers(holder))] The fabricator's hands shake and twist aggressively, grabbing at limbs!"))
F.wire_break(usr)
if(WIRE_SHOCK)
holder.visible_message(span_danger("[icon2html(F, viewers(holder))] The cable sparks faintly."))

2
code/datums/wounds/burns.dm
View File

@@ -177,7 +177,7 @@
if(WOUND_INFECTION_SEPTIC to INFINITY)
. += "Infection Level: <span class='deadsay'>LOSS IMMINENT</span>\n"
if(infestation > sanitization)
. += "\tSurgical debridement, antiobiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n"
. += "\tSurgical debridement, antibiotics/sterilizers, or regenerative mesh will rid infection. Paramedic UV penlights are also effective.\n"
if(flesh_damage > 0)
. += "Flesh damage detected: Application of ointment, regenerative mesh, Synthflesh, or ingestion of \"Miner's Salve\" will repair damaged flesh. Good nutrition, rest, and keeping the wound clean can also slowly repair flesh.\n"

2
code/datums/wounds/pierce.dm
View File

@@ -176,7 +176,7 @@
/datum/wound/pierce/critical
name = "Ruptured Cavity"
desc = "Patient's internal tissue and circulatory system is shredded, causing significant internal bleeding and damage to internal organs."
treat_text = "Surgical repair of puncture wound, followed by supervised resanguination."
treat_text = "Surgical repair of puncture wound, followed by supervised blood infusion."
examine_desc = "is ripped clear through, barely held together by exposed bone"
occur_text = "blasts apart, sending chunks of viscera flying in all directions"
sound_effect = 'sound/effects/wounds/pierce3.ogg'

2
code/datums/wounds/slash.dm
View File

@@ -255,7 +255,7 @@
/datum/wound/slash/critical
name = "Weeping Avulsion"
desc = "Patient's skin is completely torn open, along with significant loss of tissue. Extreme blood loss will lead to quick death without intervention."
treat_text = "Immediate bandaging and either suturing or cauterization, followed by supervised resanguination."
treat_text = "Immediate bandaging and either suturing or cauterization, followed by supervised blood infusion."
examine_desc = "is carved down to the bone, spraying blood wildly"
occur_text = "is torn open, spraying blood wildly"
sound_effect = 'sound/effects/wounds/blood3.ogg'

2
code/game/gamemodes/changeling/traitor_chan.dm
View File

@@ -80,7 +80,7 @@
/datum/game_mode/traitor/changeling/generate_report()
return "The Syndicate has started some experimental research regarding humanoid shapeshifting. There are rumors that this technology will be field tested on a Nanotrasen station \
for infiltration purposes. Be advised that support personel may also be deployed to defend these shapeshifters. Trust nobody - suspect everybody. Do not announce this to the crew, \
for infiltration purposes. Be advised that support personnel may also be deployed to defend these shapeshifters. Trust nobody - suspect everybody. Do not announce this to the crew, \
as paranoia may spread and inhibit workplace efficiency."
/datum/game_mode/traitor/changeling/trustnoone

8
code/game/gamemodes/clock_cult/clock_cult.dm
View File

@@ -323,7 +323,7 @@ Credit where due:
Here's a quick primer on what you should know here.\
<ol>\
<li>You're in a place called Reebe right now. The crew can't get here normally.</li>\
<li>In the center is your base camp, with supplies, consoles, and the Ark. In the area sorunding you is an inaccessible area that the crew can walk between \
<li>In the center is your base camp, with supplies, consoles, and the Ark. In the area surrounding you is an inaccessible area that the crew can walk between \
once they arrive (more on that later.) Everything between that space is an open area.</li>\
<li>Your job as a servant is to build fortifications and defenses to protect the Ark and your base once the Ark activates. You can do this \
however you like, but work with your allies and coordinate your efforts.</li>\
@@ -332,15 +332,15 @@ Credit where due:
crew and defend it accordingly.</li>\
</ol>\
<hr>\
Here is the layout of Reebe, from inner to outter:\
Here is the layout of Reebe, from inner to outer:\
<ul>\
<li><b>Ark Chamber:</b> Houses the Ark in the very center.</li>\
<li><b>Listening Station:</b> (Bottom Left Corner of Circle) Contains intercoms, a telecomms relay, and a list of frequencies.</li>\
<li><b>Observation Room:</b> (Bottom Right Corner of Circle) Contains six camera observers. These can be used to watch the station through its cameras, as well as to teleport down \
to most areas. To do this, use the Warp action while hovering over the tile you want to warp to.</li>\
<li><b>Infirmary:</b> (Uper Right Corner of Circle) Contains sleepers and basic medical supplies for superficial wounds. The sleepers can consume Vitality to heal any occupants. \
<li><b>Infirmary:</b> (Upper Right Corner of Circle) Contains sleepers and basic medical supplies for superficial wounds. The sleepers can consume Vitality to heal any occupants. \
This room is generally more useful during the preparation phase; when defending the Ark, scripture is more useful.</li>\
<li><b>Summoning Room:</b> (Uper Left Corner of Circle) Holds two scarabs as well as extra clockwork slabs. Also houses the eminence spire to pick an eminence as well has the herald's beacon which alows the clock cult to declare war.</li>\
<li><b>Summoning Room:</b> (Upper Left Corner of Circle) Holds two scarabs as well as extra clockwork slabs. Also houses the eminence spire to pick an eminence as well has the herald's beacon which allows the clock cult to declare war.</li>\
</ul>\
<hr>\
<h2>Things that have changed:</h2>\

2
code/game/gamemodes/cult/cult.dm
View File

@@ -217,7 +217,7 @@
anchor_target = B
SSticker.mode.anchor_bloodstone = anchor_target
anchor_target.name = "anchor bloodstone"
anchor_target.desc = "It pulses rythmetically with migrane-inducing light. Something is being reflected on every surface, something that isn't quite there..."
anchor_target.desc = "It pulses rhythmically with migraine-inducing light. Something is being reflected on every surface, something that isn't quite there..."
anchor_target.anchor = TRUE
anchor_target.max_integrity = 1200
anchor_target.obj_integrity = 1200

2
code/game/gamemodes/eldritch_cult/eldritch_cult.dm
View File

@@ -73,4 +73,4 @@
/datum/game_mode/heretics/generate_report()
return "Cybersun Industries has announced that they have successfully raided a high-security library. The library contained a very dangerous book that was \
shown to posses anomalous properties. We suspect that the book has been copied over, Stay vigilant!"
shown to possess anomalous properties. We suspect that the book has been copied over, Stay vigilant!"

2
code/game/gamemodes/hivemind/radar.dm
View File

@@ -50,7 +50,7 @@
else
scan_target = null
if(!trackable_targets_exist)
to_chat(owner, span_assimilator("The psychic energies eminating from afar have died down... for now"))
to_chat(owner, span_assimilator("The psychic energies emanating from afar have died down... for now"))
owner.remove_status_effect(STATUS_EFFECT_HIVE_RADAR)
//"Trackable" status effect

2
code/game/gamemodes/malfunction/malf.dm
View File

@@ -66,5 +66,5 @@
/datum/game_mode/malf/generate_report()
return "A [pick(list("huge electrical storm","photon emitter","meson generator","blue swirly thing"))] was recently picked up by a nearby station's sensors in your sector. \
If it came into contact with your station or electrical equipment, it may have had hazardarous and unpredictable effect. \
If it came into contact with your station or electrical equipment, it may have had hazardous and unpredictable effect. \
Closely observe any non carbon based life forms for signs of unusual behaviour, but keep this information discreet at all times due to this possibly dangerous scenario."

2
code/game/gamemodes/wizard/wizard.dm
View File

@@ -87,7 +87,7 @@
for(var/datum/mind/apprentice in apprentices)
round_credits += "<center><h2>[apprentice.name] as an eager apprentice</h2>"
if(len_before_addition == round_credits.len)
round_credits += list("<center><h2>The wizards have removed themselves from this realm of existance!</h2>", "<center><h2>We couldn't locate them!</h2>")
round_credits += list("<center><h2>The wizards have removed themselves from this realm of existence!</h2>", "<center><h2>We couldn't locate them!</h2>")
round_credits += "<br>"
round_credits += ..()

2
code/game/machinery/bounty_board.dm
View File

@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(request_list)
*/
/obj/machinery/bounty_board
name = "bounty board"
desc = "Alows you to place requests for goods and services across the station, as well as pay those who actually did it."
desc = "Allows you to place requests for goods and services across the station, as well as pay those who actually did it."
icon = 'icons/obj/terminals.dmi'
icon_state = "request_kiosk"
light_color = LIGHT_COLOR_GREEN

8
code/game/machinery/medical_kiosk.dm
View File

@@ -264,7 +264,7 @@
else if((brute_loss+fire_loss+tox_loss+oxy_loss+clone_loss) >= 20)
patient_status = "Lightly Injured"
if(pandemonium || user.hallucinating())
patient_status = pick("The only kiosk is kiosk, but is the only patient, patient?", "Breathing manually.","Constact NTOS site admin.","97% carbon, 3% natural flavoring","The ebb and flow wears us all in time.","It's Lupus. You have Lupus.","Undergoing monkey disease.")
patient_status = pick("The only kiosk is kiosk, but is the only patient, patient?", "Breathing manually.","Contact NTOS site admin.","97% carbon, 3% natural flavoring","The ebb and flow wears us all in time.","It's Lupus. You have Lupus.","Undergoing monkey disease.")
if((brain_loss) >= 100) //Brain status checks.
brain_status = "Grave brain damage detected."
@@ -276,14 +276,14 @@
brain_status = "Mild brain damage detected." //You may have a miiiild case of severe brain damage.
if(rad_sickness_value >= 1000) //
rad_sickness_status = "Patient is suffering from extreme radiation poisoning, high toxen damage expected. Suggested treatment: Repeated dosages of Pentetic Acid or high amounts of Cold Seiver and anti-toxen"
rad_sickness_status = "Patient is suffering from extreme radiation poisoning, high toxin damage expected. Suggested treatment: Repeated dosages of Pentetic Acid or high amounts of Cold Seiver and anti-toxin"
else if(rad_sickness_value >= 300)
rad_sickness_status = "Patient is suffering from alarming radiation poisoning. Suggested treatment: Take Cold Seiver or Potassium Iodine, watch the toxen levels."
rad_sickness_status = "Patient is suffering from alarming radiation poisoning. Suggested treatment: Take Cold Seiver or Potassium Iodine, watch the toxin levels."
else if(rad_sickness_value >= 100)
rad_sickness_status = "Patient has moderate radioactive signatures. Symptoms will subside in a few minutes"
if(rad_contamination_value >= 400) //
rad_contamination_status = "Patient is wearing extremely radioactive clothing. Suggested treatment: Isolation of patient and shower, remove all clothing and objects immediatly and place in a washing machine"
rad_contamination_status = "Patient is wearing extremely radioactive clothing. Suggested treatment: Isolation of patient and shower, remove all clothing and objects immediately and place in a washing machine"
else if(rad_contamination_value >= 150)
rad_contamination_status = "Patient is wearing alarming radioactive clothing. Suggested treatment: Scan for contaminated objects and wash them with soap and water"
else if(rad_contamination_value >= 50)

2
code/game/machinery/sci_bombardment.dm
View File

@@ -21,7 +21,7 @@
*/
/obj/machinery/sci_bombardment
name = "Lavaland Artillery Mainframe"
desc = "A machine consisting of Bluespace relays and a targetting mechanism, the L.A.M. tracks signals visible on nearby planetary bodies. Modern advancements to the Bluespace guidance system makes it significantly more accurate than its predecessor, the Lavaland Missile Firing Abomination Obliterator.\n"
desc = "A machine consisting of bluespace relays and a targeting mechanism, the L.A.M. tracks signals visible on nearby planetary bodies. Modern advancements to the bluespace guidance system makes it significantly more accurate than its predecessor, the Lavaland Missile Firing Abomination Obliterator.\n"
icon = 'icons/obj/machines/lam.dmi'
icon_state = "LAM_Base"
light_color = LIGHT_COLOR_PINK

2
code/game/machinery/shuttle/shuttle_heater.dm
View File

@@ -234,7 +234,7 @@
/obj/machinery/power/engine_capacitor_bank/escape_pod
name = "emergency thruster capacitor bank"
desc = "A single-use, non-rechargable, high-capacitor capacitor bank used for getting shuttles away from a location fast."
desc = "A single-use, non-rechargeable, high-capacitor capacitor bank used for getting shuttles away from a location fast."
//Starts with maximum power
stored_power = 600
//Cannot be recharged

2
code/game/machinery/stasis.dm
View File

@@ -206,7 +206,7 @@
/obj/machinery/stasis/emag_act(mob/user)
if(obj_flags & EMAGGED)
to_chat(user, span_warning("The stasis bed's safeties are already overriden!"))
to_chat(user, span_warning("The stasis bed's safeties are already overridden!"))
return
to_chat(user, span_notice("You override the stasis bed's safeties!"))
obj_flags |= EMAGGED

2
code/game/machinery/telecomms/computers/logbrowser.dm
View File

@@ -4,7 +4,7 @@
/obj/machinery/computer/telecomms/server
name = "telecommunications server monitoring console"
icon_screen = "comm_logs"
desc = "A computer dedicated to monitoring telecommuncation server logs."
desc = "A computer dedicated to monitoring telecommunication server logs."
var/screen_state = MONITOR_MAINMENU // the screen state
var/list/cached_server_list = list() // The servers located by the computer

4
code/game/mecha/combat/durand.dm
View File

@@ -14,9 +14,9 @@
/obj/mecha/combat/durand/GrantActions(mob/living/user, human_occupant = 0)
..()
defense_action.Grant(user, src)
defence_action.Grant(user, src)
/obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
..()
defense_action.Remove(user)
defence_action.Remove(user)

2
code/game/mecha/equipment/tools/medical_tools.dm
View File

@@ -483,7 +483,7 @@
if(R.can_synth && add_known_reagent(R.type,R.name))
occupant_message("Reagent analyzed, identified as [R.name] and added to database.")
send_byjax(chassis.occupant,"msyringegun.browser","reagents_form",get_reagents_form())
occupant_message("Analyzis complete.")
occupant_message("Analysis complete.")
return 1
/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/add_known_reagent(r_id,r_name)

2
code/game/mecha/mech_fabricator.dm
View File

@@ -136,7 +136,7 @@
if(I.GetID())
var/obj/item/card/id/C = I.GetID()
if(obj_flags & EMAGGED)
to_chat(user, span_warning("The authentification slot spits sparks at you and the display reads scrambled text!"))
to_chat(user, span_warning("The authentication slot spits sparks at you and the display reads scrambled text!"))
do_sparks(1, FALSE, src)
authorization_override = TRUE //just in case it wasn't already for some reason. keycard reader is busted.
return

4
code/game/mecha/mecha.dm
View File

@@ -102,7 +102,7 @@
var/datum/action/innate/mecha/mech_toggle_lights/lights_action = new
var/datum/action/innate/mecha/mech_view_stats/stats_action = new
var/datum/action/innate/mecha/mech_toggle_thrusters/thrusters_action = new
var/datum/action/innate/mecha/mech_defence_mode/defense_action = new
var/datum/action/innate/mecha/mech_defence_mode/defence_action = new
var/datum/action/innate/mecha/mech_overload_mode/overload_action = new
var/datum/effect_system/smoke_spread/smoke_system = new //not an action, but trigged by one
var/datum/action/innate/mecha/mech_smoke/smoke_action = new
@@ -219,7 +219,7 @@
equipment_disabled = FALSE
if(occupant)
SEND_SOUND(occupant, sound('sound/items/timer.ogg', volume=50))
to_chat(occupant, "<span=notice>Equipment control unit has been rebooted successfuly.</span>")
to_chat(occupant, "<span=notice>Equipment control unit has been rebooted successfully.</span>")
occupant.update_mouse_pointer()
/obj/mecha/CheckParts(list/parts_list)

4
code/game/mecha/mecha_actions.dm
View File

@@ -173,7 +173,7 @@
/datum/action/innate/mecha/mech_defence_mode
name = "Toggle Defence Mode"
button_icon_state = "mech_defense_mode_off"
button_icon_state = "mech_defence_mode_off"
/datum/action/innate/mecha/mech_defence_mode/Activate(forced_state = null)
if(!owner || !chassis || chassis.occupant != owner)
@@ -182,7 +182,7 @@
chassis.defence_mode = forced_state
else
chassis.defence_mode = !chassis.defence_mode
button_icon_state = "mech_defense_mode_[chassis.defence_mode ? "on" : "off"]"
button_icon_state = "mech_defence_mode_[chassis.defence_mode ? "on" : "off"]"
if(chassis.defence_mode)
chassis.deflect_chance += chassis.defence_mode_deflect_chance
chassis.occupant_message(span_notice("You enable [chassis] defence mode."))

2
code/game/mecha/mecha_topic.dm
View File

@@ -101,7 +101,7 @@
<b>Environment temperature: </b> [environment_temperature]&deg;K|[environment_temperature - T0C]&deg;C<br>
[dna_lock?"<b>DNA-locked:</b><br> <span style='font-size:10px;letter-spacing:-1px;'>[dna_lock]</span> \[<a href='?src=[REF(src)];reset_dna=1'>Reset</a>\]<br>":""]<br>
[thrusters_action.owner ? "<b>Thrusters: </b> [thrusters_active ? "Enabled" : "Disabled"]<br>" : ""]
[defense_action.owner ? "<b>Defence Mode: </b> [defence_mode ? "Enabled" : "Disabled"]<br>" : ""]
[defence_action.owner ? "<b>Defence Mode: </b> [defence_mode ? "Enabled" : "Disabled"]<br>" : ""]
[overload_action.owner ? "<b>Leg Actuators Overload: </b> [leg_overload_mode ? "Enabled" : "Disabled"]<br>" : ""]
[smoke_action.owner ? "<b>Smoke: </b> [smoke]<br>" : ""]
[zoom_action.owner ? "<b>Zoom: </b> [zoom_mode ? "Enabled" : "Disabled"]<br>" : ""]

2
code/game/objects/items/airlock_painter.dm
View File

@@ -152,7 +152,7 @@
/obj/item/airlock_painter/decal
name = "decal painter"
desc = "An airlock painter, reprogramed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Alt-Click to take out toner."
desc = "An airlock painter, reprogrammed to use a different style of paint in order to apply decals for floor tiles as well, in addition to repainting doors. Decals break when the floor tiles are removed. Alt-Click to take out toner."
icon = 'icons/obj/objects.dmi'
icon_state = "decal_sprayer"
item_state = "decal_sprayer"

2
code/game/objects/items/cards_ids.dm
View File

@@ -53,7 +53,7 @@
icon_state = "data_2"
/obj/item/card/data/disk
desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one inexplicibly looks like a floppy disk."
desc = "A plastic magstripe card for simple and speedy data storage and transfer. This one inexplicably looks like a floppy disk."
icon_state = "data_3"
/*

2
code/game/objects/items/gems.dm
View File

@@ -142,7 +142,7 @@
/obj/item/gem/bloodstone
name = "\improper Ichorium"
desc = "A weird, sticky substance, known to coalesce in the presence of otherwordly phenomena. While shunned by most spiritual groups, this gemstone has unique ties to the occult which find it handsomely valued by mysterious patrons."
desc = "A weird, sticky substance, known to coalesce in the presence of otherworldly phenomena. While shunned by most spiritual groups, this gemstone has unique ties to the occult which find it handsomely valued by mysterious patrons."
icon_state = "red"
point_value = 2000
light_range = 2

2
code/game/objects/items/grenades/chem_grenade.dm
View File

@@ -551,7 +551,7 @@
/obj/item/grenade/chem_grenade/bioterrorfoam
name = "Bio terror foam grenade"
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
desc = "Tiger Cooperative chemical foam grenade. Causes temporary irritation, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
stage = GRENADE_READY
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize()

2
code/game/objects/items/holosign_creator.dm
View File

@@ -100,7 +100,7 @@
/obj/item/holosign_creator/firstaid
name = "medical holobed projector"
desc = "A holographic projector that creates first aid holobeds that slows the metabolism of those laying on it and provides a sterile enviroment for surgery."
desc = "A holographic projector that creates first aid holobeds that slows the metabolism of those laying on it and provides a sterile environment for surgery."
icon_state = "signmaker_firstaid"
holosign_type = /obj/structure/holobed
creation_time = 1 SECONDS

2
code/game/objects/items/holy_weapons.dm
View File

@@ -845,7 +845,7 @@
H.remove_hud_from(user)
/obj/item/nullrod/servoskull
name = "servitor skull"
desc = "Even in death, i still serve"
desc = "Even in death, I still serve"
icon = 'icons/obj/clothing/neck.dmi'
slot_flags = ITEM_SLOT_NECK
icon_state = "servoskull"

4
code/game/objects/items/implants/implant_greytide.dm
View File

@@ -36,14 +36,14 @@
to_chat(holder, span_warning("[target] seems to resist the implant!"))
return FALSE
to_chat(target, span_userdanger("<FONT size = 3>You feel a strong urge to break everything. You feel a strong loyalty to [holder.real_name] and your assistant brothers. You want to break into everything, but harming others isnt something you will do.</FONT>"))
to_chat(target, span_userdanger("<FONT size = 3>You feel a strong urge to break everything. You feel a strong loyalty to [holder.real_name] and your assistant brothers. You want to break into everything, but harming others isn't something you will do.</FONT>"))
var/datum/antagonist/greytide/GT = new
target.mind.add_antag_datum(GT)
GT.master = user
var/datum/objective/greytide/new_objective = new /datum/objective/greytide
GT.objectives += new_objective
new_objective.explanation_text = "Never betray [holder.real_name] or abandon your assistant brothers! Remember not to harm other's "
new_objective.explanation_text = "Never betray [holder.real_name] or abandon your assistant brothers! Remember not to harm others "
ADD_TRAIT(target, TRAIT_PACIFISM, "Greytide Implant")
message_admins("[target.ckey] was implanted by with greytide implant ")

6
code/game/objects/items/manuals.dm
View File

@@ -240,7 +240,7 @@
Every plant we are blessed with can be used in some way.
All are not dangerous when consumed in moderation, save for mushroom caps.
All may be fermented and brewed into substances that induce a woozy and feel-good high.
Cacti fruit is rich in juices that will nurtur and heal your body.
Cacti fruit is rich in juices that will nurture and heal your body.
Polypore shavings are tough and can be used for crafts such as bowls and wood substitute, and contain a higher than average resin content.
Porcini leaves contain a similar content to cacti fruit along with a substance that increases brain focus.
Inocybe caps contain deadly toxins in their raw state, but with ash and heat can be neutralized to instead detox the body.
@@ -380,10 +380,10 @@
page_link = "Infections"
/obj/item/book/manual/wiki/telescience
name = "Teleportation Science - Bluespace for dummies!"
name = "Teleportation Science - Bluespace for Dummies!"
icon_state = "book7"
author = "University of Bluespace"
title = "Teleportation Science - Bluespace for dummies!"
title = "Teleportation Science - Bluespace for Dummies!"
page_link = "Guide_to_telescience"
/obj/item/book/manual/wiki/engineering_hacking

4
code/game/objects/items/miscellaneous.dm
View File

@@ -14,7 +14,7 @@
/obj/item/choice_beacon
name = "choice beacon"
desc = "Hey, why are you viewing this?!! Please let Centcom know about this odd occurance."
desc = "Hey, why are you viewing this?!! Please let Centcom know about this odd occurrence."
icon = 'icons/obj/device.dmi'
icon_state = "gangtool-blue"
item_state = "radio"
@@ -183,7 +183,7 @@
var/obj/item/organ/brain/BR = H.getorgan(/obj/item/organ/brain)
if(BR)
if(BR.suicided || BR.brainmob?.suiciding)
to_chat(user, span_warning("This units personality matrix is gone."))
to_chat(user, span_warning("This unit's personality matrix is gone."))
return TRUE
if(H.health < 0)
to_chat(user, span_warning("You have to repair the IPC before using this module!"))

2
code/game/objects/items/mop.dm
View File

@@ -1,5 +1,5 @@
/obj/item/mop
desc = "The world of janitalia wouldn't be complete without a mop."
desc = "The world of Janitalia wouldn't be complete without a mop."
name = "mop"
icon = 'yogstation/icons/obj/janitor.dmi'
icon_state = "mop"

2
code/game/objects/items/puzzle_pieces.dm
View File

@@ -40,7 +40,7 @@
/obj/machinery/door/keycard
name = "locked door"
desc = "This door only opens when a keycard is swiped. It looks virtually indestructable."
desc = "This door only opens when a keycard is swiped. It looks virtually indestructible."
icon = 'icons/obj/doors/puzzledoor/default.dmi'
icon_state = "door_closed"
explosion_block = 3

2
code/game/objects/items/religion.dm
View File

@@ -195,7 +195,7 @@
/obj/item/banner/command
name = "command banner"
desc = "The banner of Command, a staunch and ancient line of bueraucratic kings and queens."
desc = "The banner of Command, a staunch and ancient line of bureaucratic kings and queens."
//No icon state here since the default one is the NT banner
job_loyalties = list("Captain", "Head of Personnel", "Chief Engineer", "Head of Security", "Research Director", "Chief Medical Officer")
warcry = "Hail Nanotrasen!"

2
code/game/objects/items/robot/robot_parts.dm
View File

@@ -317,7 +317,7 @@
O.lawupdate = 0
if(M.laws.id == DEFAULT_AI_LAWID)
O.make_laws()
to_chat(user,span_warning("Any laws uploaded to this MMI have not been transfered!"))
to_chat(user,span_warning("Any laws uploaded to this MMI have not been transferred!"))
SSticker.mode.remove_antag_for_borging(BM.mind)
if(!istype(M.laws, /datum/ai_laws/ratvar))

2
code/game/objects/items/sharpener.dm
View File

@@ -52,7 +52,7 @@
/obj/item/sharpener/super
name = "super whetstone"
desc = "A block that will make your weapon sharper than Einstein on adderall."
desc = "A block that will make your weapon sharper than Einstein on Adderall."
increment = 200
max = 200
prefix = "super-sharpened"

8
code/game/objects/items/storage/lockbox.dm
View File

@@ -233,7 +233,7 @@
//Yogs: Vial Holder
/obj/item/storage/lockbox/vialbox
name = "vial box"
desc = "A small box that can hold up to six vials in a sealed enviroment."
desc = "A small box that can hold up to six vials in a sealed environment."
icon = 'icons/obj/vial_box.dmi'
w_class = WEIGHT_CLASS_SMALL
icon_state = "vialbox"
@@ -295,7 +295,7 @@
/obj/item/storage/lockbox/vialbox/hypo_deluxe
name = "deluxe hypospray vial box"
desc = "A small box that can hold up to six vials in a sealed enviroment. This one contains a plethora of different vials for various medical ailments, designed for use in a deluxe hypospray."
desc = "A small box that can hold up to six vials in a sealed environment. This one contains a plethora of different vials for various medical ailments, designed for use in a deluxe hypospray."
req_access = list(ACCESS_MEDICAL)
/obj/item/storage/lockbox/vialbox/hypo_deluxe/PopulateContents()
@@ -308,7 +308,7 @@
/obj/item/storage/lockbox/vialbox/virology
name = "virology vial box"
desc = "A small box that can hold up to six vials in a sealed enviroment. This one requires virology access to open."
desc = "A small box that can hold up to six vials in a sealed environment. This one requires virology access to open."
req_access = list(ACCESS_MEDICAL)
/obj/item/storage/lockbox/vialbox/virology/PopulateContents()
@@ -319,7 +319,7 @@
/obj/item/storage/lockbox/vialbox/blood
name = "blood sample box"
desc = "A small box that can hold up to six vials in a sealed enviroment. This one is intended to store blood."
desc = "A small box that can hold up to six vials in a sealed environment. This one is intended to store blood."
/obj/item/storage/lockbox/vialbox/blood/PopulateContents()
for(var/i in 1 to 6)

2
code/game/objects/items/supermatter_delaminator.dm
View File

@@ -8,7 +8,7 @@
<li>Physical contact of any object with the antinoblium shard will fracture the shard and cause a spontaneous energy release.</li>\
<li>Extricate yourself immediately. You have approximately 5 minutes before the infrastructure fails completely.</li>\
<li>Upon complete infrastructure failure, the crystal well will destabilize and emit electromagnetic waves that span the entire station.</li>\
<li>Nanotresen safety controls will announce the destabilization of the crystal. Your identity will likely be compromised, but nothing can be done about the crystal.</li>\
<li>Nanotrasen safety controls will announce the destabilization of the crystal. Your identity will likely be compromised, but nothing can be done about the crystal.</li>\
</ul>"
/obj/item/supermatter_delaminator/Initialize()

2
code/game/objects/items/toys.dm
View File

@@ -231,7 +231,7 @@
/obj/item/toy/ammo/gun
name = "capgun ammo"
desc = "Make sure to recyle the box in an autolathe when it gets empty."
desc = "Make sure to recycle the box in an autolathe when it gets empty."
icon = 'icons/obj/ammo.dmi'
icon_state = "357OLD-7"
w_class = WEIGHT_CLASS_TINY

2
code/game/objects/items/twohanded.dm
View File

@@ -281,7 +281,7 @@
/obj/item/twohanded/fireaxe/metal_h2_axe // Blatant imitation of the fireaxe, but made out of metallic hydrogen
icon_state = "metalh2_axe0"
name = "metallic hydrogen axe"
desc = "A large, menacing axe made of an unknown substance that the most elder atmosians call Metallic Hydrogen. Truly an otherwordly weapon."
desc = "A large, menacing axe made of an unknown substance that the most elder atmosians call Metallic Hydrogen. Truly an otherworldly weapon."
force_wielded = 18
/obj/item/twohanded/fireaxe/metal_h2_axe/update_icon() //Currently only here to fuck with the on-mob icons.

2
code/game/objects/structures/barsigns.dm
View File

@@ -197,7 +197,7 @@
/datum/barsign/slipperyshots
name = "Slippery Shots"
icon = "slipperyshots"
desc = "Slippery slope to drunkeness with our shots!"
desc = "Slippery slope to drunkenness with our shots!"
/datum/barsign/thegreytide
name = "The Grey Tide"

2
code/game/objects/structures/crates_lockers/closets/bodybag.dm
View File

@@ -267,7 +267,7 @@
if(!sinched)
for(var/mob/living/target in contents)
to_chat(target, span_userdanger("You feel the lining of [src] tighten around you! Soon, you won't be able to escape!"))
user.visible_message(span_notice("You begin sinching down the buckles on [src]."))
user.visible_message(span_notice("You begin cinching down the buckles on [src]."))
if(!(do_after(user, (sinch_time), src)))
return
sinched = !sinched

2
code/game/objects/structures/crates_lockers/closets/job_closets.dm
View File

@@ -26,7 +26,7 @@
/obj/structure/closet/chefcloset
name = "\proper chef's closet"
desc = "It's a storage unit for foodservice garments and mouse traps."
desc = "It's a storage unit for food service garments and mouse traps."
icon_door = "black"
/obj/structure/closet/chefcloset/PopulateContents()

2
code/game/objects/structures/holosign.dm
View File

@@ -167,7 +167,7 @@
/obj/structure/holobed
name = "holobed"
desc = "A first aid holobeds that slow down the metabolism of those laying on it and provides a sterile enviroment for surgery."
desc = "A first aid holobeds that slow down the metabolism of those laying on it and provides a sterile environment for surgery."
icon = 'icons/obj/surgery.dmi'
icon_state = "opmat_holo"
anchored = TRUE

2
code/game/objects/structures/morgue.dm
View File

@@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(crematoriums)
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people
/obj/structure/bodycontainer/crematorium/creamatorium
name = "creamatorium"
name = "crematorium"
desc = "A human incinerator. Works well during ice cream socials."
/obj/structure/bodycontainer/crematorium/creamatorium/cremate(mob/user)

2
code/modules/mob/living/brain/brain_item.dm
View File

@@ -252,7 +252,7 @@
slot = "brain"
zone = "chest"
status = ORGAN_ROBOTIC
desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. It has an IPC serial number engraved on the top. In order for this Posibrain to be used as a newly built Positronic Brain, it must be coupled with an MMI."
desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. It has an IPC serial number engraved on the top. In order for this posibrain to be used as a newly built Positronic Brain, it must be coupled with an MMI."
icon = 'icons/obj/assemblies.dmi'
icon_state = "posibrain-ipc"
organ_flags = ORGAN_SYNTHETIC

12
code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
View File

@@ -32,7 +32,7 @@
//Vars that control when the pilot uses their mecha's abilities (if the mecha has that ability)
var/threat_use_mecha_smoke = 5 //5 mobs is enough to engage crowd control
var/defence_mode_chance = 35 //Chance to engage Defence mode when damaged
var/defence_mode_chance = 35 //Chance to engage defense mode when damaged
var/smoke_chance = 20 //Chance to deploy smoke for crowd control
var/retreat_chance = 40 //Chance to run away
@@ -226,13 +226,13 @@
if(mecha.smoke_action && mecha.smoke_action.owner && mecha.smoke)
mecha.smoke_action.Activate()
//Heavy damage - Defence Power or Retreat
//Heavy damage - defence Power or Retreat
if(mecha.obj_integrity < mecha.max_integrity*0.25)
if(prob(defence_mode_chance))
if(mecha.defense_action && mecha.defense_action.owner && !mecha.defence_mode)
if(mecha.defence_action && mecha.defence_action.owner && !mecha.defence_mode)
mecha.leg_overload_mode = 0
mecha.defense_action.Activate(TRUE)
addtimer(CALLBACK(mecha.defense_action, /datum/action/innate/mecha/mech_defence_mode.proc/Activate, FALSE), 100) //10 seconds of defence, then toggle off
mecha.defence_action.Activate(TRUE)
addtimer(CALLBACK(mecha.defence_action, /datum/action/innate/mecha/mech_defence_mode.proc/Activate, FALSE), 100) //10 seconds of defence, then toggle off
else if(prob(retreat_chance))
//Speed boost if possible
@@ -292,4 +292,4 @@
if(mecha)
walk_to(mecha, target, minimum_distance, mecha.step_in)
else
..()
..()

2
code/modules/surgery/organs/liver.dm
View File

@@ -123,7 +123,7 @@
name = "substance processor"
icon_state = "substance_processor"
attack_verb = list("processed")
desc = "A machine component, installed in the chest. This grants the Machine the ability to process chemicals that enter its systems."
desc = "A machine component, installed in the chest. This grants the machine the ability to process chemicals that enter its systems."
alcohol_tolerance = 0
toxTolerance = -1
toxLethality = 0