mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it keeps coming back.
This commit is contained in:
@@ -96,7 +96,7 @@ var/list/be_special_flags = list(
|
||||
#define GHOSTCAST 0x1 //can a ghost cast it?
|
||||
#define NEEDSCLOTHES 0x2 //does it need the wizard garb to cast? Nonwizard spells should not have this
|
||||
#define NEEDSHUMAN 0x4 //does it require the caster to be human?
|
||||
#define Z2NOCAST 0x8 //if this is added, the spell can't be cast at centcomm
|
||||
#define Z2NOCAST 0x8 //if this is added, the spell can't be cast at CentCom
|
||||
#define STATALLOWED 0x10 //if set, the user doesn't have to be conscious to cast. Required for ghost spells
|
||||
#define IGNOREPREV 0x20 //if set, each new target does not overlap with the previous one
|
||||
//The following flags only affect different types of spell, and therefore overlap
|
||||
|
||||
@@ -159,7 +159,7 @@ var/list/DEPT_FREQS = list(AI_FREQ, COMM_FREQ, ENG_FREQ, ENT_FREQ, MED_FREQ, SEC
|
||||
// Antags!
|
||||
if (frequency in ANTAG_FREQS)
|
||||
return "syndradio"
|
||||
// centcomm channels (deathsquid and ert)
|
||||
// CentCom channels (deathsquid and ert)
|
||||
if(frequency in CENT_FREQS)
|
||||
return "centradio"
|
||||
// command channel
|
||||
|
||||
@@ -175,7 +175,7 @@
|
||||
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
|
||||
return 0
|
||||
|
||||
if(destination.z in using_map.admin_levels) //centcomm z-level
|
||||
if(destination.z in using_map.admin_levels) //CentCom z-level
|
||||
if(istype(teleatom, /obj/mecha))
|
||||
var/obj/mecha/MM = teleatom
|
||||
MM.occupant << "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>"
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
intercept.name = "paper"
|
||||
intercept.info = intercepttext
|
||||
|
||||
comm.messagetitle.Add("Cent. Com. CONFIDENTIAL REPORT")
|
||||
comm.messagetitle.Add("CentCom CONFIDENTIAL REPORT")
|
||||
comm.messagetext.Add(intercepttext)
|
||||
|
||||
world << sound('sound/AI/commandreport.ogg')
|
||||
@@ -74,7 +74,7 @@
|
||||
intercept.name = "paper"
|
||||
intercept.info = intercepttext
|
||||
|
||||
comm.messagetitle.Add("Cent. Com. CONFIDENTIAL REPORT")
|
||||
comm.messagetitle.Add("CentCom CONFIDENTIAL REPORT")
|
||||
comm.messagetext.Add(intercepttext)
|
||||
world << sound('sound/AI/commandreport.ogg')
|
||||
|
||||
|
||||
@@ -514,7 +514,7 @@
|
||||
if((ticker.mode.name == "blob")||(ticker.mode.name == "Meteor"))
|
||||
return
|
||||
|
||||
if(!emergency_shuttle.going_to_centcom()) //check that shuttle isn't already heading to centcomm
|
||||
if(!emergency_shuttle.going_to_centcom()) //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)
|
||||
|
||||
@@ -184,7 +184,7 @@
|
||||
stat_msg2 = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40), 40)
|
||||
computer.updateDialog()
|
||||
|
||||
// OMG CENTCOMM LETTERHEAD
|
||||
// OMG CENTCOM LETTERHEAD
|
||||
if("MessageCentCom" in href_list)
|
||||
if(!computer.radio.subspace)
|
||||
return
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
network = "tcommsat"
|
||||
produces_heat = 0
|
||||
autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
|
||||
"centcomm", "receiverCent", "broadcasterCent")
|
||||
"centcom", "receiverCent", "broadcasterCent")
|
||||
|
||||
//Receivers
|
||||
|
||||
@@ -110,7 +110,7 @@
|
||||
network = "tcommsat"
|
||||
freq_listening = list(ERT_FREQ, DTH_FREQ)
|
||||
produces_heat = 0
|
||||
autolinkers = list("processorCent", "centcomm")
|
||||
autolinkers = list("processorCent", "centcom")
|
||||
|
||||
//Processors
|
||||
|
||||
@@ -203,7 +203,7 @@
|
||||
id = "CentCom Server"
|
||||
freq_listening = list(ERT_FREQ, DTH_FREQ)
|
||||
produces_heat = 0
|
||||
autolinkers = list("centcomm")
|
||||
autolinkers = list("centcom")
|
||||
|
||||
|
||||
//Broadcasters
|
||||
|
||||
@@ -40,7 +40,7 @@ var/global/list/default_medbay_channels = list(
|
||||
var/list/channels = list() //see communications.dm for full list. First channel is a "default" for :h
|
||||
var/subspace_transmission = 0
|
||||
var/syndie = 0//Holder to see if it's a syndicate encrypted radio
|
||||
var/centComm = 0//Holder to see if it's a CentComm encrypted radio
|
||||
var/centComm = 0//Holder to see if it's a CentCom encrypted radio
|
||||
flags = CONDUCT
|
||||
slot_flags = SLOT_BELT
|
||||
throw_speed = 2
|
||||
|
||||
@@ -256,7 +256,7 @@
|
||||
|
||||
/obj/item/weapon/card/id/centcom
|
||||
name = "\improper CentCom. ID"
|
||||
desc = "An ID straight from Cent. Com."
|
||||
desc = "An ID straight from Central Command."
|
||||
icon_state = "centcom"
|
||||
registered_name = "Central Command"
|
||||
assignment = "General"
|
||||
|
||||
@@ -163,7 +163,7 @@ var/list/mechtoys = list(
|
||||
proc/process()
|
||||
points += points_per_process
|
||||
|
||||
//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 centcomm. Recursively checks for these types.
|
||||
proc/forbidden_atoms_check(atom/A)
|
||||
if(istype(A,/mob/living))
|
||||
return 1
|
||||
|
||||
@@ -47,7 +47,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,
|
||||
|
||||
@@ -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
|
||||
var/species = "Human"
|
||||
|
||||
/obj/effect/landmark/corpse/initialize()
|
||||
|
||||
@@ -414,7 +414,7 @@
|
||||
//All of the armor below is mostly unused
|
||||
|
||||
/obj/item/clothing/suit/armor/centcomm
|
||||
name = "Cent. Com. armor"
|
||||
name = "CentCom armor"
|
||||
desc = "A suit that protects against some damage."
|
||||
icon_state = "centcom"
|
||||
item_state_slots = list(slot_r_hand_str = "armor", slot_l_hand_str = "armor")
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -394,7 +394,7 @@
|
||||
dat += "Round Duration: [roundduration2text()]<br>"
|
||||
|
||||
if(emergency_shuttle) //In case NanoTrasen decides reposess CentCom's shuttles.
|
||||
if(emergency_shuttle.going_to_centcom()) //Shuttle is going to centcomm, not recalled
|
||||
if(emergency_shuttle.going_to_centcom()) //Shuttle is going to CentCom, not recalled
|
||||
dat += "<font color='red'><b>The station has been evacuated.</b></font><br>"
|
||||
if(emergency_shuttle.online())
|
||||
if (emergency_shuttle.evac) // Emergency shuttle is past the point of no recall
|
||||
|
||||
@@ -97,7 +97,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
|
||||
D.linked_console = src
|
||||
return
|
||||
|
||||
/obj/machinery/computer/rdconsole/proc/griefProtection() //Have it automatically push research to the centcomm server so wild griffins can't fuck up R&D's work
|
||||
/obj/machinery/computer/rdconsole/proc/griefProtection() //Have it automatically push research to the CentCom server so wild griffins can't fuck up R&D's work
|
||||
for(var/obj/machinery/r_n_d/server/centcom/C in machines)
|
||||
for(var/datum/tech/T in files.known_tech)
|
||||
C.files.AddTech2Known(T)
|
||||
@@ -167,7 +167,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
|
||||
@@ -190,7 +190,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
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
griefProtection()
|
||||
..()
|
||||
|
||||
//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 machines)
|
||||
for(var/datum/tech/T in files.known_tech)
|
||||
|
||||
@@ -190,7 +190,7 @@ var/list/spells = typesof(/spell) //needed for the badmin verb for now
|
||||
if(!user_turf)
|
||||
user << "<span class='warning'>You cannot cast spells in null space!</span>"
|
||||
|
||||
if(spell_flags & Z2NOCAST && (user_turf.z in using_map.admin_levels)) //Certain spells are not allowed on the centcomm zlevel
|
||||
if(spell_flags & Z2NOCAST && (user_turf.z in using_map.admin_levels)) //Certain spells are not allowed on the CentCom zlevel
|
||||
return 0
|
||||
|
||||
if(spell_flags & CONSTRUCT_CHECK)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
station_short = "Northern Star"
|
||||
dock_name = "Vir Interstellar Spaceport"
|
||||
boss_name = "Central Command"
|
||||
boss_short = "Centcomm"
|
||||
boss_short = "CentCom"
|
||||
company_name = "NanoTrasen"
|
||||
company_short = "NT"
|
||||
starsys_name = "Vir"
|
||||
@@ -76,7 +76,7 @@
|
||||
|
||||
/datum/map_z_level/northern_star/centcomm
|
||||
z = Z_LEVEL_CENTCOM_NORTHERN_STAR
|
||||
name = "Centcomm"
|
||||
name = "CentCom"
|
||||
flags = MAP_LEVEL_ADMIN|MAP_LEVEL_CONTACT
|
||||
|
||||
/datum/map_z_level/northern_star/telecomms
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
station_short = "Southern Cross"
|
||||
dock_name = "NCS Northern Star" // Now we're the centcom!
|
||||
boss_name = "Central Command"
|
||||
boss_short = "Centcomm"
|
||||
boss_short = "CentCom"
|
||||
company_name = "NanoTrasen"
|
||||
company_short = "NT"
|
||||
starsys_name = "Vir"
|
||||
|
||||
Reference in New Issue
Block a user