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

Renames OCIE to SFP #27306

Merged
merged 1 commit into from
Oct 13, 2019
Merged

Renames OCIE to SFP #27306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions code/_helpers/text.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ proc/TextPreview(var/string,var/len=40)
t = replacetext(t, "\[eclogo\]", "<img src = eclogo.png>")
t = replacetext(t, "\[xynlogo\]", "<img src = xynlogo.png>")
t = replacetext(t, "\[fleetlogo\]", "<img src = fleetlogo.png>")
t = replacetext(t, "\[ocielogo\]", "<img src = ocielogo.png>")
t = replacetext(t, "\[sfplogo\]", "<img src = sfplogo.png>")
t = replacetext(t, "\[editorbr\]", "")
return t

Expand Down Expand Up @@ -475,7 +475,7 @@ proc/TextPreview(var/string,var/len=40)
t = replacetext(t, "<img src = eclogo.png>", "\[eclogo\]")
t = replacetext(t, "<img src = daislogo.png>", "\[daislogo\]")
t = replacetext(t, "<img src = xynlogo.png>", "\[xynlogo\]")
t = replacetext(t, "<img src = ocielogo.png>", "\[ocielogo\]")
t = replacetext(t, "<img src = sfplogo.png>", "\[sfplogo\]")
t = replacetext(t, "<span class=\"paper_field\"></span>", "\[field\]")
t = strip_html_properly(t)
return t
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/holowarrant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
if(active.fields["arrestsearch"] == "arrest")
var/output = {"
<HTML><HEAD><TITLE>[active.fields["namewarrant"]]</TITLE></HEAD>
<BODY bgcolor='#ffffff'><center><large><b>SCG OCIE Warrant Tracker System</b></large></br>
<BODY bgcolor='#ffffff'><center><large><b>SCG SFP Warrant Tracker System</b></large></br>
</br>
Issued in the jurisdiction of the</br>
[GLOB.using_map.boss_name] in [GLOB.using_map.system_name]</br>
Expand All @@ -103,7 +103,7 @@
if(active.fields["arrestsearch"] == "search")
var/output= {"
<HTML><HEAD><TITLE>Search Warrant: [active.fields["namewarrant"]]</TITLE></HEAD>
<BODY bgcolor='#ffffff'><center><large><b>SCG OCIE Warrant Tracker System</b></large></br>
<BODY bgcolor='#ffffff'><center><large><b>SCG SFP Warrant Tracker System</b></large></br>
</br>
Issued in the jurisdiction of the</br>
[GLOB.using_map.boss_name] in [GLOB.using_map.system_name]</br>
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/client_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
'html/images/daislogo.png',
'html/images/eclogo.png',
'html/images/fleetlogo.png',
'html/images/ocielogo.png'
'html/images/sfplogo.png'
)

var/decl/asset_cache/asset_cache = decls_repository.get_decl(/decl/asset_cache)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/suits/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@

/obj/item/clothing/suit/storage/toggle/agent_jacket
name = "agent jacket"
desc = "A black leather jacket belonging to an agent of the Office of Civil Investigation and Enforcement."
desc = "A black leather jacket belonging to an agent of the Sol Federal Police."
icon_state = "agent_jacket"
icon_open = "agent_jacket_open"
icon_closed = "agent_jacket"
Expand Down
12 changes: 6 additions & 6 deletions code/modules/clothing/under/accessories/badges.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,21 +170,21 @@
icon_state = "ntbadge"
badge_string = "Corporate Executive Body"

/obj/item/clothing/accessory/badge/ocieagent
name = "\improper OCIE Agent's badge"
desc = "A leather-backed gold badge displaying the crest of the Office of Civil Investigation and Enforcement."
/obj/item/clothing/accessory/badge/agent
name = "\improper SFP Agent's badge"
desc = "A leather-backed gold badge displaying the crest of the Sol Federal Police."
icon_state = "agentbadge"
slot_flags = SLOT_BELT | SLOT_TIE
slot = ACCESSORY_SLOT_INSIGNIA
badge_string = "Office of Civil Investigation and Enforcement"
badge_string = "Sol Federal Police"

/obj/item/clothing/accessory/badge/tracker
name = "\improper Tracker's badge"
desc = "A blue leather-backed gold badge displaying the crest of the Office of Civil Investigation and Enforcement."
desc = "A blue leather-backed gold badge displaying the crest of the Sol Federal Police."
icon_state = "trackerbadge"
slot_flags = SLOT_BELT | SLOT_TIE
slot = ACCESSORY_SLOT_INSIGNIA
badge_string = "Office of Civil Investigation and Enforcement"
badge_string = "Sol Federal Police"

/obj/item/clothing/accessory/badge/press
name = "press badge"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/codex/entries/paperwork.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
\[xynlogo\] - Inserts the Xyngergy logo.<br>
\[iccgseal\] - Inserts ICCG seal.<br>
\[fleetlogo\] - Inserts the logo of the SCG Fleet.<br>
\[ocielogo\] - Inserts the logo of the Office of Civil Investigation and Enforcement.<br><br>
\[sfplogo\] - Inserts the logo of the Sol Federal Police.<br><br>
<b>Digital exclusive commands (NanoWord, emails, reports, text files, etc):</b><br>
\[pre\] - \[/pre\] : Adds preformatted text, forcing the text to be fixed width.<br>
\[fontred\] - \[/font\] : Makes the text red.<br>
Expand Down
2 changes: 1 addition & 1 deletion code/modules/culture_descriptor/location/locations_human.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
The planet's population is primarily divided into northern, urban Tersteners who often are seen in the military; and southern, rural Tersteners, who make up the farmers and ranchers of the planet. \
While much of the North has been developed, large parts of the South remain undeveloped. \
Tersten is an isolated border world, with little influence in the larger community. Still, it is a proud member of the SCG, and Tersten City has become a haunt for Third Fleet forces on shore leave. \
The OCIE maintain an office in the city of Moore, and various Trans-Stellar Corporations have a foothold in the city of South Harelstone. \
The SFP maintain an office in the city of Moore, and various Trans-Stellar Corporations have a foothold in the city of South Harelstone. \
<br><br>The Tersten people are separated into various cultures. For example, urban Tersteners, known as 'Pinascs', live around Tersten City, and are often seen in the defence forces. \
Rural Tersteners, known as 'Nevokies', live in the south central region around the city of Nevada. Many Martian and Earthling enclaves exist on the planet, significantly in South Harelstone. \
The divide between north and south could also be considered a divide between rich and poor. Even the poorest city dweller will likely be richer than most farmers. \
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/adminpaper.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
var/footer = null
var/footerOn = FALSE

var/logo_list = list("sollogo.png","eclogo.png","fleetlogo.png","exologo.png","ntlogo.png","daislogo.png","xynlogo.png","terralogo.png", "ocielogo.png")
var/logo_list = list("sollogo.png","eclogo.png","fleetlogo.png","exologo.png","ntlogo.png","daislogo.png","xynlogo.png","terralogo.png", "sfplogo.png")
var/logo = ""

/obj/item/weapon/paper/admin/New()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/paperwork/faxmachine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) //cache for faxes that have been sent to admins
. = ..()

