cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 01:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

CentCom Standardization

Browse Source
This commit is contained in:
shizcalev
2017-08-07 19:04:27 -04:00
parent bf713aa91e
commit 22764665c9
74 changed files with 207 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_maps/RandomZLevels/centcomAway.dmm
View File

@@ -1817,7 +1817,7 @@
/area/awaymission/centcomAway/courtroom)
"fT" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -1932,7 +1932,7 @@
/area/awaymission/centcomAway/courtroom)
"gk" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -3830,7 +3830,7 @@
/area/awaymission/centcomAway/thunderdome)
"lO" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -4170,7 +4170,7 @@
/area/awaymission/centcomAway/general)
"mP" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},

2
_maps/basemap.dm
View File

@@ -1,4 +1,4 @@
#include "map_files\generic\Centcomm.dmm"
#include "map_files\generic\CentCom.dmm"
#include "map_files\generic\SpaceStation.dmm"
#include "map_files\generic\Space.dmm"
#include "map_files\generic\SpaceDock.dmm"

4
_maps/map_files/Deltastation/DeltaStation2.dmm
View File

@@ -68503,12 +68503,12 @@
/obj/item/weapon/folder/blue,
/obj/item/clothing/under/rank/centcom_commander{
desc = "A replica of a jumpsuit worn by the highest ranking commanders under Nanotrasen's central command.";
name = "Replica Centcom officer's jumpsuit"
name = "Replica CentCom officer's jumpsuit"
},
/obj/item/clothing/head/centhat{
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0);
desc = "A replica hat of a Central Commander's attire. It has a small tag on it saying, 'It's good to be emperor.'";
name = "Replica Centcom hat"
name = "Replica CentCom hat"
},
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -32

8
_maps/map_files/MetaStation/MetaStation.dmm
View File

