diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm
index dc8ed7bb226..85c8648f0dd 100644
--- a/code/__HELPERS/names.dm
+++ b/code/__HELPERS/names.dm
@@ -46,7 +46,7 @@ var/religion_name = null
/proc/station_name()
if (station_name)
return station_name
-
+
var/short_name = pick("Station", "Fortress", "Frontier", "Suffix", "Death-trap", "Space-hulk", "Lab", "Hazard","Spess Junk", "Fishery", "No-Moon", "Tomb", "Crypt", "Hut", "Monkey", "Bomb", "Trade Post", "Fortress", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker", "Roost", "Fat Camp")
station_name = new_station_name()
@@ -257,7 +257,7 @@ var/syndicate_code_response//Code response for traitors.
if(2)
syndicate_code_phrase += pick("How do I get to","How do I find","Where is","Where do I find")
syndicate_code_phrase += " "
- syndicate_code_phrase += pick("Escape","Engineering","Atmos","the bridge","the brig","Clown Planet","CentCom","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict")
+ syndicate_code_phrase += pick("Escape","Engineering","Atmos","the bridge","the brig","Clown Planet","Centcom","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict")
syndicate_code_phrase += "?"
if(3)
if(prob(70))
@@ -284,7 +284,7 @@ var/syndicate_code_response//Code response for traitors.
if(prob(80))
syndicate_code_response += pick("Try looking for them near","I they ran off to","Yes. I saw them near","Nope. I'm heading to","Try searching")
syndicate_code_response += " "
- syndicate_code_response += pick("Escape","Engineering","Atmos","the bridge","the brig","Clown Planet","CentCom","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict")
+ syndicate_code_response += pick("Escape","Engineering","Atmos","the bridge","the brig","Clown Planet","Centcom","the library","the chapel","a bathroom","Med Bay","Tool Storage","the escape shuttle","Robotics","a locker room","the living quarters","the gym","the autolathe","QM","the bar","the theater","the derelict")
syndicate_code_response += "."
else if(prob(60))
syndicate_code_response += pick("No. I'm busy, sorry.","I don't have the time.","Not sure, maybe?","There is no time.")
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index b04284947b1..229acc1683e 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -170,7 +170,7 @@
teleatom.visible_message("\red The [teleatom] bounces off of the portal!")
return 0
- if(destination.z == 2) //centcomm z-level
+ if(destination.z == 2) //centcom z-level
if(istype(teleatom, /obj/mecha))
var/obj/mecha/MM = teleatom
MM.occupant << "\red The mech would not survive the jump to a location so far away!"
diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index ba4ecd773ae..f7be885cfa5 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -38,7 +38,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
var/smoke_amt = 0 //cropped at 10
var/critfailchance = 0
- var/centcomm_cancast = 1 //Whether or not the spell should be allowed on z2
+ var/centcom_cancast = 1 //Whether or not the spell should be allowed on z2
/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
@@ -46,7 +46,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
user << "You shouldn't have this spell! Something's wrong."
return 0
- if(user.z == 2 && !centcomm_cancast) //Certain spells are not allowed on the centcomm zlevel
+ if(user.z == 2 && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
return 0
if(!skipcharge)
diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm
index 5279d97d32f..9b834a69ac1 100644
--- a/code/datums/spells/construct_spells.dm
+++ b/code/datums/spells/construct_spells.dm
@@ -14,7 +14,7 @@
invocation_type = "none"
range = 0
summon_type = list(/turf/simulated/floor/engine/cult)
- centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
+ centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
name = "Lesser Construction"
@@ -27,7 +27,7 @@
invocation_type = "none"
range = 0
summon_type = list(/turf/simulated/wall/cult)
- centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
+ centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
@@ -39,7 +39,7 @@
invocation = "none"
invocation_type = "none"
range = 0
- centcomm_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
+ centcom_cancast = 0 //Stop crashing the server by spawning turfs on transit tiles
delay = 50
summon_type = list(/turf/simulated/wall/r_wall)
@@ -85,4 +85,4 @@
include_user = 1
phaseshift = 1
jaunt_duration = 50 //in deciseconds
- centcomm_cancast = 0 //Stop people from getting to centcomm
\ No newline at end of file
+ centcom_cancast = 0 //Stop people from getting to centcom
\ No newline at end of file
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 96eafd2e092..1533234a2e6 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -9,7 +9,7 @@
invocation_type = "none"
range = -1
include_user = 1
- centcomm_cancast = 0 //Prevent people from getting to centcomm
+ centcom_cancast = 0 //Prevent people from getting to centcom
var phaseshift = 0
var/jaunt_duration = 50 //in deciseconds
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index 5d31a61c1e5..a480a322c75 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -105,7 +105,7 @@
inner_tele_radius = 0
outer_tele_radius = 6
- centcomm_cancast = 0 //prevent people from getting to centcomm
+ centcom_cancast = 0 //prevent people from getting to centcom
/obj/effect/proc_holder/spell/targeted/area_teleport/teleport
name = "Teleport"
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 415aa0d786d..a39c1436ab6 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -48,7 +48,7 @@
/datum/game_mode/cult/announce()
world << "The current game mode is - Cult!"
- world << "Some crewmembers are attempting to start a cult!
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentCom-allowed faith they had."
+ world << "Some crewmembers are attempting to start a cult!
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever Centcom-allowed faith they had."
/datum/game_mode/cult/pre_setup()
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index 0c9d9566c53..816c5eae8a2 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -181,7 +181,7 @@
return list(access_cent_general, access_cent_living, access_cent_storage)
if("Thunderdome Overseer")
return list(access_cent_general, access_cent_thunder)
- if("CentCom Official")
+ if("Centcom Official")
return list(access_cent_general, access_cent_living)
if("Medical Officer")
return list(access_cent_general, access_cent_living, access_cent_medical)
@@ -193,7 +193,7 @@
return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed)
if("Admiral")
return get_all_centcom_access()
- if("CentCom Commander")
+ if("Centcom Commander")
return get_all_centcom_access()
/proc/get_all_accesses()
@@ -414,7 +414,7 @@ proc/get_all_job_icons() //For all existing HUD icons
return get_all_jobs() + list("Prisoner")
/proc/get_all_centcom_jobs()
- return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander")
+ return list("VIP Guest","Custodian","Thunderdome Overseer","Centcom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","Centcom Commander")
/obj/proc/GetJobName() //Used in secHUD icon generation
if (!istype(src, /obj/item/device/pda) && !istype(src,/obj/item/weapon/card/id))
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index d15cdd4698f..80757d1b6c3 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -67,7 +67,7 @@
name = "Circuit board (ID Console)"
build_path = "/obj/machinery/computer/card"
/obj/item/weapon/circuitboard/card/centcom
- name = "Circuit board (CentCom ID Console)"
+ name = "Circuit board (Centcom ID Console)"
build_path = "/obj/machinery/computer/card/centcom"
//obj/item/weapon/circuitboard/shield
// name = "Circuit board (Shield Control)"
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index df96f50b8c0..4ec12dc06d6 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -130,7 +130,7 @@
else
if(check_access(scan))
// EDIT SPECIFIC JOB
- dat = "Return
"
+ dat = "Return
"
dat += "[j.title]: [j.current_positions]/[j.total_positions]
"
//Make sure antags can't completely ruin rounds
@@ -147,8 +147,8 @@
dat += "You have to wait [mins]:[(seconds < 10) ? "0[seconds]" : "[seconds]"] minutes before you can open this position."
if(0)
dat += "You cannot open positions for this job.
"
-
-
+
+
switch(can_close_job(j))
if(1)
dat += "Close Position"
@@ -434,7 +434,7 @@
/obj/machinery/computer/card/centcom
- name = "CentCom Identification Console"
+ name = "Centcom Identification Console"
circuit = "/obj/item/weapon/circuitboard/card/centcom"
req_access = list(access_cent_captain)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 32cd4c92be2..6f3190f9ee1 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -16,7 +16,7 @@
var/state = STATE_DEFAULT
var/aistate = STATE_DEFAULT
var/message_cooldown = 0
- var/centcomm_message_cooldown = 0
+ var/centcom_message_cooldown = 0
var/tmp_alertlevel = 0
var/const/STATE_DEFAULT = 1
var/const/STATE_CALLSHUTTLE = 2
@@ -180,7 +180,7 @@
// OMG CENTCOMM LETTERHEAD
if("MessageCentcomm")
if(src.authenticated==2)
- if(centcomm_message_cooldown)
+ if(centcom_message_cooldown)
usr << "Arrays recycling. Please stand by."
return
var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
@@ -189,15 +189,15 @@
Centcomm_announce(input, usr)
usr << "Message transmitted."
log_say("[key_name(usr)] has made a Centcomm announcement: [input]")
- centcomm_message_cooldown = 1
+ centcom_message_cooldown = 1
spawn(6000)//10 minute cooldown
- centcomm_message_cooldown = 0
+ centcom_message_cooldown = 0
// OMG SYNDICATE ...LETTERHEAD
if("MessageSyndicate")
if((src.authenticated==2) && (src.emagged))
- if(centcomm_message_cooldown)
+ if(centcom_message_cooldown)
usr << "Arrays recycling. Please stand by."
return
var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
@@ -206,9 +206,9 @@
Syndicate_announce(input, usr)
usr << "Message transmitted."
log_say("[key_name(usr)] has made a Syndicate announcement: [input]")
- centcomm_message_cooldown = 1
+ centcom_message_cooldown = 1
spawn(6000)//10 minute cooldown
- centcomm_message_cooldown = 0
+ centcom_message_cooldown = 0
if("RestoreBackup")
usr << "Backup routing data restored!"
@@ -449,7 +449,7 @@
return
if(emergency_shuttle.direction == -1)
- user << "The emergency shuttle may not be called while returning to CentCom."
+ user << "The emergency shuttle may not be called while returning to Centcom."
return
if(emergency_shuttle.online)
@@ -475,7 +475,7 @@
if((ticker.mode.name == "blob")||(ticker.mode.name == "meteor"))
return
- if(emergency_shuttle.direction != -1 && emergency_shuttle.online) //check that shuttle isn't already heading to centcomm
+ if(emergency_shuttle.direction != -1 && emergency_shuttle.online) //check that shuttle isn't already heading to centcom
emergency_shuttle.recall()
log_game("[key_name(user)] has recalled the shuttle.")
message_admins("[key_name_admin(user)] has recalled the shuttle.", 1)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 6efb1692312..79ef6aee872 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -896,7 +896,7 @@ About the new airlock wires panel:
if(5) new/obj/structure/door_assembly/door_assembly_mai( src.loc )
if(6) new/obj/structure/door_assembly/door_assembly_ext( src.loc )
if(7) new/obj/structure/door_assembly/door_assembly_glass( src.loc )
- //8 is centcomm
+ //8 is centcom
if(9) new/obj/structure/door_assembly/door_assembly_vault(loc)
//10 is double glass door (2x1)
//11 is freezer
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 4831dba99e4..9519b81ff6f 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -160,7 +160,7 @@
..()
/obj/item/weapon/card/id/centcom
- name = "\improper CentCom. ID"
+ name = "\improper Centcom ID"
desc = "An ID straight from Cent. Com."
icon_state = "centcom"
registered_name = "Central Command"
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index be916e3f95c..6a13aa80043 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -119,7 +119,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
var/points_per_slip = 2
var/points_per_crate = 5
var/plasma_per_point = 5 // 2 plasma for 1 point
- var/centcomm_message = "" // Remarks from CentComm on how well you checked the last order.
+ var/centcom_message = "" // Remarks from Centcom on how well you checked the last order.
//control
var/ordernum
var/list/shoppinglist = list()
@@ -135,7 +135,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
New()
ordernum = rand(1,9000)
- //Supply shuttle ticker - handles supply point regenertion and shuttle travelling between centcomm and the station
+ //Supply shuttle ticker - handles supply point regenertion and shuttle travelling between centcom and the station
proc/process()
for(var/typepath in (typesof(/datum/supply_packs) - /datum/supply_packs))
var/datum/supply_packs/P = new typepath()
@@ -194,7 +194,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
return 1
- //To stop things being sent to centcomm which should not be sent to centcomm. Recursively checks for these types.
+ //To stop things being sent to centcom which should not be sent to centcom Recursively checks for these types.
proc/forbidden_atoms_check(atom/A)
if(istype(A,/mob/living))
return 1
@@ -222,8 +222,8 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
var/plasma_count = 0
var/crate_count = 0
- centcomm_message = ""
-
+ centcom_message = ""
+
for(var/atom/movable/MA in shuttle)
if(MA.anchored) continue
@@ -244,32 +244,32 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
for(var/i=1,i<=slip.stamped.len,i++)
if(slip.stamped[i] == /obj/item/weapon/stamp/denied)
denied = 1
- if(slip.erroneous && denied) // Caught a mistake by CentComm (IDEA: maybe CentComm rarely gets offended by this)
+ if(slip.erroneous && denied) // Caught a mistake by Centcom (IDEA: maybe Centcom rarely gets offended by this)
points += slip.points-points_per_crate // For now, give a full refund for paying attention (minus the crate cost)
- centcomm_message += "+[slip.points-points_per_crate]: Station correctly denied package [slip.ordernumber]: "
+ centcom_message += "+[slip.points-points_per_crate]: Station correctly denied package [slip.ordernumber]: "
if(slip.erroneous & MANIFEST_ERROR_NAME)
- centcomm_message += "Destination station incorrect. "
+ centcom_message += "Destination station incorrect. "
else if(slip.erroneous & MANIFEST_ERROR_COUNT)
- centcomm_message += "Packages incorrectly counted. "
+ centcom_message += "Packages incorrectly counted. "
else if(slip.erroneous & MANIFEST_ERROR_ITEM)
- centcomm_message += "Package incomplete. "
- centcomm_message += "Points refunded.
"
+ centcom_message += "Package incomplete. "
+ centcom_message += "Points refunded.
"
else if(!slip.erroneous && !denied) // Approving a proper order awards the relatively tiny points_per_slip
points += points_per_slip
- centcomm_message += "+1: Package [slip.ordernumber] accorded.
"
+ centcom_message += "+1: Package [slip.ordernumber] accorded.
"
else // You done goofed.
if(slip.erroneous)
- centcomm_message += "+0: Station approved package [slip.ordernumber] despite error: "
+ centcom_message += "+0: Station approved package [slip.ordernumber] despite error: "
if(slip.erroneous & MANIFEST_ERROR_NAME)
- centcomm_message += "Destination station incorrect."
+ centcom_message += "Destination station incorrect."
else if(slip.erroneous & MANIFEST_ERROR_COUNT)
- centcomm_message += "Packages incorrectly counted."
+ centcom_message += "Packages incorrectly counted."
else if(slip.erroneous & MANIFEST_ERROR_ITEM)
- centcomm_message += "We found unshipped items on our dock."
- centcomm_message += " Be more vigilant.
"
+ centcom_message += "We found unshipped items on our dock."
+ centcom_message += " Be more vigilant.
"
else
points -= slip.points-points_per_crate
- centcomm_message += "-[slip.points-points_per_crate]: Station denied package [slip.ordernumber]. Our records show no fault on our part.
"
+ centcom_message += "-[slip.points-points_per_crate]: Station denied package [slip.ordernumber]. Our records show no fault on our part.
"
find_slip = 0
continue
@@ -280,11 +280,11 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
del(MA)
if(plasma_count)
- centcomm_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] units of exotic material.
"
+ centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] units of exotic material.
"
points += round(plasma_count / plasma_per_point)
-
+
if(crate_count)
- centcomm_message += "+[round(crate_count*points_per_crate)]: Received [crate_count] crates.
"
+ centcom_message += "+[round(crate_count*points_per_crate)]: Received [crate_count] crates.
"
points += crate_count * points_per_crate
//Buyin
@@ -324,7 +324,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
if(prob(5))
printed_station_name = new_station_name()
slip.erroneous |= MANIFEST_ERROR_NAME // They got our station name wrong. BASTARDS!
- // IDEA: Have CentComm accidentally send random low-value crates in large orders, give large bonus for returning them intact.
+ // IDEA: Have Centcom accidentally send random low-value crates in large orders, give large bonus for returning them intact.
var printed_packages_amount = supply_shuttle.shoppinglist.len
if(prob(5))
printed_packages_amount += rand(1,2) // I considered rand(-2,2), but that could be zero. Heh.
@@ -359,7 +359,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
if(SP.amount && B2:amount) B2:amount = SP.amount
slip.info += "[B2.name]" //add the item to the manifest (even if it was misplaced)
// If it has multiple items, there's a 1% of each going missing... Not for secure crates or those large wooden ones, though.
- if(contains.len > 1 && prob(1) && !findtext(SP.containertype,"/secure/") && !findtext(SP.containertype,"/largecrate/"))
+ if(contains.len > 1 && prob(1) && !findtext(SP.containertype,"/secure/") && !findtext(SP.containertype,"/largecrate/"))
slip.erroneous |= MANIFEST_ERROR_ITEM // This item was not included in the shipment!
del(B2) // Lost in space... or the loading dock.
@@ -518,7 +518,7 @@ var/datum/controller/supply_shuttle/supply_shuttle = new()
\nView requests
\n
\nView orders
\n
\nClose
-
\nCentral Command messages
[supply_shuttle.centcomm_message ? supply_shuttle.centcomm_message : "Glory to Nanotrasen."]"}
+
\nCentral Command messages
[supply_shuttle.centcom_message ? supply_shuttle.centcom_message : "Glory to Nanotrasen."]"}
user << browse(dat, "window=computer;size=700x450")
onclose(user, "computer")
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 0fcc9ad91c5..0ee8596fc29 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -51,7 +51,7 @@ var/list/admin_verbs_admin = list(
/client/proc/jumptomob, /*allows us to jump to a specific mob*/
/client/proc/jumptoturf, /*allows us to jump to a specific turf*/
/client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/
- /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcomm*/
+ /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcom*/
/client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/
/client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/
/client/proc/cmd_admin_create_centcom_report,
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index c1271f35e85..f3319758eff 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -858,7 +858,7 @@ var/global/list/g_fancy_list_of_safe_types = null
W.name = "[M.real_name]'s ID Card"
W.icon_state = "centcom"
W.access = get_all_accesses()//They get full station access.
- W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
+ W.access += get_centcom_access("Death Commando")//Let's add their alloted Centcom access.
W.assignment = "Death Commando"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
@@ -877,7 +877,7 @@ var/global/list/g_fancy_list_of_safe_types = null
var/obj/item/device/pda/heads/pda = new(M)
pda.owner = M.real_name
- pda.ownjob = "CentCom Official"
+ pda.ownjob = "Centcom Official"
pda.name = "PDA-[M.real_name] ([pda.ownjob])"
M.equip_to_slot_or_del(pda, slot_r_store)
@@ -885,10 +885,10 @@ var/global/list/g_fancy_list_of_safe_types = null
M.equip_to_slot_or_del(new /obj/item/weapon/clipboard(M), slot_l_hand)
var/obj/item/weapon/card/id/W = new(M)
- W.name = "[M.real_name]'s ID Card (CentCom Official)"
+ W.name = "[M.real_name]'s ID Card (Centcom Official)"
W.icon_state = "centcom"
- W.access = get_centcom_access("CentCom Official")
- W.assignment = "CentCom Official"
+ W.access = get_centcom_access("Centcom Official")
+ W.assignment = "Centcom Official"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
@@ -906,11 +906,11 @@ var/global/list/g_fancy_list_of_safe_types = null
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/a357(M), slot_l_store)
var/obj/item/weapon/card/id/W = new(M)
- W.name = "[M.real_name]'s ID Card (CentCom Commander)"
+ W.name = "[M.real_name]'s ID Card (Centcom Commander)"
W.icon_state = "centcom"
W.access = get_all_accesses()
- W.access += get_centcom_access("CentCom Commander")
- W.assignment = "CentCom Commander"
+ W.access += get_centcom_access("Centcom Commander")
+ W.assignment = "Centcom Commander"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
@@ -1066,4 +1066,4 @@ var/global/list/g_fancy_list_of_safe_types = null
if("Clients")
usr << dd_list2text(clients,",")
if("Joined Clients")
- usr << dd_list2text(joined_player_list,",")
+ usr << dd_list2text(joined_player_list,",")
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index fbbc240adef..45c9a8a8ba6 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -22,7 +22,7 @@
var/corpseid = 0 //Just set to 1 if you want them to have an ID
var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
- var/corpseidicon = null //For setting it to be a gold, silver, centcomm etc ID
+ var/corpseidicon = null //For setting it to be a gold, silver, centcom etc ID
/obj/effect/landmark/corpse/initialize()
createCorpse()
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 4fecbd9ee97..37a495992c3 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -1,7 +1,7 @@
/obj/item/clothing/head/centhat
- name = "\improper CentComm. hat"
+ name = "\improper Centcom hat"
icon_state = "centcom"
desc = "It's good to be emperor."
flags = FPRINT|TABLEPASS
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 1beaf541750..899aaeb3f08 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -144,7 +144,7 @@
//All of the armor below is mostly unused
-/obj/item/clothing/suit/armor/centcomm
+/obj/item/clothing/suit/armor/centcom
name = "\improper Centcomm armor"
desc = "A suit that protects against some damage."
icon_state = "centcom"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index c429f102902..4348c89329e 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -56,15 +56,15 @@
color = "vice"
/obj/item/clothing/under/rank/centcom_officer
- desc = "It's a jumpsuit worn by CentCom Officers."
- name = "\improper CentCom officer's jumpsuit"
+ desc = "It's a jumpsuit worn by Centcom Officers."
+ name = "\improper Centcom officer's jumpsuit"
icon_state = "officer"
item_state = "g_suit"
color = "officer"
/obj/item/clothing/under/rank/centcom_commander
- desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
- name = "\improper CentCom officer's jumpsuit"
+ desc = "It's a jumpsuit worn by Centcom's highest-tier Commanders."
+ name = "\improper Centcom officer's jumpsuit"
icon_state = "centcom"
item_state = "dg_suit"
color = "centcom"
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 8809cac86a4..e70ab14c98f 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -141,7 +141,7 @@
/obj/item/clothing/tie/medal/gold/heroism
name = "medal of exceptional heroism"
- desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
+ desc = "An extremely rare golden medal awarded only by Centcom. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
////////////
//Armbands//
diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm
index 58b0b9213a8..e293a602c5d 100644
--- a/code/modules/events/ninja.dm
+++ b/code/modules/events/ninja.dm
@@ -2359,7 +2359,7 @@ ________________________________________________________________________________
spark_system.set_up(5, 0, A.loc)
var/obj/machinery/power/apc/B = A.loc.loc:get_apc()//Object.turf.area find APC
- if(B)//If APC exists. Might not if the area is unpowered like CentCom.
+ if(B)//If APC exists. Might not if the area is unpowered like Centcom.
var/datum/powernet/PN = B.terminal.powernet
while(G.candrain&&!maxcapacity&&!isnull(A))//And start a proc similar to drain from wire.
drain = rand(G.mindrain,G.maxdrain)
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index e83a5173066..5ced7b62d2b 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -329,7 +329,7 @@
/mob/living/silicon/pai/proc/downloadSoftware()
var/dat = ""
- dat += "CentComm pAI Module Subversion Network
"
+ dat += "Centcom pAI Module Subversion Network
"
dat += "Remaining Available Memory: [src.ram]
"
dat += "Trunks available for checkout
"
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index e3f7f3ceac2..66c22c19062 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -25,7 +25,7 @@
var/corpseid = 0 //Just set to 1 if you want them to have an ID
var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
- var/corpseidicon = null //For setting it to be a gold, silver, centcomm etc ID
+ var/corpseidicon = null //For setting it to be a gold, silver, centcom etc ID
/obj/effect/landmark/mobcorpse/New()
createCorpse()
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index b46272ac37e..25896b7bb9d 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -286,8 +286,8 @@
var/dat = "
"
dat += "Round Duration: [round(hours)]h [round(mins)]m
"
- if(emergency_shuttle) //In case Nanotrasen decides reposess CentComm's shuttles.
- if(emergency_shuttle.direction == 2) //Shuttle is going to centcomm, not recalled
+ if(emergency_shuttle) //In case Nanotrasen decides reposess Centcom's shuttles.
+ if(emergency_shuttle.direction == 2) //Shuttle is going to centcom, not recalled
dat += "The station has been evacuated.
"
if(emergency_shuttle.direction == 1 && emergency_shuttle.timeleft() < 300) //Shuttle is past the point of no recall
dat += "The station is currently undergoing evacuation procedures.
"
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 24b807d4a30..cfc33660d10 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -95,7 +95,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
rc_msgs += new/datum/data_rc_msg(recipient,sender,message,stamp,id_auth)
/obj/machinery/message_server/attack_hand(user as mob)
-// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentCom delays."
+// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few Centcom delays."
user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]"
active = !active
update_icon()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 4960de86e52..4da8960b080 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -22,7 +22,7 @@ this dire fate:
it's data to every other device in the game. Each console has a "disconnect from network" option that'll will cause data base sync
operations to skip that console. This is useful if you want to make a "public" R&D console or, for example, give the engineers
a circuit imprinter with certain designs on it and don't want it accidentally updating. The downside of this method is that you have
-to have physical access to the other console to send data back. Note: An R&D console is on CentCom so if a random griffan happens to
+to have physical access to the other console to send data back. Note: An R&D console is on Centcom so if a random griffan happens to
cause a ton of data to be lost, an admin can go send it back.
- The second method is with Technology Disks and Design Disks. Each of these disks can hold a single technology or design datum in
it's entirety. You can then take the disk to any R&D console and upload it's data to it. This method is a lot more secure (since it
@@ -114,7 +114,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
D.linked_console = src
return
-//Have it automatically push research to the centcomm server so wild griffins can't fuck up R&D's work --NEO
+//Have it automatically push research to the centcom server so wild griffins can't fuck up R&D's work --NEO
/obj/machinery/computer/rdconsole/proc/griefProtection()
for(var/obj/machinery/r_n_d/server/centcom/C in world)
for(var/datum/tech/T in files.known_tech)
@@ -209,7 +209,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 1.2
files.AddTech2Known(t_disk.stored)
updateUsrDialog()
- griefProtection() //Update centcomm too
+ griefProtection() //Update centcom too
else if(href_list["clear_tech"]) //Erase data on the technology disk.
t_disk.stored = null
@@ -232,7 +232,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
screen = 1.4
files.AddDesign2Known(d_disk.blueprint)
updateUsrDialog()
- griefProtection() //Update centcomm too
+ griefProtection() //Update centcom too
else if(href_list["clear_design"]) //Erases data on the design disk.
d_disk.blueprint = null
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index a2f204f3173..e7aed54f818 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -95,7 +95,7 @@
-//Backup files to centcomm to help admins recover data after greifer attacks
+//Backup files to centcom to help admins recover data after greifer attacks
/obj/machinery/r_n_d/server/proc/griefProtection()
for(var/obj/machinery/r_n_d/server/centcom/C in world)
for(var/datum/tech/T in files.known_tech)