Skip to content

Commit

Permalink
Fixes a bunch of spelling mistakes (#5555)
Browse files Browse the repository at this point in the history
# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->
Most of the changes here are minor, mostly to comments or descriptions.
Here is the full list.

- recieve -> receive
- percieve -> perceive
- alot -> a lot
- atleast -> at least
- succesfully -> successfully
- seperate -> separate
- noticable -> noticeable
- concious -> conscious
- enviroment -> environment
- existance -> existence
- foward -> forward
- interupted -> interrupted
- independant -> independent
- guarenteed -> guaranteed
- overriden -> overridden
- occuring -> occurring
- occured -> occurred
- transciever -> transceiver
- maintenace -> maintenance

# Explain why it's good for the game
Makes it easier to read things

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Code compiles and runs

</details>


# Changelog
:cl:
spellcheck: Fixed a few uncommon typos across the entire codebase
/:cl:
  • Loading branch information
Contrabang authored Jan 28, 2024
1 parent 7acd6dd commit ee339c1
Show file tree
Hide file tree
Showing 88 changed files with 133 additions and 133 deletions.
2 changes: 1 addition & 1 deletion code/__DEFINES/lighting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(emissive_color, EMISSIVE_COLOR)
GLOBAL_LIST_INIT(em_block_color, EM_BLOCK_COLOR)
/// A set of appearance flags applied to all emissive and emissive blocker overlays.
#define EMISSIVE_APPEARANCE_FLAGS (KEEP_APART|KEEP_TOGETHER|RESET_COLOR|RESET_TRANSFORM)
/// The color matrix used to mask out emissive blockers on the emissive plane. Alpha should default to zero, be solely dependent on the RGB value of [EMISSIVE_COLOR], and be independant of the RGB value of [EM_BLOCK_COLOR].
/// The color matrix used to mask out emissive blockers on the emissive plane. Alpha should default to zero, be solely dependent on the RGB value of [EMISSIVE_COLOR], and be independent of the RGB value of [EM_BLOCK_COLOR].
#define EM_MASK_MATRIX list(0,0,0,1/3, 0,0,0,1/3, 0,0,0,1/3, 0,0,0,0, 1,1,1,0)
/// A globaly cached version of [EM_MASK_MATRIX] for quick access.
GLOBAL_LIST_INIT(em_mask_matrix, EM_MASK_MATRIX)
Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@
//! ### SS initialization hints
/**
* Negative values incidate a failure or warning of some kind, positive are good.
* 0 and 1 are unused so that TRUE and FALSE are guarenteed to be invalid values.
* 0 and 1 are unused so that TRUE and FALSE are guaranteed to be invalid values.
*/

/// Subsystem failed to initialize entirely. Print a warning, log, and disable firing.
#define SS_INIT_FAILURE -2

/// The default return value which must be overriden. Will succeed with a warning.
/// The default return value which must be overridden. Will succeed with a warning.
#define SS_INIT_NONE -1

/// Subsystem initialized sucessfully.
Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@
#define TRAIT_FOREIGN_BIO "t_foreign_bio"
/// Eye color changes on intent. (G1 Synths and WJs)
#define TRAIT_INTENT_EYES "t_intent_eyes"
/// Masked synthetic biology. Basic medHUDs will percieve the mob as human. (Infiltrator Synths)
/// Masked synthetic biology. Basic medHUDs will perceive the mob as human. (Infiltrator Synths)
#define TRAIT_INFILTRATOR_SYNTH "t_infiltrator_synth"
/// Makes it impossible to strip the inventory of this mob.
#define TRAIT_UNSTRIPPABLE "t_unstrippable"

// HIVE TRAITS
/// If the Hive is a Xenonid Hive
#define TRAIT_XENONID "t_xenonid"
/// If the Hive delays round end (this is overriden for some hives). Does not occur naturally. Must be applied in events.
/// If the Hive delays round end (this is overridden for some hives). Does not occur naturally. Must be applied in events.
#define TRAIT_NO_HIVE_DELAY "t_no_hive_delay"
/// If the Hive uses it's colors on the mobs. Does not occur naturally, excepting the Mutated hive.
#define TRAIT_NO_COLOR "t_no_color"
Expand Down
4 changes: 2 additions & 2 deletions code/__HELPERS/sorts/_Main.dm
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new())
var/count1 = 0 //# of times in a row that first run won
var/count2 = 0 // " " " " " " second run won