if(!admin_departments)
admin_departments = list("[GLOB.using_map.boss_name]", "Office of Civil Investigation and Enforcement", "[GLOB.using_map.boss_short] Supply") + GLOB.using_map.map_admin_faxes
admin_departments = list("[GLOB.using_map.boss_name]", "Sol Federal Police", "[GLOB.using_map.boss_short] Supply") + GLOB.using_map.map_admin_faxes
GLOB.allfaxes += src
if(!destination) destination = "[GLOB.using_map.boss_name]"
if( !(("[department]" in GLOB.alldepartments) || ("[department]" in admin_departments)))
Expand Down Expand Up @@ -212,7 +212,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) //cache for faxes that have been sent to admins
//message badmins that a fax has arrived
if (destination == GLOB.using_map.boss_name)
message_admins(sender, "[uppertext(destination)] FAX[intercepted ? "(Intercepted by [intercepted])" : null]", rcvdcopy, destination, "#006100")
else if (destination == "Office of Civil Investigation and Enforcement")
else if (destination == "Sol Federal Police")
message_admins(sender, "[uppertext(destination)] FAX[intercepted ? "(Intercepted by [intercepted])" : null]", rcvdcopy, destination, "#1f66a0")
else if (destination == "[GLOB.using_map.boss_short] Supply")
message_admins(sender, "[uppertext(destination)] FAX[intercepted ? "(Intercepted by [intercepted])" : null]", rcvdcopy, destination, "#5f4519")
Expand Down
0 html/images/ocielogo.png → html/images/sfplogo.png
View file
Open in desktop
File renamed without changes
4 changes: 2 additions & 2 deletions maps/torch/items/clothing/solgov-accessory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,8 @@ armour attachments
icon_state = "medictag"

