mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Fixing common spelling mistakes part 2 (#20360)
* Fixing common spelling mistakes part 2 * "supressed"
This commit is contained in:
@@ -167,7 +167,7 @@ GLOBAL_DATUM_INIT(configuration, /datum/server_configuration, new())
|
||||
var/protection_state = PROTECTION_NONE
|
||||
|
||||
/datum/configuration_section/proc/load_data(list/data)
|
||||
CRASH("load() not overriden for [type]!")
|
||||
CRASH("load() not overridden for [type]!")
|
||||
|
||||
// Maximum protection
|
||||
/datum/configuration_section/can_vv_get(var_name)
|
||||
|
||||
@@ -277,7 +277,7 @@
|
||||
log_startup_progress("Initialized within [time] second[time == 1 ? "" : "s"]!")
|
||||
|
||||
/datum/controller/subsystem/Initialize()
|
||||
CRASH("Initialize() not overriden for [type]! Make the subsystem Initialize or add SS_NO_INIT to the flags")
|
||||
CRASH("Initialize() not overridden for [type]! Make the subsystem Initialize or add SS_NO_INIT to the flags")
|
||||
|
||||
//hook for printing stats to the "MC" statuspanel for admins to see performance and related stats etc.
|
||||
/datum/controller/subsystem/stat_entry(msg)
|
||||
|
||||
@@ -387,7 +387,7 @@ SUBSYSTEM_DEF(dbcore)
|
||||
SSdbcore.total_errors++
|
||||
if(usr)
|
||||
to_chat(usr, "<span class='danger'>A SQL error occurred during this operation, please inform an admin or a coder.</span>")
|
||||
message_admins("An SQL error has occured. Please check the server logs, with the following timestamp ID: \[[time_stamp()]]")
|
||||
message_admins("An SQL error has occurred. Please check the server logs, with the following timestamp ID: \[[time_stamp()]]")
|
||||
|
||||
/**
|
||||
* Main Execution Handler
|
||||
|
||||
@@ -201,7 +201,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
|
||||
//mime
|
||||
/datum/uplink_item/jobspecific/caneshotgun
|
||||
name = "Cane Shotgun and Assassination Shells"
|
||||
desc = "A specialised, one shell shotgun with a built-in cloaking device to mimic a cane. The shotgun is capable of hiding it's contents and the pin alongside being supressed. Comes boxed with 6 specialised shrapnel rounds laced with a silencing toxin and 1 preloaded in the shotgun's chamber."
|
||||
desc = "A specialised, one shell shotgun with a built-in cloaking device to mimic a cane. The shotgun is capable of hiding it's contents and the pin alongside being suppressed. Comes boxed with 6 specialised shrapnel rounds laced with a silencing toxin and 1 preloaded in the shotgun's chamber."
|
||||
reference = "MCS"
|
||||
item = /obj/item/storage/box/syndie_kit/caneshotgun
|
||||
cost = 8
|
||||
|
||||
@@ -447,7 +447,7 @@
|
||||
if(!is_station_level(AA.z))
|
||||
continue
|
||||
AA.emagged = TRUE
|
||||
to_chat(owner, "<span class='notice'>All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.")
|
||||
to_chat(owner, "<span class='notice'>All air alarm safeties on the station have been overridden. Air alarms may now use the Flood environmental mode.")
|
||||
owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, FALSE, use_reverb = FALSE)
|
||||
|
||||
|
||||
|
||||
@@ -400,7 +400,7 @@
|
||||
START_PROCESSING(SSfastprocess, src)
|
||||
|
||||
/obj/item/pinpointer/crew/proc/stop_tracking()
|
||||
visible_message("<span class='notice'>The pinpointer powers down, no longer recieving signals from a detective's revolver.</span>", "<span class='notice'>You hear a pinpointer powering down.</span>")
|
||||
visible_message("<span class='notice'>The pinpointer powers down, no longer receiving signals from a detective's revolver.</span>", "<span class='notice'>You hear a pinpointer powering down.</span>")
|
||||
target = null
|
||||
target_set = FALSE
|
||||
mode = MODE_OFF
|
||||
|
||||
@@ -618,7 +618,7 @@
|
||||
|
||||
/datum/spellbook_entry/item/revenantbottle
|
||||
name = "Bottle of Ectoplasm"
|
||||
desc = "A magically infused bottle of ectoplasm, effectivly pure salt from the spectral realm. Be careful though, these salty spirits are indiscriminate in their harvesting, and you yourself may become a victim."
|
||||
desc = "A magically infused bottle of ectoplasm, effectively pure salt from the spectral realm. Be careful though, these salty spirits are indiscriminate in their harvesting, and you yourself may become a victim."
|
||||
item_path = /obj/item/antag_spawner/revenant
|
||||
log_name = "RB"
|
||||
category = "Summons"
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
/obj/machinery/airlock_controller/proc/handle_button(button_mode)
|
||||
// dm please give me abstracts I beg
|
||||
CRASH("handle_button() not overriden for [type]")
|
||||
CRASH("handle_button() not overridden for [type]")
|
||||
|
||||
/obj/machinery/airlock_controller/ui_act(action, params)
|
||||
if(..())
|
||||
|
||||
@@ -377,7 +377,7 @@ GLOBAL_LIST_INIT(cloner_biomass_items, list(\
|
||||
return
|
||||
else
|
||||
connected_message("Authorized Ejection")
|
||||
announce_radio_message("An authorized ejection of [(occupant) ? occupant.real_name : "the malfunctioning pod"] has occured")
|
||||
announce_radio_message("An authorized ejection of [(occupant) ? occupant.real_name : "the malfunctioning pod"] has occurred")
|
||||
to_chat(user, "<span class='notice'>You force an emergency ejection.</span>")
|
||||
go_out()
|
||||
|
||||
|
||||
@@ -229,5 +229,5 @@
|
||||
message_admins("<span class='notice'>[key_name_admin(usr)] emagged [key_name_admin(R)] using robotic console!</span>")
|
||||
R.emagged = TRUE
|
||||
R.module.rebuild_modules()
|
||||
to_chat(R, "<span class='notice'>Failsafe protocols overriden. New tools available.</span>")
|
||||
to_chat(R, "<span class='notice'>Failsafe protocols overridden. New tools available.</span>")
|
||||
. = TRUE
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
<li><I>Gas Pump:</I> Take a wild guess. It moves gas in the direction it's pointing (marked by the red line on one end). It moves it based on pressure, the maximum output being 4500 kPa (kilopascals).
|
||||
Ordinary atmospheric pressure, for comparison, is 101.3 kPa, and the minimum pressure of room-temperature pure oxygen needed to not suffocate in a matter of minutes is 16 kPa
|
||||
(though 18 is preferred using internals, for various reasons).</li>
|
||||
<li><I>Volume pump:</I> This pump goes based on volume, instead of pressure, and the possible maximum pressure it can create in the pipe on the recieving end is double the gas pump because of this,
|
||||
<li><I>Volume pump:</I> This pump goes based on volume, instead of pressure, and the possible maximum pressure it can create in the pipe on the receiving end is double the gas pump because of this,
|
||||
clocking in at an incredible 9000 kPa. If a pipe with this is destroyed or damaged, and this pressure of gas escapes, it can be incredibly dangerous depending on the size of the pipe filled.
|
||||
Don't hook this to the distribution loop, or you will make babies cry and the Chief Engineer brutally beat you.</li>
|
||||
<li><I>Passive gate:</I> This is essentially a cap on the pressure of gas allowed to flow in a specific direction.
|
||||
|
||||
@@ -295,5 +295,5 @@
|
||||
/obj/proc/force_eject_occupant(mob/target)
|
||||
// This proc handles safely removing occupant mobs from the object if they must be teleported out (due to being SSD/AFK, by admin teleport, etc) or transformed.
|
||||
// In the event that the object doesn't have an overriden version of this proc to do it, log a runtime so one can be added.
|
||||
CRASH("Proc force_eject_occupant() is not overriden on a machine containing a mob.")
|
||||
CRASH("Proc force_eject_occupant() is not overridden on a machine containing a mob.")
|
||||
|
||||
|
||||
@@ -140,7 +140,7 @@
|
||||
break
|
||||
|
||||
catch(var/exception/e)
|
||||
to_chat(usr, "<span class='danger'>An exception has occured during the execution of your query and your query has been aborted.</span>")
|
||||
to_chat(usr, "<span class='danger'>An exception has occurred during the execution of your query and your query has been aborted.</span>")
|
||||
to_chat(usr, " [e.name]")
|
||||
to_chat(usr, " at: [e.file]:[e.line]")
|
||||
|
||||
|
||||
@@ -301,7 +301,7 @@
|
||||
|
||||
/obj/item/antag_spawner/revenant
|
||||
name = "vial of ectoplasm"
|
||||
desc = "A magically infused bottle of ectoplasm, effectivly pure salt from the spectral realm."
|
||||
desc = "A magically infused bottle of ectoplasm, effectively pure salt from the spectral realm."
|
||||
icon = 'icons/obj/wizard.dmi'
|
||||
icon_state = "vialectoplasm"
|
||||
var/shatter_msg = "<span class='notice'>You shatter the bottle, no \
|
||||
@@ -328,7 +328,7 @@
|
||||
used = FALSE
|
||||
to_chat(user, "<span class='notice'>The ectoplasm does not respond to your attempt to awake it. Perhaps you should try again later.</span>")
|
||||
return
|
||||
|
||||
|
||||
var/mob/C = pick(candidates)
|
||||
spawn_antag(C, get_turf(src), initial(revenant.name), user)
|
||||
to_chat(user, "[shatter_msg]")
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
*/
|
||||
/datum/client_login_processor/proc/get_query(client/C)
|
||||
RETURN_TYPE(/datum/db_query)
|
||||
CRASH("get_query() not overriden for [type]!")
|
||||
CRASH("get_query() not overridden for [type]!")
|
||||
|
||||
|
||||
|
||||
@@ -48,4 +48,4 @@
|
||||
* * C - The client to store stuff on
|
||||
*/
|
||||
/datum/client_login_processor/proc/process_result(datum/db_query/Q, client/C)
|
||||
CRASH("process_result() not overriden for [type]!")
|
||||
CRASH("process_result() not overridden for [type]!")
|
||||
|
||||
@@ -504,7 +504,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
|
||||
dat += "<a href='?_src_=prefs;preference=keybindings;all=reset'>Reset to Default</a> "
|
||||
dat += "<a href='?_src_=prefs;preference=keybindings;all=clear'>Clear</a><br /></div>"
|
||||
dat += "<tr><td colspan=4><hr></td></tr>"
|
||||
dat += "<tr><td colspan=4><div align='center'><b>Please note, some keybinds are overriden by other categories.</b></div></td></tr>"
|
||||
dat += "<tr><td colspan=4><div align='center'><b>Please note, some keybinds are overridden by other categories.</b></div></td></tr>"
|
||||
dat += "<tr><td colspan=4><div align='center'><b>Ensure you bind all of them, or the specific one you want.</b></div></td></tr>"
|
||||
dat += "<tr><td colspan=4><hr></td></tr>"
|
||||
dat += "<tr><td colspan=4><div align='center'><b>Users of legacy mode can only rebind and use the following keys:</b></div></td></tr>"
|
||||
|
||||
@@ -162,7 +162,7 @@
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas."
|
||||
desc = "A candy bean, guaranteed to not give you gas."
|
||||
icon_state = "jbean"
|
||||
filling_color = "#FFFFFF"
|
||||
bitesize = 3
|
||||
@@ -337,91 +337,91 @@
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/red
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's red!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's red!"
|
||||
icon_state = "jbean_red"
|
||||
filling_color = "#801E28"
|
||||
list_reagents = list("sugar" = 10, "cherryjelly" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/blue
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's blue!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
|
||||
icon_state = "jbean_blue"
|
||||
filling_color = "#863333"
|
||||
list_reagents = list("sugar" = 10, "berryjuice" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/poison
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's blue!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's blue!"
|
||||
icon_state = "jbean_blue"
|
||||
filling_color = "#863353"
|
||||
list_reagents = list("poisonberryjuice" = 12)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/green
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's green!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's green!"
|
||||
icon_state = "jbean_green"
|
||||
filling_color = "#365E30"
|
||||
list_reagents = list("sugar" = 10, "limejuice" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/yellow
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's yellow!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's yellow!"
|
||||
icon_state = "jbean_yellow"
|
||||
filling_color = "#863333"
|
||||
list_reagents = list("sugar" = 10, "lemonjuice" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/orange
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's orange!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's orange!"
|
||||
icon_state = "jbean_orange"
|
||||
filling_color = "#E78108"
|
||||
list_reagents = list("sugar" = 10, "orangejuice" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/purple
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's purple!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's purple!"
|
||||
icon_state = "jbean_purple"
|
||||
filling_color = "#993399"
|
||||
list_reagents = list("sugar" = 10, "grapejuice" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/chocolate
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's chocolate!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's chocolate!"
|
||||
icon_state = "jbean_choc"
|
||||
filling_color = "#302000"
|
||||
list_reagents = list("sugar" = 10, "chocolate" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/popcorn
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's popcorn flavored!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's popcorn flavored!"
|
||||
icon_state = "jbean_popcorn"
|
||||
filling_color = "#664330"
|
||||
list_reagents = list("sugar" = 10, "nutriment" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/cola
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's Cola flavored!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's Cola flavored!"
|
||||
icon_state = "jbean_cola"
|
||||
filling_color = "#102000"
|
||||
list_reagents = list("sugar" = 10, "cola" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/drgibb
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's Dr. Gibb flavored!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's Dr. Gibb flavored!"
|
||||
icon_state = "jbean_cola"
|
||||
filling_color = "#102000"
|
||||
list_reagents = list("sugar" = 10, "dr_gibb" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/coffee
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. It's Coffee flavored!"
|
||||
desc = "A candy bean, guaranteed to not give you gas. It's Coffee flavored!"
|
||||
icon_state = "jbean_choc"
|
||||
filling_color = "#482000"
|
||||
list_reagents = list("sugar" = 10, "coffee" = 2)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/candy/jellybean/wtf
|
||||
name = "jelly bean"
|
||||
desc = "A candy bean, guarenteed to not give you gas. You aren't sure what color it is."
|
||||
desc = "A candy bean, guaranteed to not give you gas. You aren't sure what color it is."
|
||||
icon_state = "jbean_rainbow"
|
||||
filling_color = "#60A584"
|
||||
list_reagents = list("sugar" = 10, "space_drugs" = 2)
|
||||
|
||||
@@ -218,7 +218,7 @@
|
||||
if(playing)
|
||||
return
|
||||
if(!using_instrument?.is_ready())
|
||||
to_chat(user, "<span class='warning'>An error has occured with [src]. Please reset the instrument.</span>")
|
||||
to_chat(user, "<span class='warning'>An error has occurred with [src]. Please reset the instrument.</span>")
|
||||
return
|
||||
compile_chords()
|
||||
if(!length(compiled_chords))
|
||||
|
||||
@@ -11,4 +11,4 @@
|
||||
* * blockwise - This will be TRUE if the maze this is running on is a blockwise maze
|
||||
*/
|
||||
/obj/effect/mazegen/module_helper/proc/helper_run(blockwise = FALSE, obj/effect/mazegen/host)
|
||||
CRASH("spawn_loot() not overriden for [type]")
|
||||
CRASH("spawn_loot() not overridden for [type]")
|
||||
|
||||
@@ -13,4 +13,4 @@
|
||||
* * T - The turf loot will be spawned on
|
||||
*/
|
||||
/obj/effect/mazegen/module_loot/proc/spawn_loot(turf/T)
|
||||
CRASH("spawn_loot() not overriden for [type]")
|
||||
CRASH("spawn_loot() not overridden for [type]")
|
||||
|
||||
@@ -94,13 +94,13 @@
|
||||
..()
|
||||
|
||||
if(!isitem(loc)) // Some silly motherfucker spawned us directly via the game panel.
|
||||
message_admins("<span class='adminnotice'>Posessed object improperly spawned, deleting.</span>") // So silly admins with debug off will see the message too and not spam these things.
|
||||
message_admins("<span class='adminnotice'>Possessed object improperly spawned, deleting.</span>") // So silly admins with debug off will see the message too and not spam these things.
|
||||
stack_trace("[src] spawned manually, no object to assign attributes to.")
|
||||
qdel(src)
|
||||
|
||||
var/turf/possessed_loc = get_turf(loc)
|
||||
if(!istype(possessed_loc)) // Will this ever happen? Who goddamn knows.
|
||||
message_admins("<span class='adminnotice'>Posessed object could not find turf, deleting.</span>") // So silly admins with debug off will see the message too and not spam these things.
|
||||
message_admins("<span class='adminnotice'>Possessed object could not find turf, deleting.</span>") // So silly admins with debug off will see the message too and not spam these things.
|
||||
stack_trace("[src] attempted to find a turf to spawn on, and could not.")
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]"
|
||||
|
||||
message_admins(message, 0, 1)
|
||||
log_game("[reaction_name] chemical mob spawn reaction occuring at [AREACOORD(T)] carried by [key_name(M)] with last fingerprint [A.fingerprintslast? A.fingerprintslast : "N/A"]")
|
||||
log_game("[reaction_name] chemical mob spawn reaction occurring at [AREACOORD(T)] carried by [key_name(M)] with last fingerprint [A.fingerprintslast? A.fingerprintslast : "N/A"]")
|
||||
|
||||
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
|
||||
|
||||
|
||||
@@ -21,7 +21,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]!")
|
||||
|
||||
// Misc protections
|
||||
/datum/redis_callback/vv_edit_var(var_name, var_value)
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
var/list/command_args = list()
|
||||
|
||||
/datum/server_command/proc/execute(source, command_args)
|
||||
CRASH("execute(source, command_args) not overriden for [type]!")
|
||||
CRASH("execute(source, command_args) not overridden for [type]!")
|
||||
|
||||
/datum/server_command/proc/dispatch(command_args)
|
||||
SHOULD_NOT_OVERRIDE(TRUE) // No messing with
|
||||
@@ -35,4 +35,4 @@
|
||||
|
||||
// Override this if you want a cleaner method for putting together dispatch args
|
||||
/datum/server_command/proc/custom_dispatch()
|
||||
CRASH("custom_dispatch() not overriden for [type]!")
|
||||
CRASH("custom_dispatch() not overridden for [type]!")
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
atom_say("Software override initiated.")
|
||||
playsound(src, 'sound/machines/terminal_on.ogg', 100, FALSE)
|
||||
var/turf/console_hijack_turf = get_turf(src)
|
||||
message_admins("[src] is being overriden for hijack by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(console_hijack_turf)]")
|
||||
message_admins("[src] is being overridden for hijack by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(console_hijack_turf)]")
|
||||
. = FALSE
|
||||
if(do_after(user, speed, target = src))
|
||||
increase_hijack_stage()
|
||||
|
||||
@@ -5,6 +5,6 @@
|
||||
Fail("SQL version error: Game is running V[SQL_VERSION] but config is V[GLOB.configuration.database.version]. You may need to update the example config.")
|
||||
|
||||
if(SSdbcore.total_errors > 0)
|
||||
Fail("SQL errors occured on startup. Please fix them.")
|
||||
Fail("SQL errors occurred on startup. Please fix them.")
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user