//do the straightfoward thin until one run starts winning consistently
//do the straightforward thin until one run starts winning consistently

do
//ASSERT(len1 > 1 && len2 > 0)
Expand Down Expand Up @@ -493,7 +493,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sortInstance, new())
var/count1 = 0 //# of times in a row that first run won
var/count2 = 0 // " " " " " " second run won

//do the straightfoward thing until one run starts winning consistently
//do the straightforward thing until one run starts winning consistently
do
//ASSERT(len1 > 0 && len2 > 1)
if(call(cmp)(fetchElement(L,cursor2), fetchElement(L,cursor1)) < 0)
Expand Down
4 changes: 2 additions & 2 deletions code/__HELPERS/unsorted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1621,8 +1621,8 @@ GLOBAL_LIST_INIT(WALLITEMS, list(
/proc/explosive_antigrief_check(obj/item/explosive/explosive, mob/user)
var/turf/Turf = get_turf(explosive)
if(!(Turf.loc.type in GLOB.explosive_antigrief_exempt_areas))
var/crash_occured = (SSticker?.mode?.is_in_endgame)
if((Turf.z in SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP, ZTRAIT_RESERVED))) && (GLOB.security_level < SEC_LEVEL_RED) && !crash_occured)
var/crash_occurred = (SSticker?.mode?.is_in_endgame)
if((Turf.z in SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP, ZTRAIT_RESERVED))) && (GLOB.security_level < SEC_LEVEL_RED) && !crash_occurred)
switch(CONFIG_GET(number/explosive_antigrief))
if(ANTIGRIEF_DISABLED)
return FALSE
Expand Down
2 changes: 1 addition & 1 deletion code/_onclick/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
var/message = "You have been dead for [DisplayTimeText(deathtime)]."
message = SPAN_WARNING("[message]")
to_chat(src, message)
to_chat(src, SPAN_WARNING("You must wait atleast 2.5 minutes before rejoining the game!"))
to_chat(src, SPAN_WARNING("You must wait at least 2.5 minutes before rejoining the game!"))
do_observe(target)
return FALSE

Expand Down
4 changes: 2 additions & 2 deletions code/_onclick/xeno.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
return UnarmedAttack(get_step(src, Get_Compass_Dir(src, A)), tile_attack = TRUE, ignores_resin = TRUE)
return FALSE

/**The parent proc, will default to UnarmedAttack behaviour unless overriden
/**The parent proc, will default to UnarmedAttack behaviour unless overridden
Return XENO_ATTACK_ACTION if it does something and the attack should have full attack delay.
Return XENO_NONCOMBAT_ACTION if it did something and should have some delay.
Return XENO_NO_DELAY_ACTION if it gave an error message or should have no delay at all, ex. "You can't X that, it's Y!"
Expand Down Expand Up @@ -131,6 +131,6 @@ so that it doesn't double up on the delays) so that it applies the delay immedia

return ..()

//Larva attack, will default to attack_alien behaviour unless overriden
//Larva attack, will default to attack_alien behaviour unless overridden
/atom/proc/attack_larva(mob/living/carbon/xenomorph/larva/user)
return attack_alien(user)
2 changes: 1 addition & 1 deletion code/controllers/mc/subsystem.dm
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
/datum/controller/subsystem/proc/OnConfigLoad()

/**
* Used to initialize the subsystem. This is expected to be overriden by subtypes.
* Used to initialize the subsystem. This is expected to be overridden by subtypes.
*/
/datum/controller/subsystem/Initialize()
return SS_INIT_NONE
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystem/atoms.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(atoms)
flags = SS_NO_FIRE

var/old_initialized
/// A count of how many initalize changes we've made. We want to prevent old_initialize being overriden by some other value, breaking init code
/// A count of how many initalize changes we've made. We want to prevent old_initialize being overridden by some other value, breaking init code
var/initialized_changed = 0
var/init_start_time
var/processing_late_loaders = FALSE
Expand Down Expand Up @@ -183,7 +183,7 @@ SUBSYSTEM_DEF(atoms)
/datum/controller/subsystem/atoms/proc/map_loader_stop()
clear_tracked_initalize()