/obj/item/clothing/accessory/armor/tag/solgov/agent
name = "\improper OCIE AGENT tag"
desc = "An armor tag with the word OCIE AGENT printed in gold lettering on it."
name = "\improper SFP AGENT tag"
desc = "An armor tag with the words SFP AGENT printed in gold lettering on it."
icon_state = "agenttag"

/obj/item/clothing/accessory/armor/tag/solgov/com
Expand Down
2 changes: 1 addition & 1 deletion maps/torch/job/outfits/security_outfits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
shoes = /obj/item/clothing/shoes/dutyboots

/decl/hierarchy/outfit/job/torch/crew/security/forensic_tech/agent
name = OUTFIT_JOB_NAME("Forensic Technician - OCIE Agent")
name = OUTFIT_JOB_NAME("Forensic Technician - SFP Agent")
uniform = /obj/item/clothing/under/det/grey
suit = /obj/item/clothing/suit/storage/toggle/agent_jacket
shoes = /obj/item/clothing/shoes/dress
Expand Down
2 changes: 1 addition & 1 deletion maps/torch/loadout/loadout_suit.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
armors["tan plate carrier"] = /obj/item/clothing/suit/armor/pcarrier/tan
gear_tweaks += new/datum/gear_tweak/path(armors)

/datum/gear/suit/ocie
/datum/gear/suit/sfp
display_name = "Agent's jacket"
path = /obj/item/clothing/suit/storage/toggle/agent_jacket
allowed_roles = list(/datum/job/detective)
Expand Down
4 changes: 2 additions & 2 deletions maps/torch/torch_ranks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,9 +662,9 @@
accessory = list(/obj/item/clothing/accessory/badge/solgov/representative)

/datum/mil_rank/sol/agent
name = "OCIE Agent"
name = "SFP Agent"
name_short = "AGT"
accessory = list(/obj/item/clothing/accessory/badge/ocieagent)
accessory = list(/obj/item/clothing/accessory/badge/agent)

/datum/mil_rank/sol/scientist
name = "Government Scientist"
Expand Down
2 changes: 1 addition & 1 deletion news_articles/space_magazine_6.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h2 class = "heading">More news on Resomi contact with the Positronic Union</h2>
<h2 class = "heading">Drug Bust Results in Recovery of Humanity's First Interstellar Probe</h2>
<p class = "author">Natalie Syline</p>
<p>
The Office of Civil Investigation and Enforcement is the primary executive law enforcement body in the SCG, which means that when the bad guys headquarters
The Sol Federal Police is the primary executive law enforcement body in the SCG, which means that when the bad guys headquarters
needs to be busted open, they're the guys who authorize and supervise the operations. the CMB supervises about 30-40 busts a month within the core worlds,
but one of their more recent busts turned up an unlikely item: The Voyager 1 probe.
</p>
Expand Down