Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

offical to official #78762

Merged
merged 2 commits into from
Oct 6, 2023
Merged

offical to official #78762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e88555f
offical to official
Isratosh Oct 4, 2023
cbac102
add offical to check_grep script
Isratosh Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/objects/items/tail_pin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
icon = 'icons/obj/poster.dmi'
icon_state = "tailpin"
name = "tail pin"
desc = "Offically branded 'pin the tail on the corgi' style party implement. Not intended to be used on people."
desc = "Officially branded 'pin the tail on the corgi' style party implement. Not intended to be used on people."
force = 0
w_class = WEIGHT_CLASS_SMALL
throwforce = 0
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/verbs/admin_newscaster.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
return TRUE
var/choice = tgui_alert(usr, "Please confirm feed channel creation","Network Channel Handler", list("Confirm","Cancel"))
if(choice == "Confirm")
GLOB.news_network.create_feed_channel(channel_name, "Centcom Offical", channel_desc, locked = channel_locked)
GLOB.news_network.create_feed_channel(channel_name, "Centcom Official", channel_desc, locked = channel_locked)
SSblackbox.record_feedback("text", "newscaster_channels", 1, "[channel_name]")
creating_channel = FALSE

Expand All @@ -316,7 +316,7 @@
creating_comment = FALSE
return TRUE
var/datum/feed_comment/new_feed_comment = new /datum/feed_comment
new_feed_comment.author = "Centcom Offical"
new_feed_comment.author = "Centcom Official"
new_feed_comment.body = comment_text
new_feed_comment.time_stamp = station_time_timestamp()
current_message.comments += new_feed_comment
Expand Down
2 changes: 1 addition & 1 deletion code/modules/art/paintings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
painting_metadata.patron_name = user.real_name
painting_metadata.credit_value = offer_amount
last_patron = WEAKREF(user.mind)
to_chat(user, span_notice("Nanotrasen Trust Foundation thanks you for your contribution. You're now offical patron of this painting."))
to_chat(user, span_notice("Nanotrasen Trust Foundation thanks you for your contribution. You're now an official patron of this painting."))
var/list/possible_frames = SSpersistent_paintings.get_available_frames(offer_amount)
if(possible_frames.len <= 1) // Not much room for choices here.
return
Expand Down
2 changes: 1 addition & 1 deletion config/blanks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@
"<hr />",
"<font color=\"grey\"><div align=\"justify\">By writing and signing this form, you consent to the processing of your personal data by Nanotrasen Corporation.</div></font></p>",
"<hr />",
"<p><strong>Name of offical to take action:</strong></p>",
"<p><strong>Name of official to take action:</strong></p>",
"<p>[___________________________________]</span></p>",
"<p><strong>Official Decision:</strong></p>",
"<p>[___________________________________]</span></p>",
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui/interfaces/AdminFax.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export const FaxMainPanel = (props, context) => {
icon="n"
mr="7px"
width="49%"
onClick={() => setPaperName('Nanotrasen Offical Report')}>
onClick={() => setPaperName('Nanotrasen Official Report')}>
Nanotrasen
</Button>
<Button
Expand Down
5 changes: 5 additions & 0 deletions tools/ci/check_grep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,11 @@ if $grep 'NanoTrasen' $code_files; then
echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T(s).${NC}"
st=1
fi;
if $grep -i 'offical' $code_files; then
echo
echo -e "${RED}ERROR: Misspelling(s) of official detected in code, please add the missing I(s).${NC}"
st=1
fi;
part "map json naming"
if ls _maps/*.json | $grep "[A-Z]"; then
echo
Expand Down
Loading