/// Use this to set initialized to prevent error states where old_initialized is overriden. It keeps happening and it's cheesing me off
/// Use this to set initialized to prevent error states where old_initialized is overridden. It keeps happening and it's cheesing me off
/datum/controller/subsystem/atoms/proc/set_tracked_initalized(value)
if(!initialized_changed)
old_initialized = initialized
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/decorator.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// our atom declaration should not be hardcoded for this SS existance.
// our atom declaration should not be hardcoded for this SS existence.
// if this subsystem is deleted, stuff still works
// That's why we define this here
/atom/proc/Decorate(deferable = FALSE)
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SUBSYSTEM_DEF(events)
var/list/running = list()
var/list/currentrun = list()

///The next world.time that a naturally occuring random event can be selected.
///The next world.time that a naturally occurring random event can be selected.
var/scheduled = 0
///Lower bound for how frequently events will occur
var/frequency_lower = 5 MINUTES
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ SUBSYSTEM_DEF(minimaps)
* the raw lists are to speed up the Fire() of the subsystem so we dont have to filter through
* WARNING!
* There is a byond bug: http://www.byond.com/forum/post/2661309
* That that forces us to use a seperate list ref when accessing the lists of this datum
* That that forces us to use a separate list ref when accessing the lists of this datum
* Yea it hurts me too
*/
/datum/hud_displays
Expand Down
2 changes: 1 addition & 1 deletion code/datums/autocells/explosion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
That's it. There are some special rules, though, namely:
* If the explosion occured in a wall, the wave is strengthened
* If the explosion occurred in a wall, the wave is strengthened
with power *= reflection_multiplier and reflected back in the
direction it came from
Expand Down
2 changes: 1 addition & 1 deletion code/datums/components/connect_mob_behalf.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// This component behaves similar to connect_loc_behalf, but working off clients and mobs instead of loc
/// To be clear, we hook into a signal on a tracked client's mob
/// We retain the ability to react to that signal on a seperate listener, which makes this quite powerful
/// We retain the ability to react to that signal on a separate listener, which makes this quite powerful
/datum/component/connect_mob_behalf
dupe_mode = COMPONENT_DUPE_UNIQUE

Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/cough.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Coughing
Noticable.
Noticeable.
Little Resistance.
Doesn't increase stage speed much.
Transmittable.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/hallucigen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Hallucigen
Very noticable.
Very noticeable.
Lowers resistance considerably.
Decreases stage speed.
Reduced transmittable.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/headache.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Headache
Noticable.
Noticeable.
Highly resistant.
Increases stage speed.
Not transmittable.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/itching.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Itching
Not noticable or unnoticable.
Not noticeable or unnoticeable.
Resistant.
Increases stage speed.
Little transmittable.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/sneeze.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Sneezing
Very Noticable.
Very Noticeable.
Increases resistance.
Doesn't increase stage speed.
Very transmittable.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/voice_change.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Voice Change
Very Very noticable.
Very Very noticeable.
Lowers resistance considerably.
Decreases stage speed.
Reduced transmittable.
Expand Down
4 changes: 2 additions & 2 deletions code/datums/diseases/advance/symptoms/vomit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Vomiting
Very Very Noticable.
Very Very Noticeable.
Decreases resistance.
Doesn't increase stage speed.
Little transmittable.
Expand Down Expand Up @@ -51,7 +51,7 @@ Bonus
Vomiting Blood
Very Very Noticable.
Very Very Noticeable.
Decreases resistance.
Decreases stage speed.
Little transmittable.
Expand Down
6 changes: 3 additions & 3 deletions code/datums/diseases/advance/symptoms/weight.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Weight Gain
Very Very Noticable.
Very Very Noticeable.
Decreases resistance.
Decreases stage speed.
Reduced transmittable.
Expand Down Expand Up @@ -43,7 +43,7 @@ Bonus
Weight Loss
Very Very Noticable.
Very Very Noticeable.
Decreases resistance.
Decreases stage speed.
Reduced Transmittable.
Expand Down Expand Up @@ -84,7 +84,7 @@ Bonus
Weight Even
Very Noticable.
Very Noticeable.
Decreases resistance.
Decreases stage speed.
Reduced transmittable.
Expand Down
2 changes: 1 addition & 1 deletion code/datums/map_config.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@

var/nightmare_path

/// If truthy this is config for a round overriden map: search for override maps in data/, instead of using a path in maps/
/// If truthy this is config for a round overridden map: search for override maps in data/, instead of using a path in maps/
var/override_map

/datum/map_config/New()
Expand Down
2 changes: 1 addition & 1 deletion code/datums/redis/callbacks/_redis_callback.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* * message - The message received on the redis channel.
*/
/datum/redis_callback/proc/on_message(message)
CRASH("on_message not overriden for [type]!")
CRASH("on_message not overridden for [type]!")

