cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 12:04:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing common spelling mistakes part 2 (#20360)

Browse Source 
* Fixing common spelling mistakes part 2

* "supressed"
This commit is contained in:
Henri215
2023-02-08 17:20:35 -03:00
committed by GitHub
parent 718b220c8f
commit 42d1758b2e
26 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/SDQL2/SDQL_2.dm
+1 -1
View File
@@ -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]")
code/modules/antagonists/_common/antag_spawner.dm
+2 -2
View File
@@ -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]")
code/modules/client/login_processing/__client_login_processor.dm
+2 -2
View File
@@ -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]!")
code/modules/client/preference/preferences.dm
+1 -1
View File
@@ -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>&nbsp;"
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>"
code/modules/food_and_drinks/food/foods/candy.dm
+14 -14
View File
@@ -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)
code/modules/instruments/songs/_song.dm
+1 -1
View File
@@ -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))
code/modules/maze_generation/helper_modules/_helper_module_base.dm
+1 -1
View File
@@ -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]")
code/modules/maze_generation/loot_modules/_loot_module_base.dm
+1 -1
View File
@@ -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]")
code/modules/mob/living/simple_animal/posessed_object.dm
+2 -2
View File
@@ -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)
code/modules/reagents/chemistry/recipes.dm
+1 -1
View File
@@ -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)
code/modules/redis/redis_callback.dm
+1 -1
View File
@@ -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)
code/modules/server_commands/servermsg.dm
+2 -2
View File
@@ -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]!")
code/modules/shuttle/emergency.dm
+1 -1
View File
@@ -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()
code/modules/unit_tests/sql.dm
+1 -1
View File
@@ -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.")