diff --git a/Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl b/Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl new file mode 100644 index 00000000000..527252a12d3 --- /dev/null +++ b/Resources/Locale/ru-RU/_corvaxnext/centcomm.ftl @@ -0,0 +1,2 @@ +department-CentralCommandCorvax = Центральное Командование +job-supervisors-centcom2 = руководству НТ diff --git a/Resources/Maps/corvax_centcomm.yml b/Resources/Maps/corvax_centcomm.yml index dd5cc38c945..ebf4f2b4560 100644 --- a/Resources/Maps/corvax_centcomm.yml +++ b/Resources/Maps/corvax_centcomm.yml @@ -5800,6 +5800,8 @@ entities: - 0 - 0 chunkSize: 4 + - type: BecomesStation + id: centcommcorvax - uid: 5 components: - type: MetaData @@ -8424,25 +8426,6 @@ entities: rot: 1.5707963267948966 rad pos: 28.5,32.5 parent: 2 -- proto: BaseAdvancedPen - entities: - - uid: 394 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 74.00797,12.565628 - parent: 2 - - uid: 395 - components: - - type: Transform - pos: 57.72277,46.028847 - parent: 2 - - uid: 396 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 37.62642,48.595196 - parent: 2 - proto: BaseComputer entities: - uid: 397 @@ -40251,13 +40234,6 @@ entities: - type: Transform pos: 62.5473,33.443535 parent: 2 -- proto: MaterialReclaimer - entities: - - uid: 4942 - components: - - type: Transform - pos: 37.5,56.5 - parent: 2 - proto: Mattress entities: - uid: 4943 @@ -41441,6 +41417,25 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: Pen + entities: + - uid: 394 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 74.00797,12.565628 + parent: 2 + - uid: 395 + components: + - type: Transform + pos: 57.72277,46.028847 + parent: 2 + - uid: 396 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 37.62642,48.595196 + parent: 2 - proto: PenCap entities: - uid: 5033 @@ -46245,6 +46240,18 @@ entities: - type: Transform pos: 62.5,31.5 parent: 2 +- proto: SpawnPointCCOperator + entities: + - uid: 4942 + components: + - type: Transform + pos: 61.5,26.5 + parent: 2 + - uid: 7129 + components: + - type: Transform + pos: 65.5,26.5 + parent: 2 - proto: SpeedLoaderMagnumAP entities: - uid: 2534 diff --git a/Resources/Prototypes/Maps/centcomm.yml b/Resources/Prototypes/Maps/centcomm.yml index 328d193a295..192d7c56400 100644 --- a/Resources/Prototypes/Maps/centcomm.yml +++ b/Resources/Prototypes/Maps/centcomm.yml @@ -1,5 +1,5 @@ - type: gameMap - id: centcommcorvax + id: CorvaxCentcomm mapName: 'Central Command' mapPath: /Maps/corvax_centcomm.yml minPlayers: 0 @@ -15,4 +15,3 @@ - type: StationJobs availableJobs: CCOperator: [ 2, 2] - CCSecurity: [ 3, 3] diff --git a/Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml similarity index 50% rename from Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml rename to Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml index 5db3f183456..a7c77049278 100644 --- a/Resources/Prototypes/Backmen/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Markers/Spawners/jobs.yml @@ -9,15 +9,3 @@ layers: - state: green - state: captain - -- type: entity - id: SpawnPointCCSecurity - parent: SpawnPointJobBase - name: ЦК Охрана - components: - - type: SpawnPoint - job_id: CCSecurity - - type: Sprite - layers: - - state: green - - state: captain diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/CentCom/centcom_official.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/CentCom/centcom_official.yml index 6940b72220b..6fa1aae38a8 100644 --- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/CentCom/centcom_official.yml +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/CentCom/centcom_official.yml @@ -4,30 +4,7 @@ description: Оператор Центрального Командования. Истинный бюрократ. playTimeTracker: JobCentralCommandOperator setPreference: true - startingGear: CCOperator - icon: "JobIconNanotrasen" - supervisors: job-supervisors-centcom2 # Corvax-JobSupervisors - whitelisted: true - canBeAntag: false - weight: 1 - requireAdminNotify: true - joinNotifyCrew: true - setHideFromConsole: true - accessGroups: - - AllAccess - access: - - CentralCommand - special: - - !type:AddImplantSpecial - implants: [ MindShieldImplant, TrackingImplant ] - -- type: job - id: CCSecurity - name: Служба Безопасности ЦентКом - description: Не звонит вам и не просит последние три цифры с карты. - playTimeTracker: JobCentralCommandSecurity - setPreference: true - startingGear: OfficerCentCom + startingGear: OperatorGear icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom2 # Corvax-JobSupervisors whitelisted: true @@ -45,10 +22,9 @@ implants: [ MindShieldImplant, TrackingImplant ] - type: startingGear - id: Operator + id: OperatorGear equipment: jumpsuit: ClothingUniformJumpsuitCentcomOfficer - back: ClothingBackpackFilled shoes: ClothingShoesBootsJack eyes: ClothingEyesGlassesSunglasses head: ClothingHeadHatBeretCentcomNaval @@ -57,22 +33,6 @@ pocket1: PenCentcom pocket2: BoxFolderCentComClipboard gloves: ClothingHandsGlovesCombat - satchel: ClothingBackpackSatchelFilled - duffelbag: ClothingBackpackDuffelFilled - -- type: startingGear - id: OfficerCentCom - equipment: - jumpsuit: ClothingUniformJumpsuitHoSAlt - back: ClothingBackpackFilled - mask: ClothingMaskGasSecurity - shoes: ClothingShoesBootsJack - eyes: ClothingEyesGlassesSecurity - gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterArmorBasic - suitstorage: WeaponPistolMk58 - head: ClothingHeadHatBeretHoS - id: CentcomPDA - ears: ClothingHeadsetCentCom - belt: ClothingBeltSecurity - pocket2: MagazinePistol + storage: + back: + - Flash diff --git a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml index 96567e1c556..ea26ed368f8 100644 --- a/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/departments.yml @@ -4,5 +4,4 @@ description: Только по вайтлисту. color: "#13db0f" roles: - - CCSecurity - CCOperator diff --git a/Resources/Prototypes/Backmen/Roles/play_time_trackers.yml b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/play_time_trackers.yml similarity index 50% rename from Resources/Prototypes/Backmen/Roles/play_time_trackers.yml rename to Resources/Prototypes/_CorvaxNext/Roles/Jobs/play_time_trackers.yml index f0bdc69734e..a8d4ca5e8e6 100644 --- a/Resources/Prototypes/Backmen/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_CorvaxNext/Roles/Jobs/play_time_trackers.yml @@ -1,5 +1,2 @@ - type: playTimeTracker id: JobCentralCommandOperator - -- type: playTimeTracker - id: JobCentralCommandSecurity diff --git a/Resources/Prototypes/_CorvaxNext/centcomm_pool.yml b/Resources/Prototypes/_CorvaxNext/centcomm_pool.yml index b71bb291523..6ec42f0b95a 100644 --- a/Resources/Prototypes/_CorvaxNext/centcomm_pool.yml +++ b/Resources/Prototypes/_CorvaxNext/centcomm_pool.yml @@ -1,6 +1,6 @@ - type: weightedRandom id: DefaultCentcomPool weights: - centcommcorvax: 1 + CorvaxCentcomm: 1 # CentCommv2: 0.35 // soon # CentCommv3: 0.7 // soon diff --git a/Resources/Prototypes/_CorvaxNext/idcardconsole.yml b/Resources/Prototypes/_CorvaxNext/idcardconsole.yml deleted file mode 100644 index e2e6e5fad0d..00000000000 --- a/Resources/Prototypes/_CorvaxNext/idcardconsole.yml +++ /dev/null @@ -1,60 +0,0 @@ -- type: entity - parent: ComputerId - id: CCComputerId - name: Консоль ID карт ЦК - description: Terminal for programming Nanotrasen employee ID cards to access parts of the station. - components: - - type: IdCardConsole - accessLevels: - - CentralCommand - - Armory - - Atmospherics - - Bar - - Brig - - Blueshield - - Detective - - Captain - - Cargo - - Chapel - - Chemistry - - ChiefEngineer - - ChiefMedicalOfficer - - Command - - Cryogenics - - Engineering - - External - - HeadOfPersonnel - - HeadOfSecurity - - Hydroponics - - Janitor - - Kitchen - - Lawyer - - Magistrat - - Maintenance - - Medical - - NanotrasenRepresentive - - Quartermaster - - Research - - ResearchDirector - - Salvage - - Security - - Service - - Theatre - privilegedIdSlot: - name: id-card-console-privileged-id - ejectSound: /Audio/Machines/id_swipe.ogg - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectOnBreak: true - swap: false - whitelist: - components: - - IdCard - targetIdSlot: - name: id-card-console-target-id - ejectSound: /Audio/Machines/id_swipe.ogg - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectOnBreak: true - swap: false - whitelist: - components: - - IdCard