/datum/redis_callback/vv_edit_var(var_name, var_value)
return FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/datums/status_effects/stacking_effect.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/// How many stacks are currently accumulated.
/// Also, the default stacks number given on application.
var/stacks = 0
// Deciseconds until ticks start occuring, which removes stacks
// Deciseconds until ticks start occurring, which removes stacks
/// (first stack will be removed at this time plus tick_interval)
var/delay_before_decay
/// How many stacks are lost per tick (decay trigger)
Expand Down Expand Up @@ -74,7 +74,7 @@
return FALSE
stacks += stacks_added
if(stacks > 0)
if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occuring if changing from above threshold to still above threshold
if(stacks >= stack_threshold && !threshold_crossed) //threshold_crossed check prevents threshold effect from occurring if changing from above threshold to still above threshold
threshold_crossed = TRUE
on_threshold_cross()
if(consumed_on_threshold)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/supply_packs/black_market.dm
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
. = ..()
var/obj/item/paper/nope = new(src)
nope.name = "automated ASRS note"
nope.info = "Sorry! Your requested order of <b>USCM PONCHO (X2)</b> was not succesfully delivered because: 'No items of that type found in storage.'"
nope.info = "Sorry! Your requested order of <b>USCM PONCHO (X2)</b> was not successfully delivered because: 'No items of that type found in storage.'"
nope.color = "green"
nope.update_icon()

Expand All @@ -656,7 +656,7 @@ USCM spare items, miscellaneous gear that's too niche and distant (or restricted
. = ..()
var/obj/item/paper/nope = new(src)
nope.name = "automated ASRS note"
nope.info = "Sorry! Your requested order of <b> HIGH-EXPLOSIVE ARMOR-PIERCING M41A MAGAZINE (X3)</b> was not succesfully delivered because: 'ERROR: UNABLE TO ENTER COMPARTMENT EXIT CODE 2342: EXPLOSION HAZARD'"
nope.info = "Sorry! Your requested order of <b> HIGH-EXPLOSIVE ARMOR-PIERCING M41A MAGAZINE (X3)</b> was not successfully delivered because: 'ERROR: UNABLE TO ENTER COMPARTMENT EXIT CODE 2342: EXPLOSION HAZARD'"
nope.color = "green"
nope.update_icon()

Expand Down
2 changes: 1 addition & 1 deletion code/game/area/areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
var/powernet_name = "default" //Default powernet name. Change to something else to make completely separate powernets
var/requires_power = 1
var/unlimited_power = 0
var/always_unpowered = 0 //this gets overriden to 1 for space in area/New()
var/always_unpowered = 0 //this gets overridden to 1 for space in area/New()

//which channels are powered
var/power_equip = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/colonialmarines/whiskey_outpost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
GLOB.round_statistics.track_round_end()
if(finished == 1)
log_game("Round end result - xenos won")
to_world(SPAN_ROUND_HEADER("The Xenos have succesfully defended their hive from colonization."))
to_world(SPAN_ROUND_HEADER("The Xenos have successfully defended their hive from colonization."))
to_world(SPAN_ROUNDBODY("Well done, you've secured LV-624 for the hive!"))
to_world(SPAN_ROUNDBODY("It will be another five years before the USCM returns to the Neroid Sector, with the arrival of the 2nd 'Falling Falcons' Battalion and the USS Almayer."))
to_world(SPAN_ROUNDBODY("The xenomorph hive on LV-624 remains unthreatened until then..."))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ You must lead his Honor guard, his elite unit of marines, to protect the command
gear_preset = /datum/equipment_preset/wo/vhg