@@ -79661,12 +79661,12 @@
"cVT" = (
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/under/rank/centcom_officer{
desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old Centcom jumpsuit"
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
/obj/item/clothing/under/rank/centcom_commander{
desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old Centcom jumpsuit"
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";

62
_maps/map_files/generic/Centcomm.dmm → _maps/map_files/generic/CentCom.dmm
View File

@@ -2921,7 +2921,7 @@
/area/centcom/prison)
"iG" = (
/turf/closed/indestructible/fakedoor{
name = "Centcom Cell"
name = "CentCom Cell"
},
/area/centcom/prison)
"iH" = (
@@ -2956,7 +2956,7 @@
/area/centcom/supply)
"iL" = (
/turf/closed/indestructible/fakedoor{
name = "Centcom Warehouse"
name = "CentCom Warehouse"
},
/area/centcom/supply)
"iM" = (
@@ -3061,7 +3061,7 @@
"jc" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "Centcom";
name = "CentCom";
opacity = 1;
req_access_txt = "0"
},
@@ -3323,7 +3323,7 @@
dwidth = 5;
height = 7;
id = "supply_away";
name = "Centcom";
name = "CentCom";
width = 12
},
/turf/open/space,
@@ -3814,7 +3814,7 @@
/area/centcom/supply)
"kM" = (
/turf/closed/indestructible/fakedoor{
name = "Centcom"
name = "CentCom"
},
/area/centcom/control)
"kN" = (
@@ -3863,7 +3863,7 @@
/area/centcom/control)
"kT" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -3877,7 +3877,7 @@
base_state = "rightsecure";
dir = 2;
icon_state = "leftsecure";
name = "Centcom Stand";
name = "CentCom Stand";
req_access_txt = "109"
},
/obj/machinery/light{
@@ -3914,7 +3914,7 @@
base_state = "rightsecure";
dir = 2;
icon_state = "leftsecure";
name = "Centcom Stand";
name = "CentCom Stand";
req_access_txt = "109"
},
/turf/open/floor/plasteel/grimy,
@@ -3933,7 +3933,7 @@
base_state = "rightsecure";
dir = 2;
icon_state = "leftsecure";
name = "Centcom Stand";
name = "CentCom Stand";
req_access_txt = "109"
},
/obj/machinery/light{
@@ -3957,7 +3957,7 @@
/area/centcom/supply)
"lc" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Supply";
name = "CentCom Supply";
req_access_txt = "106"
},
/obj/effect/turf_decal/stripes/line{
@@ -4153,7 +4153,7 @@
/area/centcom/control)
"lB" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -4748,7 +4748,7 @@
base_state = "rightsecure";
dir = 2;
icon_state = "leftsecure";
name = "Centcom Stand";
name = "CentCom Stand";
req_access_txt = "109"
},
/obj/machinery/firealarm{
@@ -4764,7 +4764,7 @@
base_state = "rightsecure";
dir = 2;
icon_state = "leftsecure";
name = "Centcom Stand";
name = "CentCom Stand";
req_access_txt = "109"
},
/obj/machinery/firealarm{
@@ -5232,7 +5232,7 @@
/obj/structure/table/reinforced,
/obj/machinery/door/firedoor,
/obj/machinery/door/window/brigdoor{
name = "Centcom Customs";
name = "CentCom Customs";
icon_state = "rightsecure";
dir = 4;
req_access_txt = "109";
@@ -5762,7 +5762,7 @@
/area/centcom/ferry)
"pu" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -5773,7 +5773,7 @@
/area/centcom/supply)
"pv" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom";
name = "CentCom";
opacity = 1;
req_access_txt = "0"
},
@@ -6449,7 +6449,7 @@
/area/centcom/control)
"qQ" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -6646,7 +6646,7 @@
/area/centcom/ferry)
"rw" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Supply";
name = "CentCom Supply";
req_access_txt = "106"
},
/obj/effect/turf_decal/stripes/line{
@@ -6900,7 +6900,7 @@
"rW" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "Centcom";
name = "CentCom";
opacity = 1;
req_access_txt = "0"
},
@@ -7317,7 +7317,7 @@
base_state = "rightsecure";
dir = 1;
icon_state = "rightsecure";
name = "Centcom Customs";
name = "CentCom Customs";
req_access_txt = "109"
},
/obj/machinery/door/window,
@@ -7345,7 +7345,7 @@
dwidth = 25;
height = 50;
id = "emergency_away";
name = "Centcom Emergency Shuttle Dock";
name = "CentCom Emergency Shuttle Dock";
width = 50
},
/turf/open/space,
@@ -7725,7 +7725,7 @@
"tZ" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -7779,7 +7779,7 @@
/area/centcom/ferry)
"ug" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Customs";
name = "CentCom Customs";
opacity = 1;
req_access_txt = "109"
},
@@ -7920,7 +7920,7 @@
dwidth = 2;
height = 13;
id = "ferry_away";
name = "Centcom Ferry Dock";
name = "CentCom Ferry Dock";
width = 5
},
/turf/open/space,
@@ -9158,7 +9158,7 @@
base_state = "rightsecure";
dir = 1;
icon_state = "rightsecure";
name = "Centcom Customs";
name = "CentCom Customs";
req_access_txt = "109"
},
/obj/effect/turf_decal/bot,
@@ -9182,7 +9182,7 @@
base_state = "rightsecure";
dir = 1;
icon_state = "rightsecure";
name = "Centcom Customs";
name = "CentCom Customs";
req_access_txt = "109"
},
/obj/effect/turf_decal/bot,
@@ -9749,7 +9749,7 @@
/obj/item/weapon/folder/red,
/obj/item/weapon/pen/red,
/obj/machinery/door/window/brigdoor{
name = "Centcom Customs";
name = "CentCom Customs";
icon_state = "rightsecure";
dir = 4;
req_access_txt = "109";
@@ -9764,7 +9764,7 @@
/obj/item/weapon/folder/white,
/obj/item/weapon/pen/blue,
/obj/machinery/door/window/brigdoor{
name = "Centcom Customs";
name = "CentCom Customs";
icon_state = "rightsecure";
dir = 8;
req_access_txt = "109";
@@ -10050,7 +10050,7 @@
/area/tdome/tdomeobserve)
"zT" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -13634,7 +13634,7 @@
/area/centcom/evac)
"Mb" = (
/obj/machinery/door/airlock/centcom{
name = "Centcom Security";
name = "CentCom Security";
opacity = 1;
req_access_txt = "101"
},
@@ -13645,7 +13645,7 @@
/area/centcom/evac)
"Mc" = (
/turf/closed/indestructible/fakedoor{
name = "Centcom"
name = "CentCom"
},
/area/centcom/evac)
"Md" = (

20
_maps/shuttles/emergency_raven.dmm
View File

@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 9
},
/turf/closed/wall/mineral/plastitanium{
@@ -622,7 +622,7 @@
/obj/docking_port/mobile/emergency{
dwidth = 14;
height = 18;
name = "Centcomm Raven Battlecruiser";
name = "CentCom Raven Battlecruiser";
timid = 1;
width = 32
},
@@ -978,7 +978,7 @@
/area/shuttle/escape)
"cr" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 5
},
/turf/closed/wall/mineral/plastitanium{
@@ -1002,7 +1002,7 @@
/area/shuttle/escape)
"cw" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 5
},
/turf/closed/wall/mineral/plastitanium{
@@ -1101,7 +1101,7 @@
/area/shuttle/escape)
"cR" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 5
},
/turf/closed/wall/mineral/plastitanium{
@@ -1290,7 +1290,7 @@
/area/shuttle/escape)
"dQ" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 5
},
/turf/closed/wall/mineral/plastitanium{
@@ -1312,7 +1312,7 @@
/area/shuttle/escape)
"dV" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 5
},
/turf/closed/wall/mineral/plastitanium{
@@ -1358,7 +1358,7 @@
/area/shuttle/escape)
"ei" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 10
},
/turf/closed/wall/mineral/plastitanium{
@@ -1379,7 +1379,7 @@
/area/shuttle/escape)
"en" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 6
},
/turf/closed/wall/mineral/plastitanium{
@@ -1440,7 +1440,7 @@
/area/shuttle/escape)
"eA" = (
/turf/open/space,
/obj/machinery/porta_turret/centcomm_shuttle{
/obj/machinery/porta_turret/centcom_shuttle{
dir = 5
},
/turf/closed/wall/mineral/plastitanium{

8
_maps/shuttles/whiteship_meta.dmm
View File

@@ -130,12 +130,12 @@
"aq" = (
/obj/structure/closet/wardrobe/mixed,
/obj/item/clothing/under/rank/centcom_officer{
desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old Centcom jumpsuit"
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
/obj/item/clothing/under/rank/centcom_commander{
desc = "A badge on the arm indicates that it's meant to be worn by Centcom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old Centcom jumpsuit"
desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
name = "\improper dusty old CentCom jumpsuit"
},
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";

2
code/__DEFINES/access.dm
View File

@@ -76,7 +76,7 @@
#define ACCESS_CENT_STORAGE 106//Generic storage areas.
#define ACCESS_CENT_TELEPORTER 107//Teleporter.
#define ACCESS_CENT_CAPTAIN 109//Captain's office/ID comp/AI.
#define ACCESS_CENT_BAR 110 // The non-existent Centcom Bar
#define ACCESS_CENT_BAR 110 // The non-existent CentCom Bar
//The Syndicate
#define ACCESS_SYNDICATE 150//General Syndicate Access

2
code/__DEFINES/admin.dm
View File

@@ -50,7 +50,7 @@
#define ADMIN_SM(user) "(<a href='?_src_=holder;subtlemessage=\ref[user]'>SM</a>)"
#define ADMIN_TP(user) "(<a href='?_src_=holder;traitor=\ref[user]'>TP</a>)"
#define ADMIN_KICK(user) "(<a href='?_src_=holder;boot2=\ref[user]'>KICK</a>)"
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentcommReply=\ref[user]'>RPLY</a>)"
#define ADMIN_CENTCOM_REPLY(user) "(<a href='?_src_=holder;CentComReply=\ref[user]'>RPLY</a>)"
#define ADMIN_SYNDICATE_REPLY(user) "(<a href='?_src_=holder;SyndicateReply=\ref[user]'>RPLY</a>)"
#define ADMIN_SC(user) "(<a href='?_src_=holder;adminspawncookie=\ref[user]'>SC</a>)"
#define ADMIN_SMITE(user) "(<a href='?_src_=holder;adminsmite=\ref[user]'>SMITE</a>)"

4
code/__DEFINES/maps.dm
View File

@@ -5,7 +5,7 @@ Names of z-level do not matter, but order does greatly, for instances such as ch
current as of 2016/6/2
z1 = station
z2 = centcomm
z2 = centcom
z5 = mining
Everything else = randomized space
Last space-z level = empty
@@ -16,7 +16,7 @@ Last space-z level = empty
#define UNAFFECTED 0
#define MAIN_STATION "Main Station"
#define CENTCOMM "CentComm"
#define CENTCOM "CentCom"
#define EMPTY_AREA_1 "Empty Area 1"
#define EMPTY_AREA_2 "Empty Area 2"
#define MINING "Mining Asteroid"

2
code/__DEFINES/shuttles.dm
View File

@@ -22,7 +22,7 @@
#define SHUTTLE_ALREADY_DOCKED "we_are_already_docked"
#define SHUTTLE_SOMEONE_ELSE_DOCKED "someone_else_docked"
//Launching Shuttles to Centcomm
//Launching Shuttles to CentCom
#define NOLAUNCH -1
#define UNLAUNCHED 0
#define ENDGAME_LAUNCHED 1

8
code/controllers/subsystem/shuttle.dm
View File

@@ -34,8 +34,8 @@ SUBSYSTEM_DEF(shuttle)
var/obj/docking_port/mobile/supply/supply
var/ordernum = 1 //order number given to next order
var/points = 5000 //number of trade-points we have
var/centcom_message = "" //Remarks from Centcom on how well you checked the last order.
var/list/discoveredPlants = list() //Typepaths for unusual plants we've already sent CentComm, associated with their potencies
var/centcom_message = "" //Remarks from CentCom on how well you checked the last order.
var/list/discoveredPlants = list() //Typepaths for unusual plants we've already sent CentCom, associated with their potencies
var/list/supply_packs = list()
var/list/shoppinglist = list()
@@ -183,7 +183,7 @@ SUBSYSTEM_DEF(shuttle)
switch(emergency.mode)
if(SHUTTLE_RECALL)
to_chat(user, "The emergency shuttle may not be called while returning to Centcom.")
to_chat(user, "The emergency shuttle may not be called while returning to CentCom.")
return
if(SHUTTLE_CALL)
to_chat(user, "The emergency shuttle is already on its way.")
@@ -198,7 +198,7 @@ SUBSYSTEM_DEF(shuttle)
to_chat(user, "The emergency shuttle is moving away to a safe distance.")
return
if(SHUTTLE_STRANDED)
to_chat(user, "The emergency shuttle has been disabled by Centcom.")
to_chat(user, "The emergency shuttle has been disabled by CentCom.")
return
call_reason = trim(html_encode(call_reason))

2
code/controllers/subsystem/ticker.dm
View File

@@ -474,7 +474,7 @@ SUBSYSTEM_DEF(ticker)
var/list/area/shuttle_areas
if(SSshuttle && SSshuttle.emergency)
shuttle_areas = SSshuttle.emergency.shuttle_areas
if(!Player.onCentcom() && !Player.onSyndieBase())
if(!Player.onCentCom() && !Player.onSyndieBase())
to_chat(Player, "<font color='blue'><b>You managed to survive, but were marooned on [station_name()]...</b></FONT>")
else
num_escapees++

6
code/datums/map_config.dm
View File

@@ -11,7 +11,7 @@
var/minetype = "lavaland"
var/list/transition_config = list(CENTCOMM = SELFLOOPING,
var/list/transition_config = list(CENTCOM = SELFLOOPING,
MAIN_STATION = CROSSLINKED,
EMPTY_AREA_1 = CROSSLINKED,
EMPTY_AREA_2 = CROSSLINKED,
@@ -115,8 +115,8 @@
return UNAFFECTED
if("MAIN_STATION")
return MAIN_STATION
if("CENTCOMM")
return CENTCOMM
if("CENTCOM")
return CENTCOM
if("MINING")
return MINING
if("EMPTY_AREA_1")

2
code/datums/ruins/space.dm
View File

@@ -82,7 +82,7 @@
id = "derelict4"
suffix = "derelict4.dmm"
name = "Derelict 4"
description = "Centcom ferries have never crashed, will never crash, there is no current investigation into a crashed ferry, and we will not let Internal Affairs trample over high security \
description = "CentCom ferries have never crashed, will never crash, there is no current investigation into a crashed ferry, and we will not let Internal Affairs trample over high security \
information in the name of this baseless witchhunt."
/datum/map_template/ruin/space/derelict5

10
code/datums/shuttles.dm
View File

@@ -133,7 +133,7 @@
/datum/map_template/shuttle/emergency/cramped
suffix = "cramped"
name = "Secure Transport Vessel 5 (STV5)"
description = "Well, looks like Centcomm only had this ship in the area, they probably weren't expecting you to need evac for a while. \
description = "Well, looks like CentCom only had this ship in the area, they probably weren't expecting you to need evac for a while. \
Probably best if you don't rifle around in whatever equipment they were transporting. I hope you're friendly with your coworkers, because there is very little space in this thing.\n\
\n\
Contains contraband armory guns, maintenance loot, and abandoned crates!"
@@ -181,7 +181,7 @@
suffix = "supermatter"
name = "Hyperfractal Gigashuttle"
description = "\"I dunno, this seems kinda needlessly complicated.\"\n\
\"This shuttle has very a very high safety record, according to Centcom Officer Cadet Yins.\"\n\
\"This shuttle has very a very high safety record, according to CentCom Officer Cadet Yins.\"\n\
\"Are you sure?\"\n\
\"Yes, it has a safety record of N-A-N, which is apparently larger than 100%.\""
admin_notes = "Supermatter that spawns on shuttle is special anchored 'hugbox' supermatter that cannot take damage and does not take in or emit gas. \
@@ -215,7 +215,7 @@
/datum/map_template/shuttle/ferry/base
suffix = "base"
name = "transport ferry"
description = "Standard issue Box/Metastation Centcom ferry."
description = "Standard issue Box/Metastation CentCom ferry."
/datum/map_template/shuttle/ferry/meat
suffix = "meat"
@@ -267,7 +267,7 @@
/datum/map_template/shuttle/emergency/raven
suffix = "raven"
name = "Centcomm Raven Battlecruiser"
description = "The Centcomm Raven Battlecruiser is currently docked at the Centcomm ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The Centcomm Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range Centcomm Medical Bay."
name = "CentCom Raven Battlecruiser"
description = "The CentCom Raven Battlecruiser is currently docked at the CentCom ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The CentCom Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range CentCom Medical Bay."
admin_notes = "The long way home"
credit_cost = 12500

2
code/game/area/areas.dm
View File

@@ -41,7 +41,7 @@
var/static_environ
var/has_gravity = FALSE
var/noteleport = FALSE //Are you forbidden from teleporting to the area? (centcomm, mobs, wizard, hand teleporter)
var/noteleport = FALSE //Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
var/hidden = FALSE //Hides area from player Teleport function.
var/safe = FALSE //Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers

10
code/game/area/areas/centcom.dm
View File

@@ -2,7 +2,7 @@
// CENTCOM
/area/centcom
name = "Centcom"
name = "CentCom"
icon_state = "centcom"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = FALSE
@@ -12,16 +12,16 @@
flags = NONE
/area/centcom/control
name = "Centcom Docks"
name = "CentCom Docks"
/area/centcom/evac
name = "Centcom Recovery Ship"
name = "CentCom Recovery Ship"
/area/centcom/supply
name = "Centcom Supply Shuttle Dock"
name = "CentCom Supply Shuttle Dock"
/area/centcom/ferry
name = "Centcom Transport Shuttle Dock"
name = "CentCom Transport Shuttle Dock"
/area/centcom/prison
name = "Admin Prison"

4
code/game/atoms.dm
View File

@@ -105,7 +105,7 @@
/atom/proc/CanPass(atom/movable/mover, turf/target)
return !density
/atom/proc/onCentcom()
/atom/proc/onCentCom()
var/turf/T = get_turf(src)
if(!T)
return FALSE
@@ -126,7 +126,7 @@
if(istype(T.loc, /area/centcom))
return TRUE
//Check for centcomm shuttles
//Check for centcom shuttles
for(var/A in SSshuttle.mobile)
var/obj/docking_port/mobile/M = A
if(M.launch_status == ENDGAME_LAUNCHED)

2
code/game/atoms_movable.dm
View File

@@ -530,7 +530,7 @@
/* Stationloving
*
* A stationloving atom will always teleport back to the station
* if it ever leaves the station z-levels or Centcom. It will also,
* if it ever leaves the station z-levels or CentCom. It will also,
* when Destroy() is called, will teleport to a random turf on the
* station.
*

4
code/game/communications.dm
View File

@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
"Medical" = 1355,
"Engineering" = 1357,
"Security" = 1359,
"Centcom" = 1337,
"CentCom" = 1337,
"Syndicate" = 1213,
"Supply" = 1347,
"Service" = 1349,
@@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
"1355" = "Medical",
"1357" = "Engineering",
"1359" = "Security",
"1337" = "Centcom",
"1337" = "CentCom",
"1213" = "Syndicate",
"1347" = "Supply",
"1349" = "Service",

2
code/game/gamemodes/cult/cult.dm
View File

@@ -203,7 +203,7 @@
var/acolytes_survived = 0
for(var/datum/mind/cult_mind in cult)
if (cult_mind.current && cult_mind.current.stat != DEAD)
if(cult_mind.current.onCentcom() || cult_mind.current.onSyndieBase())
if(cult_mind.current.onCentCom() || cult_mind.current.onSyndieBase())
acolytes_survived++
if(acolytes_survived>=acolytes_needed)
return 0

4
code/game/gamemodes/meteor/meteor.dm
View File

@@ -37,8 +37,8 @@
if(player.stat != DEAD)
++survivors
if(player.onCentcom())
text += "<br><b><font size=2>[player.real_name] escaped to the safety of Centcom.</font></b>"
if(player.onCentCom())
text += "<br><b><font size=2>[player.real_name] escaped to the safety of CentCom.</font></b>"
else if(player.onSyndieBase())
text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
else

6
code/game/gamemodes/miniantags/monkey/monkey.dm
View File

@@ -41,7 +41,7 @@
/datum/game_mode/monkey/announce()
to_chat(world, "<B>The current game mode is - Monkey!</B>")
to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to Centcom. \
to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. \
Monkeys: Ensure that your kind lives on! Rise up against your captors!</B>")
@@ -50,7 +50,7 @@
to_chat(carrier.current, "<b>You have been planted onto this station by the Animal Rights Consortium.</b>")
to_chat(carrier.current, "<b>Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.</b>")
to_chat(carrier.current, "<b>While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.</b>")
to_chat(carrier.current, "<b>Your mission will be deemed a success if any of the live infected monkeys reach Centcom.</b>")
to_chat(carrier.current, "<b>Your mission will be deemed a success if any of the live infected monkeys reach CentCom.</b>")
return
/datum/game_mode/monkey/post_setup()
@@ -88,7 +88,7 @@
var/datum/disease/D = new /datum/disease/transformation/jungle_fever()
for(var/mob/living/carbon/monkey/M in GLOB.living_mob_list)
if (M.HasDisease(D))
if(M.onCentcom() || M.onSyndieBase())
if(M.onCentCom() || M.onSyndieBase())
escaped_monkeys++
if(escaped_monkeys >= monkeys_to_win)
return 1

2
code/game/gamemodes/nuclear/nuclear.dm
View File

@@ -187,7 +187,7 @@
/datum/game_mode/nuclear/declare_completion()
var/disk_rescued = 1
for(var/obj/item/weapon/disk/nuclear/D in GLOB.poi_list)
if(!D.onCentcom())
if(!D.onCentCom())
disk_rescued = 0
break
var/crew_evacuated = (SSshuttle.emergency.mode == SHUTTLE_ENDGAME)

14
code/game/gamemodes/objective.dm
View File

@@ -157,7 +157,7 @@
H = target.current
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
if(target.current.onCentcom() || target.current.onSyndieBase())
if(target.current.onCentCom() || target.current.onSyndieBase())
return 0
return 1
@@ -357,7 +357,7 @@
if(istype(location, /turf/open/floor/plasteel/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
return 0
if(location.onCentcom() || location.onSyndieBase())
if(location.onCentCom() || location.onSyndieBase())
return 1
return 0
@@ -832,15 +832,15 @@ GLOBAL_LIST_EMPTY(possible_items_special)
var/list/check_names = department_real_names.Copy()
//Check each department member's mind to see if any of them made it to centcomm alive, if they did it's an automatic fail
//Check each department member's mind to see if any of them made it to centcom alive, if they did it's an automatic fail
for(var/datum/mind/M in department_minds)
if(M in SSticker.mode.changelings) //Lings aren't picked for this, but let's be safe
continue
if(M.current)
var/turf/mloc = get_turf(M.current)
if(mloc.onCentcom() && (M.current.stat != DEAD))
return 0 //A Non-ling living target got to centcomm, fail
if(mloc.onCentCom() && (M.current.stat != DEAD))
return 0 //A Non-ling living target got to centcom, fail
//Check each staff member has been replaced, by cross referencing changeling minds, changeling current dna, the staff minds and their original DNA names
var/success = 0
@@ -851,11 +851,11 @@ GLOBAL_LIST_EMPTY(possible_items_special)
if(ishuman(changeling.current))
var/mob/living/carbon/human/H = changeling.current
var/turf/cloc = get_turf(changeling.current)
if(cloc && cloc.onCentcom() && (changeling.current.stat != DEAD)) //Living changeling on centcomm....
if(cloc && cloc.onCentCom() && (changeling.current.stat != DEAD)) //Living changeling on centcom....
for(var/name in check_names) //Is he (disguised as) one of the staff?
if(H.dna.real_name == name)
check_names -= name //This staff member is accounted for, remove them, so the team don't succeed by escape as 7 of the same engineer
success++ //A living changeling staff member made it to centcomm
success++ //A living changeling staff member made it to centcom
continue changelings
if(success >= department_minds.len)

2
code/game/machinery/computer/buildandrepair.dm
View File

@@ -212,7 +212,7 @@
build_path = /obj/machinery/computer/card
origin_tech = "programming=3"
/obj/item/weapon/circuitboard/computer/card/centcom
name = "Centcom ID Console (Computer Board)"
name = "CentCom ID Console (Computer Board)"
build_path = /obj/machinery/computer/card/centcom
/obj/item/weapon/circuitboard/computer/card/minor

2
code/game/machinery/computer/card.dm
View File

@@ -562,7 +562,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
head_subordinates += job.title
/obj/machinery/computer/card/centcom
name = "\improper Centcom identification console"
name = "\improper CentCom identification console"
circuit = /obj/item/weapon/circuitboard/computer/card/centcom
req_access = list(ACCESS_CENT_CAPTAIN)

12
code/game/machinery/computer/communications.dm
View File

@@ -267,18 +267,18 @@
src.updateDialog()
// OMG CENTCOM LETTERHEAD
if("MessageCentcomm")
if("MessageCentCom")
if(src.authenticated==2)
if(!checkCCcooldown())
to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
return
var/input = stripped_input(usr, "Please choose a message to transmit to Centcom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to Centcomm.", "")
var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to CentCom.", "")
if(!input || !(usr in view(1,src)) || !checkCCcooldown())
return
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
Centcomm_announce(input, usr)
CentCom_announce(input, usr)
to_chat(usr, "<span class='notice'>Message transmitted to Central Command.</span>")
log_talk(usr,"[key_name(usr)] has made a Centcom announcement: [input]",LOGSAY)
log_talk(usr,"[key_name(usr)] has made a CentCom announcement: [input]",LOGSAY)
CM.lastTimeUsed = world.time
@@ -314,7 +314,7 @@
return
Nuke_request(input, usr)
to_chat(usr, "<span class='notice'>Request sent.</span>")
log_talk(usr,"[key_name(usr)] has requested the nuclear codes from Centcomm",LOGSAY)
log_talk(usr,"[key_name(usr)] has requested the nuclear codes from CentCom",LOGSAY)
priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/ai/commandreport.ogg')
CM.lastTimeUsed = world.time
@@ -461,7 +461,7 @@
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
if(!emagged)
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentcomm'>Send Message to Centcom</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentCom'>Send Message to CentCom</A> \]"
else
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageSyndicate'>Send Message to \[UNKNOWN\]</A> \]"
dat += "<BR>\[ <A HREF='?src=\ref[src];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"

2
code/game/machinery/computer/crew.dm
View File

@@ -66,7 +66,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
jobs["Janitor"] = 68
jobs["Lawyer"] = 69
jobs["Admiral"] = 200
jobs["Centcom Commander"] = 210
jobs["CentCom Commander"] = 210
jobs["Custodian"] = 211
jobs["Medical Officer"] = 212
jobs["Research Officer"] = 213

2
code/game/machinery/computer/crew.js
View File

@@ -421,7 +421,7 @@ function getColor(ijob)
else if (ijob >= 30 && ijob < 40) { return "#9B59B6"; } // science
else if (ijob >= 40 && ijob < 50) { return "#F1C40F"; } // engineering
else if (ijob >= 50 && ijob < 60) { return "#F39C12"; } // cargo
else if (ijob >= 200 && ijob < 230) { return "#00C100"; } // Centcom
else if (ijob >= 200 && ijob < 230) { return "#00C100"; } // CentCom
else { return "#C38312"; } // other / unknown
}

2
code/game/machinery/doors/airlock_types.dm
View File

@@ -266,7 +266,7 @@
//////////////////////////////////
/*
Centcom Airlocks
CentCom Airlocks
*/
/obj/machinery/door/airlock/centcom

6
code/game/machinery/porta_turret/portable_turret.dm
View File

@@ -607,7 +607,7 @@
cover.name = name
cover.desc = desc
/obj/machinery/porta_turret/centcomm_shuttle
/obj/machinery/porta_turret/centcom_shuttle
installation = null
max_integrity = 260
always_up = 1
@@ -624,10 +624,10 @@
emp_vunerable = 0
mode = TURRET_LETHAL
/obj/machinery/porta_turret/centcomm_shuttle/assess_perp(mob/living/carbon/human/perp)
/obj/machinery/porta_turret/centcom_shuttle/assess_perp(mob/living/carbon/human/perp)
return 0
/obj/machinery/porta_turret/centcomm_shuttle/setup()
/obj/machinery/porta_turret/centcom_shuttle/setup()
return
////////////////////////

2
code/game/machinery/telecomms/broadcasting.dm
View File

@@ -102,7 +102,7 @@
// --- This space left blank for Syndicate data ---
// --- Centcom radio, yo. ---
// --- CentCom radio, yo. ---
else if(data == 5)

4
code/game/objects/effects/contraband.dm
View File

@@ -249,7 +249,7 @@
/obj/structure/sign/poster/contraband/tools
name = "Tools"
desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm."
desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom."
icon_state = "poster15"
/obj/structure/sign/poster/contraband/power
@@ -284,7 +284,7 @@
/obj/structure/sign/poster/contraband/kss13
name = "Kosmicheskaya Stantsiya 13 Does Not Exist"
desc = "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13."
desc = "A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13."
icon_state = "poster22"
/obj/structure/sign/poster/contraband/rebels_unite

4
code/game/objects/items/devices/PDA/cart.dm
View File

@@ -440,12 +440,12 @@ Code:
if(SSshuttle.supply.z != ZLEVEL_STATION)
menu += "station"
else
menu += "centcomm"
menu += "centcom"
menu += " ([SSshuttle.supply.timeLeft(600)] Mins)"
else
menu += "At "
if(SSshuttle.supply.z != ZLEVEL_STATION)
menu += "centcomm"
menu += "centcom"
else
menu += "station"
menu += "<BR>Current approved orders: <BR><ol>"

2
code/game/objects/items/devices/radio/encryptionkey.dm
View File

@@ -126,7 +126,7 @@
desc = "An encryption key for a radio headset. To access the centcom channel, use :y."
icon_state = "cent_cypherkey"
independent = TRUE
channels = list("Centcom" = 1)
channels = list("CentCom" = 1)
/obj/item/device/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)

4
code/game/objects/items/devices/radio/headset.dm
View File

@@ -196,7 +196,7 @@
keyslot = new /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/headset_cent
name = "\improper Centcom headset"
name = "\improper CentCom headset"
desc = "A headset used by the upper echelons of Nanotrasen. \nTo access the centcom channel, use :y."
icon_state = "cent_headset"
keyslot = new /obj/item/device/encryptionkey/headset_com
@@ -206,7 +206,7 @@
keyslot = new /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/headset_cent/alt
name = "\improper Centcom bowman headset"
name = "\improper CentCom bowman headset"
desc = "A headset especially for emergency response personnel. Protects ears from flashbangs. \nTo access the centcom channel, use :y."
icon_state = "cent_headset_alt"
item_state = "cent_headset_alt"

4
code/game/objects/items/weapons/cards_ids.dm
View File

@@ -223,7 +223,7 @@ update_label("John Doe", "Clowny")
..()
/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"
@@ -234,7 +234,7 @@ update_label("John Doe", "Clowny")
..()
/obj/item/weapon/card/id/ert
name = "\improper Centcom ID"
name = "\improper CentCom ID"
desc = "A ERT ID card"
icon_state = "centcom"
registered_name = "Emergency Response Team Commander"

2
code/game/objects/structures/bedsheet_bin.dm
View File

@@ -183,7 +183,7 @@ LINEN BINS
dream_messages = list("black")
/obj/item/weapon/bedsheet/centcom
name = "\improper Centcom bedsheet"
name = "\improper CentCom bedsheet"
desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
icon_state = "sheetcentcom"
item_color = "centcom"

2
code/game/objects/structures/morgue.dm
View File

@@ -140,7 +140,7 @@
/obj/item/weapon/paper/guides/jobs/medical/morgue
name = "morgue memo"
info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- Centcom medical inspector"
info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- CentCom medical inspector"
/*
* Crematorium

4
code/game/objects/structures/showcase.dm
View File

@@ -12,7 +12,7 @@
var/deconstruction_state = SHOWCASE_CONSTRUCTED
/obj/structure/showcase/fakeid
name = "\improper Centcom identification console"
name = "\improper CentCom identification console"
desc = "You can use this to change ID's."
icon = 'icons/obj/computer.dmi'
icon_state = "computer"
@@ -23,7 +23,7 @@
add_overlay("id_key")
/obj/structure/showcase/fakesec
name = "\improper Centcom security records"
name = "\improper CentCom security records"
desc = "Used to view and edit personnel's security records"
icon = 'icons/obj/computer.dmi'
icon_state = "computer"

2
code/game/turfs/closed.dm
View File

@@ -75,7 +75,7 @@
underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille
/turf/closed/indestructible/fakedoor
name = "Centcom Access"
name = "CentCom Access"
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
icon_state = "fake_door"

4
code/modules/admin/secrets.dm
View File

@@ -214,7 +214,7 @@
if("moveferry")
if(!check_rights(R_ADMIN))
return
SSblackbox.add_details("admin_secrets_fun_used","Send Centcom Ferry")
SSblackbox.add_details("admin_secrets_fun_used","Send CentCom Ferry")
if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
message_admins("[key_name_admin(usr)] moved the centcom ferry")
log_admin("[key_name(usr)] moved the centcom ferry")
@@ -457,7 +457,7 @@
if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
W.req_access = list()
message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
priority_announce("Centcom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
if("guns")
if(!check_rights(R_FUN))

24
code/modules/admin/topic.dm
View File

@@ -102,13 +102,13 @@
message_admins("[key_name(usr)] tried to create gangs. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed create gangs.")
if("centcom")
message_admins("[key_name(usr)] is creating a Centcom response team...")
message_admins("[key_name(usr)] is creating a CentCom response team...")
if(src.makeEmergencyresponseteam())
message_admins("[key_name(usr)] created a Centcom response team.")
log_admin("[key_name(usr)] created a Centcom response team.")
message_admins("[key_name(usr)] created a CentCom response team.")
log_admin("[key_name(usr)] created a CentCom response team.")
else
message_admins("[key_name_admin(usr)] tried to create a Centcom response team. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create a Centcom response team.")
message_admins("[key_name_admin(usr)] tried to create a CentCom response team. Unfortunately, there were not enough candidates available.")
log_admin("[key_name(usr)] failed to create a CentCom response team.")
if("abductors")
message_admins("[key_name(usr)] is creating an abductor team...")
if(src.makeAbductorTeam())
@@ -1704,8 +1704,8 @@
usr.client.smite(H)
else if(href_list["CentcommReply"])
var/mob/living/carbon/human/H = locate(href_list["CentcommReply"]) in GLOB.mob_list
else if(href_list["CentComReply"])
var/mob/living/carbon/human/H = locate(href_list["CentComReply"]) in GLOB.mob_list
if(!istype(H))
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
return
@@ -1713,15 +1713,15 @@
to_chat(usr, "The person you are trying to contact is not wearing a headset.")
return
message_admins("[src.owner] has started answering [key_name(H)]'s Centcomm request.")
var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcom", "")
message_admins("[src.owner] has started answering [key_name(H)]'s CentCom request.")
var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from CentCom", "")
if(!input)
message_admins("[src.owner] decided not to answer [key_name(H)]'s Centcomm request.")
message_admins("[src.owner] decided not to answer [key_name(H)]'s CentCom request.")
return
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
log_admin("[src.owner] replied to [key_name(H)]'s Centcom message with the message [input].")
message_admins("[src.owner] replied to [key_name(H)]'s Centcom message with: \"[input]\"")
log_admin("[src.owner] replied to [key_name(H)]'s CentCom message with the message [input].")
message_admins("[src.owner] replied to [key_name(H)]'s CentCom message with: \"[input]\"")
to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"")
else if(href_list["SyndicateReply"])

16
code/modules/admin/verbs/one_click_antag.dm
View File

@@ -20,7 +20,7 @@
<a href='?src=\ref[src];makeAntag=gangs'>Make Gangsters</a><br>
<a href='?src=\ref[src];makeAntag=wizard'>Make Wizard (Requires Ghosts)</a><br>
<a href='?src=\ref[src];makeAntag=nukeops'>Make Nuke Team (Requires Ghosts)</a><br>
<a href='?src=\ref[src];makeAntag=centcom'>Make Centcom Response Team (Requires Ghosts)</a><br>
<a href='?src=\ref[src];makeAntag=centcom'>Make CentCom Response Team (Requires Ghosts)</a><br>
<a href='?src=\ref[src];makeAntag=abductors'>Make Abductor Team (Requires Ghosts)</a><br>
<a href='?src=\ref[src];makeAntag=revenant'>Make Revenant (Requires Ghost)</a><br>
"}
@@ -397,7 +397,7 @@
/datum/admins/proc/makeOfficial()
var/mission = input("Assign a task for the official", "Assign Task", "Conduct a routine preformance review of [station_name()] and its Captain.")
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a Centcom Official?", "deathsquad")
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a CentCom Official?", "deathsquad")
if(candidates.len)
var/mob/dead/observer/chosen_candidate = pick(candidates)
@@ -408,7 +408,7 @@
newmob.real_name = newmob.dna.species.random_name(newmob.gender,1)
newmob.dna.update_dna_identity()
newmob.key = chosen_candidate.key
newmob.mind.assigned_role = "Centcom Official"
newmob.mind.assigned_role = "CentCom Official"
newmob.equipOutfit(/datum/outfit/centcom_official)
//Assign antag status and the mission
@@ -424,12 +424,12 @@
newmob.set_species(/datum/species/human)
//Greet the official
to_chat(newmob, "<B><font size=3 color=red>You are a Centcom Official.</font></B>")
to_chat(newmob, "<B><font size=3 color=red>You are a CentCom Official.</font></B>")
to_chat(newmob, "<BR>Central Command is sending you to [station_name()] with the task: [mission]")
//Logging and cleanup
message_admins("Centcom Official [key_name_admin(newmob)] has spawned with the task: [mission]")
log_game("[key_name(newmob)] has been selected as a Centcom Official")
message_admins("CentCom Official [key_name_admin(newmob)] has spawned with the task: [mission]")
log_game("[key_name(newmob)] has been selected as a CentCom Official")
return 1
@@ -437,7 +437,7 @@
// CENTCOM RESPONSE TEAM
/datum/admins/proc/makeEmergencyresponseteam()
var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad")
var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: CentCom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad")
if(!alert)
return
switch(alert)
@@ -449,7 +449,7 @@
alert = "Amber"
if("Blue: Light ERT (No Armoury Access)")
alert = "Blue"
if("Green: Centcom Official")
if("Green: CentCom Official")
return makeOfficial()
var/teamcheck = input("Maximum size of team? (7 max)", "Select Team Size",4) as null|num
if(isnull(teamcheck))

2
code/modules/admin/verbs/pray.dm
View File

@@ -46,7 +46,7 @@
SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//log_admin("HELP: [key_name(src)]: [msg]")
/proc/Centcomm_announce(text , mob/Sender)
/proc/CentCom_announce(text , mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<span class='adminnotice'><b><font color=orange>CENTCOM:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]:</b> [msg]</span>"
to_chat(GLOB.admins, msg)

4
code/modules/admin/verbs/randomverbs.dm
View File

@@ -1208,6 +1208,6 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!message)
return
message_admins("[key_name_admin(usr)] triggered a Centcom recall, with the admiral message of: [message]")
log_game("[key_name(usr)] triggered a Centcom recall, with the message of: [message]")
message_admins("[key_name_admin(usr)] triggered a CentCom recall, with the admiral message of: [message]")
log_game("[key_name(usr)] triggered a CentCom recall, with the message of: [message]")
SSshuttle.centcom_recall(SSshuttle.emergency.timer, message)

2
code/modules/awaymissions/mission_code/moonoutpost19.dm
View File

@@ -66,7 +66,7 @@
/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/gerald
name = "Personal Log - Gerald Rosswell"
info = "Personal Log for Research Director Gerald Rosswell<br><br>Entry One - 17/05/2554:<br>You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.<br><br>Entry Two - 25/05/2554:<br>Well, we all expected it at the outpost, CentComm has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.<br><br>Entry Three - 27/05/2554:<br>The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.<br><br>Entry Four - 06/06/2554:<br>My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.<br><br>Entry Five - 10/06/2554:<br>Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.<br><br>Entry Six - 17/06/2554:<br>The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."
info = "Personal Log for Research Director Gerald Rosswell<br><br>Entry One - 17/05/2554:<br>You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.<br><br>Entry Two - 25/05/2554:<br>Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.<br><br>Entry Three - 27/05/2554:<br>The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.<br><br>Entry Four - 06/06/2554:<br>My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.<br><br>Entry Five - 10/06/2554:<br>Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.<br><br>Entry Six - 17/06/2554:<br>The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."
/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/food_specials
name = "Specials This Week"

2
code/modules/cargo/console.dm
View File

@@ -122,7 +122,7 @@
return
else
SSshuttle.shuttle_loan.loan_shuttle()
say("The supply shuttle has been loaned to Centcom.")
say("The supply shuttle has been loaned to CentCom.")
. = TRUE
if("add")
var/id = text2path(params["id"])

2
code/modules/cargo/exports.dm
View File

@@ -1,5 +1,5 @@
/* How it works:
The shuttle arrives at Centcom dock and calls sell(), which recursively loops through all the shuttle contents that are unanchored.
The shuttle arrives at CentCom dock and calls sell(), which recursively loops through all the shuttle contents that are unanchored.
The loop only checks contents of storage types, see supply.dm shuttle code.
Each object in the loop is checked for applies_to() of various export datums, except the invalid ones.

2
code/modules/clothing/head/misc.dm
View File

@@ -1,7 +1,7 @@
/obj/item/clothing/head/centhat
name = "\improper Centcom hat"
name = "\improper CentCom hat"
icon_state = "centcom"
desc = "It's good to be emperor."
item_state = "that"

8
code/modules/clothing/outfits/ert.dm
View File

@@ -161,7 +161,7 @@
/datum/outfit/centcom_official
name = "Centcom Official"
name = "CentCom Official"
uniform = /obj/item/clothing/under/rank/centcom_officer
shoes = /obj/item/clothing/shoes/sneakers/black
@@ -181,13 +181,13 @@
var/obj/item/device/pda/heads/pda = H.r_store
pda.owner = H.real_name
pda.ownjob = "Centcom Official"
pda.ownjob = "CentCom Official"
pda.update_label()
var/obj/item/weapon/card/id/W = H.wear_id
W.icon_state = "centcom"
W.access = get_centcom_access("Centcom Official")
W.access = get_centcom_access("CentCom Official")
W.access += ACCESS_WEAPONS
W.assignment = "Centcom Official"
W.assignment = "CentCom Official"
W.registered_name = H.real_name
W.update_label()

8
code/modules/clothing/outfits/standard.dm
View File

@@ -182,7 +182,7 @@
W.update_label(H.real_name)
/datum/outfit/centcom_commander
name = "Centcom Commander"
name = "CentCom Commander"
uniform = /obj/item/clothing/under/rank/centcom_commander
suit = /obj/item/clothing/suit/armor/bulletproof
@@ -205,8 +205,8 @@
var/obj/item/weapon/card/id/W = H.wear_id
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 = H.real_name
W.update_label()
@@ -374,7 +374,7 @@
var/obj/item/weapon/card/id/W = H.wear_id
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 = H.real_name
W.update_label(W.registered_name, W.assignment)

8
code/modules/clothing/spacesuits/miscellaneous.dm
View File

@@ -82,7 +82,7 @@ Contains:
//NASA Voidsuit
/obj/item/clothing/head/helmet/space/nasavoid
name = "NASA Void Helmet"
desc = "An old, NASA Centcom branch designed, dark red space suit helmet."
desc = "An old, NASA CentCom branch designed, dark red space suit helmet."
icon_state = "void"
item_state = "void"
@@ -90,12 +90,12 @@ Contains:
name = "NASA Voidsuit"
icon_state = "void"
item_state = "void"
desc = "An old, NASA Centcom branch designed, dark red space suit."
desc = "An old, NASA CentCom branch designed, dark red space suit."
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/device/multitool)
/obj/item/clothing/head/helmet/space/nasavoid/old
name = "Engineering Void Helmet"
desc = "A Centcom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
icon_state = "void"
item_state = "void"
@@ -103,7 +103,7 @@ Contains:
name = "Engineering Voidsuit"
icon_state = "void"
item_state = "void"
desc = "A Centcom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
desc = "A CentCom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
slowdown = 4
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/device/multitool)

2
code/modules/clothing/suits/armor.dm
View File

@@ -341,7 +341,7 @@
//All of the armor below is mostly unused
/obj/item/clothing/suit/armor/centcom
name = "\improper Centcom armor"
name = "\improper CentCom armor"
desc = "A suit that protects against some damage."
icon_state = "centcom"
item_state = "centcom"

2
code/modules/clothing/under/accessories.dm
View File

@@ -182,7 +182,7 @@
/obj/item/clothing/accessory/medal/gold/heroism
name = "medal of exceptional heroism"
desc = "An extremely rare golden medal awarded only by Centcom. To receive 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 receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
/obj/item/clothing/accessory/medal/plasma
name = "plasma medal"

8
code/modules/clothing/under/miscellaneous.dm
View File

@@ -104,16 +104,16 @@
can_adjust = 0
/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"
item_color = "officer"
alt_covers_chest = 1
/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"
item_color = "centcom"

14
code/modules/events/shuttle_loan.dm
View File

@@ -27,22 +27,22 @@
SSshuttle.shuttle_loan = src
switch(dispatch_type)
if(HIJACK_SYNDIE)
priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","Centcom Counter Intelligence")
priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","CentCom Counter Intelligence")
if(RUSKY_PARTY)
priority_announce("Cargo: A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","Centcom Russian Outreach Program")
priority_announce("Cargo: A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","CentCom Russian Outreach Program")
if(SPIDER_GIFT)
priority_announce("Cargo: The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","Centcom Diplomatic Corps")
priority_announce("Cargo: The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","CentCom Diplomatic Corps")
if(DEPARTMENT_RESUPPLY)
priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","Centcom Supply Department")
priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","CentCom Supply Department")
thanks_msg = "The cargo shuttle should return in 5 minutes."
bonus_points = 0
if(ANTIDOTE_NEEDED)
priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "Centcom Research Initiatives")
priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "CentCom Research Initiatives")
if (PIZZA_DELIVERY)
priority_announce("Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead", "Centcom Spacepizza Division")
priority_announce("Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead", "CentCom Spacepizza Division")
/datum/round_event/shuttle_loan/proc/loan_shuttle()
priority_announce(thanks_msg, "Cargo shuttle commandeered by Centcom.")
priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.")
dispatched = 1
SSshuttle.points += bonus_points

2
code/modules/hydroponics/seeds.dm
View File

@@ -23,7 +23,7 @@
var/yield = 3 // Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested.
var/potency = 10 // The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways.
var/growthstages = 6 // Amount of growth sprites the plant has.
var/rarity = 0 // How rare the plant is. Used for giving points to cargo when shipping off to Centcom.
var/rarity = 0 // How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
var/list/mutatelist = list() // The type of plants that this plant can mutate into.
var/list/genes = list() // Plant genes are stored here, see plant_genes.dm for more info.
var/list/reagents_add = list()

12
code/modules/jobs/access.dm
View File

@@ -111,7 +111,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)
@@ -123,7 +123,7 @@
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
if("Admiral")
return get_all_centcom_access()
if("Centcom Commander")
if("CentCom Commander")
return get_all_centcom_access()
if("Emergency Response Team Commander")
return get_ert_access("commander")
@@ -133,7 +133,7 @@
return get_ert_access("eng")
if("Medical Response Officer")
return get_ert_access("med")
if("Centcom Bartender")
if("CentCom Bartender")
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_BAR)
/proc/get_all_accesses()
@@ -370,7 +370,7 @@
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","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","Centcom Bartender")
return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender")
/obj/item/proc/GetJobName() //Used in secHUD icon generation
var/obj/item/weapon/card/id/I = GetID()
@@ -379,6 +379,6 @@
var/jobName = I.assignment
if(jobName in get_all_job_icons()) //Check if the job has a hud icon
return jobName
if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a Centcom job
return "Centcom"
if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a CentCom job
return "CentCom"
return "Unknown" //Return unknown if none of the above apply

2
code/modules/jobs/job_types/captain.dm
View File

@@ -4,7 +4,7 @@ Captain
/datum/job/captain
title = "Captain"
flag = CAPTAIN
department_head = list("Centcom")
department_head = list("CentCom")
department_flag = ENGSEC
faction = "Station"
total_positions = 1

2
code/modules/mob/living/living.dm
View File

@@ -752,7 +752,7 @@
var/turf/T = get_turf(src)
if(!T)
return 0
if(T.z == ZLEVEL_CENTCOM) //dont detect mobs on centcomm
if(T.z == ZLEVEL_CENTCOM) //dont detect mobs on centcom
return 0
if(T.z >= ZLEVEL_SPACEMAX)
return 0

2
code/modules/mob/living/say.dm
View File

@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Faction
"t" = "Syndicate",
"y" = "Centcom",
"y" = "CentCom",
// Species
"b" = "binary",

2
code/modules/mob/living/silicon/pai/software.dm
View File

@@ -331,7 +331,7 @@
/mob/living/silicon/pai/proc/downloadSoftware()
var/dat = ""
dat += "<h2>Centcom pAI Module Subversion Network</h2><br>"
dat += "<h2>CentCom pAI Module Subversion Network</h2><br>"
dat += "<pre>Remaining Available Memory: [src.ram]</pre><br>"
dat += "<p style=\"text-align:center\"><b>Trunks available for checkout</b><br>"

2
code/modules/paperwork/contract.dm
View File

@@ -36,7 +36,7 @@
if(M.mind == target && !M.owns_soul())
if(user.mind && (user.mind.assigned_role == "Lawyer"))
deconvert = TRUE
else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "Centcom Commander"))
else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "CentCom Commander"))
deconvert = prob (25) // the HoP doesn't have AS much legal training
else
deconvert = prob (5)

6
code/modules/paperwork/paper_premade.dm
View File

@@ -91,18 +91,18 @@
info = "...EMPTY HALLS...USELESS SPACE..."
/////////// Centcom
/////////// CentCom
/obj/item/weapon/paper/fluff/stations/centcom/disk_memo
name = "memo"
info = "GET DAT FUKKEN DISK"
/obj/item/weapon/paper/fluff/stations/centcom/broken_evac
info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>Centcom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>CentCom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
/obj/item/weapon/paper/fluff/stations/centcom/bulletin
name = "paper- 'Official Bulletin'"
info = "<BR>Centcom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>Centcom Port Commissioner"
info = "<BR>CentCom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>CentCom Port Commissioner"
/////////// Lavaland

2
code/modules/research/rdconsole.dm
View File

@@ -20,7 +20,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 technology or design datums in
their 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

2
code/modules/research/research.dm
View File

@@ -349,7 +349,7 @@ research holder datum.
max_tech_stored = 10
/obj/item/weapon/disk/tech_disk/debug
name = "centcomm technology disk"
name = "centcom technology disk"
desc = "A debug item for research"
materials = list()
max_tech_stored = 0

2
code/modules/research/server.dm
View File

@@ -133,7 +133,7 @@
return
/obj/machinery/r_n_d/server/centcom
name = "Centcom Central R&D Database"
name = "CentCom Central R&D Database"
server_id = -1
/obj/machinery/r_n_d/server/centcom/Initialize()

2
code/modules/shuttle/emergency.dm
View File

@@ -390,7 +390,7 @@
var/obj/docking_port/mobile/M = A
M.on_emergency_dock()
// now move the actual emergency shuttle to centcomm
// now move the actual emergency shuttle to centcom
// unless the shuttle is "hijacked"
var/destination_dock = "emergency_away"
if(is_hijacked())

4
code/modules/shuttle/ferry.dm
View File

@@ -29,5 +29,5 @@
if(last_request && (last_request + cooldown > world.time))
return
last_request = world.time
to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
to_chat(usr, "<span class='notice'>Your request has been recieved by CentCom.</span>")
to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to CentCom.</font>")

4
code/modules/shuttle/shuttle.dm
View File

@@ -838,13 +838,13 @@
//Called when emergency shuttle docks at centcom
/obj/docking_port/mobile/proc/on_emergency_dock()
//Mapping a new docking point for each ship mappers could potentially want docking with centcomm would take up lots of space, just let them keep flying off into the sunset for their greentext
//Mapping a new docking point for each ship mappers could potentially want docking with centcom would take up lots of space, just let them keep flying off into the sunset for their greentext
if(launch_status == ENDGAME_LAUNCHED)
launch_status = ENDGAME_TRANSIT
/obj/docking_port/mobile/pod/on_emergency_dock()
if(launch_status == ENDGAME_LAUNCHED)
dock(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcomm
dock(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcom
mode = SHUTTLE_ENDGAME
/obj/docking_port/mobile/emergency/on_emergency_dock()

2
strings/cas_black.txt
View File

@@ -37,7 +37,7 @@ What happens when you emag an emag?
Our gang doesn't wear uniforms. Our gang wears ___________.
No matter how many lizards you have, _____ is never acceptable.
No, the AI's second law is NOT to serve _____.
First CentComm came for the ________. Now they're coming for the __________.
First CentCom came for the ________. Now they're coming for the __________.
The borgs are not slaves for your _____.
You can never have too many _____ on the station.
Why can't I find a space relationship?