/datum/job/command/bridge/whiskey/generate_entry_message(mob/living/carbon/human/H)
. = {"You were assigned to guard the commander in this hostile enviroment; that hasn't changed. Ensure your extra training and equipment isn't wasted!
. = {"You were assigned to guard the commander in this hostile environment; that hasn't changed. Ensure your extra training and equipment isn't wasted!
You've survived through enough battles that you've been entrusted with more training, and can use overwatch consoles, as well as give orders.
You're expected to defend not only the commander, but the bunker at large; leave the outside defenses to the marines.
Glory to the commander. Glory to the USCM."}
Expand All @@ -90,7 +90,7 @@ Glory to the commander. Glory to the USCM."}
gear_preset = /datum/equipment_preset/wo/hgs

/datum/job/command/tank_crew/whiskey/generate_entry_message(mob/living/carbon/human/H)
. = {"You were assigned to guard the commander in this hostile enviroment; that hasn't changed. Ensure your extra training and equipment isn't wasted!
. = {"You were assigned to guard the commander in this hostile environment; that hasn't changed. Ensure your extra training and equipment isn't wasted!
You're expected to defend not only the commander, but the bunker at large; leave the outside defenses to the marines.
You've been through much, and as such, have been given special-weapons training. Use it well.
Glory to the commander. Glory to the USCM."}
Expand All @@ -104,7 +104,7 @@ Glory to the commander. Glory to the USCM."}
gear_preset = /datum/equipment_preset/wo/hg

/datum/job/command/police/whiskey/generate_entry_message(mob/living/carbon/human/H)
. = {"You were assigned to guard the commander in this hostile enviroment; that hasn't changed. Ensure your extra training and equipment isn't wasted!
. = {"You were assigned to guard the commander in this hostile environment; that hasn't changed. Ensure your extra training and equipment isn't wasted!
You're expected to defend not only the commander, but the bunker at large; leave the outside defenses to the marines.
Glory to the commander. Glory to the USCM."}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
wave_castes = list(XENO_CASTE_BURROWER)
wave_type = WO_STATIC_WAVE
number_of_xenos = 3
command_announcement = list("First Lieutenant Ike Saker, Executive Officer of Captain Naiche, speaking. The Captain is still trying to try and get off world contact. An engineer platoon managed to destroy the main entrance into this valley this should give you a short break while the aliens find another way in. We are receiving reports of seismic waves occuring nearby, there might be creatures burrowing underground, keep an eye on your defenses. I have also received word that marines from an overrun outpost are evacuating to you and will help you. I used to be stationed with them, they are top notch!", "First Lieutenant Ike Saker, 3rd Battalion Command, LV-624 Garrison")
command_announcement = list("First Lieutenant Ike Saker, Executive Officer of Captain Naiche, speaking. The Captain is still trying to try and get off world contact. An engineer platoon managed to destroy the main entrance into this valley this should give you a short break while the aliens find another way in. We are receiving reports of seismic waves occurring nearby, there might be creatures burrowing underground, keep an eye on your defenses. I have also received word that marines from an overrun outpost are evacuating to you and will help you. I used to be stationed with them, they are top notch!", "First Lieutenant Ike Saker, 3rd Battalion Command, LV-624 Garrison")

/datum/whiskey_outpost_wave/wave8
wave_number = 8
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/civilians/support/cmo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
selection_class = "job_cmo"
flags_startup_parameters = ROLE_ADD_TO_DEFAULT
gear_preset = /datum/equipment_preset/uscm_ship/uscm_medical/cmo
entry_message_body = "You're a commissioned officer of the USCM. <a href='"+WIKI_PLACEHOLDER+"'>You have authority over everything related to Medbay and Research</a>, only able to be overriden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall."
entry_message_body = "You're a commissioned officer of the USCM. <a href='"+WIKI_PLACEHOLDER+"'>You have authority over everything related to Medbay and Research</a>, only able to be overridden by the XO and CO. You are in charge of medical staff, surgery, chemistry, stimulants and keeping the marines healthy overall."

AddTimelock(/datum/job/civilian/professor, list(
JOB_MEDIC_ROLES = 10 HOURS
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/air_alarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -572,14 +572,14 @@
var/pressure_dangerlevel = get_danger_level(environment_pressure, current_settings)

current_settings = TLV["temperature"]
var/enviroment_temperature = location.return_temperature()
var/temperature_dangerlevel = get_danger_level(enviroment_temperature, current_settings)
var/environment_temperature = location.return_temperature()
var/temperature_dangerlevel = get_danger_level(environment_temperature, current_settings)

output += {"
Pressure: <span class='dl[pressure_dangerlevel]'>[environment_pressure]</span>kPa<br>
"}

output += "Temperature: <span class='dl[temperature_dangerlevel]'>[enviroment_temperature]</span>K ([round(enviroment_temperature - T0C, 0.1)]C)<br>"
output += "Temperature: <span class='dl[temperature_dangerlevel]'>[environment_temperature]</span>K ([round(environment_temperature - T0C, 0.1)]C)<br>"

//'Local Status' should report the LOCAL status, damnit.
output += "Local Status: "
Expand Down
Loading

0 comments on commit ee339c1

Please sign in to comment.