diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm index 0cbba32b9663..eea9a4781f61 100644 --- a/code/__DEFINES/achievements.dm +++ b/code/__DEFINES/achievements.dm @@ -47,7 +47,7 @@ #define MAFIA_MEDAL_CHAPLAIN "Chaplain" #define MAFIA_MEDAL_MD "Medical Doctor" #define MAFIA_MEDAL_OFFICER "Security Officer" -#define MAFIA_MEDAL_LAWYER "Lawyer" +#define MAFIA_MEDAL_LAWYER "Internal Affairs Agent" #define MAFIA_MEDAL_HOP "Head of Personnel" #define MAFIA_MEDAL_HOS "Head of Security" #define MAFIA_MEDAL_WARDEN "Warden" diff --git a/code/__DEFINES/dye_keys.dm b/code/__DEFINES/dye_keys.dm index fd93beda8494..ac874e6b6db5 100644 --- a/code/__DEFINES/dye_keys.dm +++ b/code/__DEFINES/dye_keys.dm @@ -22,6 +22,7 @@ #define DYE_QM "qm" #define DYE_LAW "law" #define DYE_CAPTAIN "captain" +#define DYE_COMMAND "command" #define DYE_HOP "hop" #define DYE_HOS "hos" #define DYE_CE "ce" diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm index 32cab1123e30..7558b256f60e 100644 --- a/code/controllers/subsystem/communications.dm +++ b/code/controllers/subsystem/communications.dm @@ -26,7 +26,7 @@ SUBSYSTEM_DEF(communications) priority_announce(html_decode(input), "[user.name] объявляет:", 'sound/announcer/ai_tone.ogg', "AI", has_important_message = TRUE) COOLDOWN_START(src, silicon_message_cooldown, COMMUNICATION_COOLDOWN_AI) else - priority_announce(html_decode(user.treat_message(input)), null, 'sound/misc/announce.ogg', "Captain", has_important_message = TRUE) + priority_announce(html_decode(user.treat_message(input)), null, 'sound/misc/announce.ogg',"Bridge Officer", "Captain", has_important_message = TRUE) COOLDOWN_START(src, nonsilicon_message_cooldown, COMMUNICATION_COOLDOWN) user.log_talk(input, LOG_SAY, tag="priority announcement") message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.") diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm index b890a084b85a..9dea547e704f 100644 --- a/code/game/gamemodes/bloodsucker/bloodsucker.dm +++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm @@ -25,7 +25,7 @@ antag_flag = ROLE_BLOODSUCKER false_report_weight = 1 chaos = 4 - protected_jobs = list("Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain") // BLUEMOON EDIT + protected_jobs = list("Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") // BLUEMOON EDIT restricted_jobs = list("AI", "Cyborg", "Positronic Brain") // BLUEMOON EDIT required_players = 2 required_enemies = 2 diff --git a/code/game/gamemodes/bloodsucker/hunter.dm b/code/game/gamemodes/bloodsucker/hunter.dm index cec990e9c31b..e7c422b318c8 100644 --- a/code/game/gamemodes/bloodsucker/hunter.dm +++ b/code/game/gamemodes/bloodsucker/hunter.dm @@ -15,7 +15,7 @@ // Set Restricted Jobs if(CONFIG_GET(flag/protect_roles_from_antagonist)) - no_hunter_jobs += list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + no_hunter_jobs += list("Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") if(CONFIG_GET(flag/protect_assistant_from_antagonist)) no_hunter_jobs += "Assistant" diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm index decfa3a9b236..a61a0a191a24 100644 --- a/code/game/gamemodes/brother/traitor_bro.dm +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -8,7 +8,7 @@ required_players = 2 chaos = 5 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") announce_span = "danger" announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\ diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 51ffea074504..ff62bd75d352 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -11,7 +11,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th antag_flag = ROLE_CHANGELING false_report_weight = 10 chaos = 5 - protected_jobs = list("Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") + protected_jobs = list("Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") restricted_jobs = list("AI", "Cyborg", "Positronic Brain") // BLUEMOON EDIT required_players = 2 diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index bc12cd7ba858..c698a6843011 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -139,8 +139,8 @@ Credit where due: required_enemies = 3 recommended_enemies = 5 enemy_minimum_age = 0 // BLUEMOON EDIT - было 7, сделал 0, т.к. на сервере ВЛ и загриферить ролью тяжело - protected_jobs = list("Prisoner", "Shaft Miner", "AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Lawyer", "Chaplain") //Silicons can eventually be converted - restricted_jobs = list("Chaplain", "Captain") + protected_jobs = list("Prisoner", "Shaft Miner", "AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Internal Affairs Agent", "Chaplain") //Silicons can eventually be converted + restricted_jobs = list("Chaplain","Bridge Officer", "Captain") announce_span = "brass" announce_text = "Servants of Ratvar are trying to summon the Justiciar!\n\ Servants: Construct defenses to protect the Ark. Sabotage the station!\n\ diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 7249047f06bf..4c93d0891ca0 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -40,7 +40,7 @@ false_report_weight = 10 chaos = 8 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Security Officer", "Shaft Miner", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Lawyer", "Chaplain") + protected_jobs = list("Security Officer", "Shaft Miner", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Internal Affairs Agent", "Chaplain") required_players = 0 required_enemies = 3 recommended_enemies = 5 diff --git a/code/game/gamemodes/devil/devil_game_mode.dm b/code/game/gamemodes/devil/devil_game_mode.dm index 462a4cc45fdd..688493f81231 100644 --- a/code/game/gamemodes/devil/devil_game_mode.dm +++ b/code/game/gamemodes/devil/devil_game_mode.dm @@ -4,7 +4,7 @@ antag_flag = ROLE_DEVIL false_report_weight = 1 chaos = 3 - protected_jobs = list("Prisoner", "Lawyer", "NanoTrasen Representative", "Curator", "Chaplain", "Head of Security", "Captain", "AI") + protected_jobs = list("Prisoner", "Internal Affairs Agent", "NanoTrasen Representative", "Curator", "Chaplain", "Head of Security","Bridge Officer", "Captain", "AI") required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 337998c50272..7d92b2a757a2 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -60,7 +60,7 @@ antag_datum = /datum/antagonist/traitor antag_flag = "traitor late" antag_flag_override = ROLE_TRAITOR - protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Positronic Brain") required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD @@ -81,9 +81,9 @@ antag_datum = /datum/antagonist/rev/head antag_flag = "rev head late" antag_flag_override = ROLE_REV - protected_roles = list("NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") - enemy_roles = list("AI", "Cyborg", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("AI", "Cyborg", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD @@ -159,7 +159,7 @@ antag_datum = /datum/antagonist/heretic antag_flag = "heretic late" antag_flag_override = ROLE_HERETIC - protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Prisoner", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Prisoner", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Positronic Brain") //BLUEMOON CHANGES required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD; Существовал в тимбазе до удаления. required_candidates = 1 @@ -180,7 +180,7 @@ antag_flag = "changeling late" antag_flag_override = ROLE_CHANGELING antag_datum = /datum/antagonist/changeling - protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") + protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") restricted_roles = list("AI", "Cyborg", "Positronic Brain") required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD required_candidates = 1 @@ -207,9 +207,9 @@ antag_flag = "bloodsucker late" antag_flag_override = ROLE_BLOODSUCKER antag_datum = /datum/antagonist/bloodsucker - protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") + protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") restricted_roles = list("AI", "Cyborg", "Positronic Brain") - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 84c6ca789179..dbb3033f28e9 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -189,7 +189,7 @@ name = "InteQ Sleeper Agent" antag_datum = /datum/antagonist/traitor antag_flag = "traitor mid" - protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD @@ -260,7 +260,7 @@ antag_datum = /datum/antagonist/gang antag_flag = ROLE_FAMILY_HEAD_ASPIRANT antag_flag_override = ROLE_FAMILIES - restricted_roles = list("AI", "Cyborg", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + restricted_roles = list("AI", "Cyborg", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES required_candidates = 9 required_round_type = list(ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD weight = 4 //BLUEMOON CHANGES @@ -321,7 +321,7 @@ name = "Malfunctioning AI" antag_datum = /datum/antagonist/traitor antag_flag = ROLE_MALF - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Scientist", "Chemist", "Research Director", "Chief Engineer") //BLUEMOON CHANGES exclusive_roles = list("AI") required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 @@ -376,9 +376,9 @@ antag_datum = /datum/antagonist/wizard antag_flag = "wizard mid crew" antag_flag_override = ROLE_WIZARD - protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") + protected_roles = list("Prisoner", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") restricted_roles = list("AI", "Cyborg", "Positronic Brain") - enemy_roles = list("Security Officer","Detective","Head of Security", "Captain") + enemy_roles = list("Security Officer","Detective","Head of Security","Bridge Officer", "Captain") required_enemies = list(0,0,0,0,0,0,0,0,0,0) weight = 0 cost = 20 @@ -440,7 +440,7 @@ antag_datum = /datum/antagonist/wizard antag_flag = "wizard mid" antag_flag_override = ROLE_WIZARD - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD @@ -488,7 +488,7 @@ antag_flag = "nukie mid" antag_datum = /datum/antagonist/nukeop antag_flag_override = ROLE_OPERATIVE - enemy_roles = list("AI", "Cyborg", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("AI", "Cyborg", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,0,0,5,5,4,0) //BLUEMOON CHANGES required_candidates = 5 weight = 3 @@ -534,9 +534,9 @@ antag_datum = /datum/antagonist/clockcult antag_flag = "clock mid" antag_flag_override = ROLE_SERVANT_OF_RATVAR - protected_roles = list("Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Prisoner") //BLUEMOON CHANGES - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES required_enemies = list(1,1,1,1,1,1,0,0,0,0) required_candidates = 2 required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD @@ -602,9 +602,9 @@ antag_datum = /datum/antagonist/cult antag_flag = "narsie mid" antag_flag_override = ROLE_CULTIST - protected_roles = list("Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Prisoner") //BLUEMOON CHANGES - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Chaplain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES required_enemies = list(1,1,1,1,1,1,0,0,0,0) required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD required_candidates = 6 @@ -670,7 +670,7 @@ name = "Blob" antag_datum = /datum/antagonist/blob antag_flag = ROLE_BLOB - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 weight = 3 //BLUEMOON CHANGES @@ -689,9 +689,9 @@ antag_datum = /datum/antagonist/blob antag_flag = "blob mid" antag_flag_override = ROLE_BLOB - protected_roles = list("Prisoner", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + protected_roles = list("Prisoner", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD @@ -733,7 +733,7 @@ name = "Alien Infestation" antag_datum = /datum/antagonist/xeno antag_flag = ROLE_ALIEN - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,6,6,5,5,4,0) //BLUEMOON CHANGES required_candidates = 1 weight = 3 @@ -780,7 +780,7 @@ antag_datum = /datum/antagonist/nightmare antag_flag = "Nightmare" antag_flag_override = ROLE_ALIEN - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,4,4,3,3,2,0,0) //BLUEMOON CHANGES required_candidates = 1 weight = 6 //BLUEMOON CHANGES @@ -827,7 +827,7 @@ antag_datum = /datum/antagonist/space_dragon antag_flag = ROLE_SPACE_DRAGON antag_flag_override = ROLE_SPACE_DRAGON - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGE (should we include miners?) + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGE (should we include miners?) required_enemies = list(0,0,0,0,5,5,4,4,3,0) //BLUEMOON CHANGES required_candidates = 1 weight = 6 //BLUEMOON CHANGES @@ -872,7 +872,7 @@ name = "Abductors" antag_flag = "Abductor" antag_flag_override = ROLE_ABDUCTOR - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,0,5,5,4,4,0) //BLUEMOON CHANGES required_candidates = 2 required_applicants = 2 @@ -912,7 +912,7 @@ antag_flag = "Swarmer" antag_flag_override = ROLE_ALIEN required_type = /mob/dead/observer - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,6,6,5,5,4,0) //BLUEMOON CHANGES required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD required_candidates = 0 @@ -946,7 +946,7 @@ antag_datum = /datum/antagonist/ninja antag_flag = "Space Ninja" antag_flag_override = ROLE_NINJA - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = list(0,0,0,0,5,5,4,4,3,0) //BLUEMOON CHANGES required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD required_candidates = 1 @@ -988,7 +988,7 @@ antag_datum = /datum/antagonist/revenant antag_flag = "Revenant" antag_flag_override = ROLE_REVENANT - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Chaplain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Chaplain") //BLUEMOON CHANGES required_enemies = list(0,0,0,5,5,4,4,3,3,0) //BLUEMOON CHANGES required_candidates = 1 weight = 3 //BLUEMOON CHANGES @@ -1056,7 +1056,7 @@ name = "Space Pirates" antag_flag = "Space Pirates" required_type = /mob/dead/observer - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGE + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGE required_enemies = list(0,0,0,0,0,5,4,3,3,3) //BLUEMOON CHANGES required_candidates = 0 required_round_type = list(ROUNDTYPE_DYNAMIC_TEAMBASED, ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM) // BLUEMOON ADD @@ -1083,7 +1083,7 @@ name = "InteQ Raiders" antag_flag = "InteQ Raiders" required_type = /mob/dead/observer - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Detective", "Head of Security","Bridge Officer", "Captain") required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 0 required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_TEAMBASED) // BLUEMOON ADD @@ -1114,9 +1114,9 @@ antag_flag = "Bloodsucker Mid" antag_flag_override = ROLE_BLOODSUCKER antag_datum = /datum/antagonist/bloodsucker - protected_roles = list("Prisoner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain") + protected_roles = list("Prisoner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") restricted_roles = list("AI", "Cyborg", "Positronic Brain") - enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //BLUEMOON CHANGES + enemy_roles = list("Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain") //BLUEMOON CHANGES required_enemies = 3 required_candidates = 1 required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index b99b82c979c7..6638bb978551 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -11,7 +11,7 @@ antag_flag = ROLE_TRAITOR antag_datum = /datum/antagonist/traitor minimum_required_age = 0 - protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Positronic Brain") //BLUEMOON CHANGES required_candidates = 1 weight = 13 //BLUEMOON CHANGES @@ -55,7 +55,7 @@ name = "Blood Brothers" antag_flag = ROLE_BROTHER antag_datum = /datum/antagonist/brother - protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI") required_candidates = 2 weight = 6 //BLUEMOON CHANGES @@ -104,7 +104,7 @@ name = "Changelings" antag_flag = ROLE_CHANGELING antag_datum = /datum/antagonist/changeling - protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Positronic Brain") required_candidates = 1 weight = 8 //BLUEMOON CHANGES @@ -153,7 +153,7 @@ name = "Heretics" antag_flag = ROLE_HERETIC antag_datum = /datum/antagonist/heretic - protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("AI", "Cyborg", "Positronic Brain") required_candidates = 1 weight = 8 //BLUEMOON CHANGES @@ -201,7 +201,7 @@ antag_datum = /datum/antagonist/wizard flags = LONE_RULESET minimum_required_age = 0 // BLUEMOON EDIT - restricted_roles = list("Head of Security", "Captain") // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted + restricted_roles = list("Head of Security","Bridge Officer", "Captain") // Just to be sure that a wizard getting picked won't ever imply a Captain or HoS not getting drafted required_candidates = 1 weight = 6 //BLUEMOON CHANGES cost = 20 @@ -250,7 +250,7 @@ antag_flag = ROLE_CULTIST antag_datum = /datum/antagonist/cult minimum_required_age = 0 // BLUEMOON EDIT - protected_roles = list("Expeditor", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 2 weight = 3 //BLUEMOON CHANGES @@ -312,7 +312,7 @@ antag_datum = /datum/antagonist/nukeop var/datum/antagonist/antag_leader_datum = /datum/antagonist/nukeop/leader minimum_required_age = 0 // BLUEMOON EDIT - restricted_roles = list("Head of Security", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted + restricted_roles = list("Head of Security","Bridge Officer", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted required_candidates = 5 weight = 3 //BLUEMOON CHANGES cost = 20 @@ -401,7 +401,7 @@ antag_flag_override = ROLE_REV antag_datum = /datum/antagonist/rev/head minimum_required_age = 0 // BLUEMOON EDIT - protected_roles = list("NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 3 weight = 3 //BLUEMOON CHANGES @@ -488,7 +488,7 @@ antag_flag = ROLE_SERVANT_OF_RATVAR antag_datum = /datum/antagonist/clockcult minimum_required_age = 0 // BLUEMOON EDIT - protected_roles = list("NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 2 weight = 3 @@ -549,7 +549,7 @@ persistent = TRUE antag_datum = /datum/antagonist/gang antag_flag = ROLE_FAMILIES - protected_roles = list("NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 3 //BLUEMOON CHANGES weight = 3 @@ -647,7 +647,7 @@ BLUEMOON REMOVAL END*/ name = "Monkey" antag_flag = ROLE_MONKEY antag_datum = /datum/antagonist/monkey/leader - protected_roles = list("NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_candidates = 1 weight = 3 @@ -863,7 +863,7 @@ BLUEMOON REMOVAL END*/ antag_flag = "shiftstart bloodsucker" antag_flag_override = ROLE_BLOODSUCKER antag_datum = /datum/antagonist/bloodsucker - protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_roles = list("Expeditor", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES restricted_roles = list("Cyborg", "AI", "Positronic Brain") required_round_type = list(ROUNDTYPE_DYNAMIC_HARD, ROUNDTYPE_DYNAMIC_MEDIUM, ROUNDTYPE_DYNAMIC_LIGHT) // BLUEMOON ADD required_candidates = 1 @@ -908,7 +908,7 @@ BLUEMOON REMOVAL END*/ // antag_datum = /datum/antagonist/slaver // var/datum/antagonist/antag_leader_datum = /datum/antagonist/slaver/leader // minimum_required_age = 0 -// restricted_roles = list("Head of Security", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted +// restricted_roles = list("Head of Security","Bridge Officer", "Captain") // Just to be sure that a nukie getting picked won't ever imply a Captain or HoS not getting drafted // required_candidates = 4 // weight = 3 // cost = 20 @@ -963,7 +963,7 @@ BLUEMOON REMOVAL END*/ antag_flag = ROLE_OVERTHROW antag_datum = /datum/antagonist/overthrow minimum_required_age = 0 - restricted_roles = list("AI", "Cyborg", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + restricted_roles = list("AI", "Cyborg", "Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Blueshield", "Peacekeeper", "Brig Physician", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES required_candidates = 1 weight = 38888 delay = 5 SECONDS //BLUEMOON CHANGES diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm index a3b5eba61716..08505a81041a 100644 --- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm +++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm @@ -5,7 +5,7 @@ false_report_weight = 5 chaos = 5 restricted_jobs = list("AI", "Cyborg", "Positronic Brain") // BLUEMOON EDIT - protected_jobs = list("Prisoner", "Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_jobs = list("Prisoner", "Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES required_players = 15 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 2ebf498094d3..07510fa8acb9 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -9,7 +9,7 @@ announce_span = "danger" announce_text = "Grove For Lyfe!" reroll_friendly = FALSE - restricted_jobs = list("Cyborg", "AI", "Prisoner","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Lawyer")//N O + restricted_jobs = list("Cyborg", "AI", "Prisoner","Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Internal Affairs Agent")//N O protected_jobs = list() /// A reference to the handler that is used to run pre_setup(), post_setup(), etc.. diff --git a/code/game/gamemodes/overthrow/overthrow.dm b/code/game/gamemodes/overthrow/overthrow.dm index f2a848d3cdb6..190010169cd5 100644 --- a/code/game/gamemodes/overthrow/overthrow.dm +++ b/code/game/gamemodes/overthrow/overthrow.dm @@ -5,7 +5,7 @@ antag_flag = ROLE_OVERTHROW chaos = 5 restricted_jobs = list("AI", "Cyborg", "Positronic Brain") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") required_players = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs. required_enemies = 2 // minimum two teams, otherwise it's just nerfed revs. recommended_enemies = 4 diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 75732d05be00..95a5a5cf0279 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -14,7 +14,7 @@ false_report_weight = 10 chaos = 8 restricted_jobs = list("Prisoner", "AI", "Cyborg") - protected_jobs = list("Shaft Miner", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Lawyer") // BLUEMOON EDIT + protected_jobs = list("Shaft Miner", "Security Officer", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster", "Blueshield", "Brig Physician", "Peacekeeper", "NanoTrasen Representative", "Internal Affairs Agent") // BLUEMOON EDIT required_players = 20 required_enemies = 1 recommended_enemies = 3 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 09bb8c9d9581..1bdb975ec51a 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -11,7 +11,7 @@ antag_flag = ROLE_TRAITOR false_report_weight = 20 //Reports of traitors are pretty common. restricted_jobs = list("AI", "Cyborg", "Positronic Brain") //BLUEMOON CHANGES - protected_jobs = list("Shaft Miner", "NanoTrasen Representative", "Lawyer", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES + protected_jobs = list("Shaft Miner", "NanoTrasen Representative", "Internal Affairs Agent", "Security Officer", "Blueshield", "Peacekeeper", "Brig Physician", "Warden", "Detective", "Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Chief Medical Officer", "Research Director") //BLUEMOON CHANGES required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 389abf4f08fd..f9fa2622e70f 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -33,6 +33,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) // Command jobs["Captain"] = 00 jobs["Blueshield"] = 01 + jobs["Bridge Officer"] = 03 // Security jobs["Head of Security"] = 10 jobs["Warden"] = 11 @@ -40,7 +41,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) jobs["Detective"] = 13 jobs["Brig Physician"] = 14 jobs["Peacekeeper"] = 15 - jobs["Lawyer"] = 16 + jobs["Internal Affairs Agent"] = 16 jobs["NanoTrasen Representative"] = 17 // Medical jobs["Chief Medical Officer"] = 20 @@ -73,7 +74,6 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) jobs["Mime"] = 67 jobs["Janitor"] = 68 jobs["Psychologist"] = 71 - jobs["Bridge Officer"] = 72 jobs["Bouncer"] = 73 jobs["Entertainer"] = 74 // BLUEMOON ADD // Central Command diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 1c441dc13698..f9b3fe71692e 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -145,8 +145,8 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon_state = "Curator" /obj/effect/landmark/start/lawyer - name = "Lawyer" - icon_state = "Lawyer" + name = "Internal Affairs Agent" + icon_state = "Internal Affairs Agent" /obj/effect/landmark/start/ntr name = "NanoTrasen Representative" diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index f4fe339c7b9d..bc347bb1780c 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -137,7 +137,7 @@ desc = "...(A cardboard cutout of a mime.)" icon_state = "cutout_mime" if("Traitor") - name = "[pick("Unknown", "Captain")]" + name = "[pick("Unknown","Bridge Officer", "Captain")]" desc = "A cardboard cutout of a traitor." icon_state = "cutout_traitor" if("Nuke Op") diff --git a/code/game/objects/items/devices/fee_terminal.dm b/code/game/objects/items/devices/fee_terminal.dm new file mode 100644 index 000000000000..339992c73faf --- /dev/null +++ b/code/game/objects/items/devices/fee_terminal.dm @@ -0,0 +1,62 @@ +/obj/item/fee_terminal + name = "Fee Terminal" + desc = "A small device to collect fees straight to security budget." + icon = 'icons/obj/device.dmi' + icon_state = "fee_terminal" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + w_class = WEIGHT_CLASS_SMALL + var/fee_value = 0 + var/datum/bank_account/linked_account = null + var/obj/item/radio/security_radio + +/obj/item/fee_terminal/Initialize(mapload) + . = ..() + + // Create new radio + security_radio = new /obj/item/radio(src) + + // Prevent radio listening + security_radio.listening = 0 + + // Set radio frequency + security_radio.set_frequency(FREQ_SECURITY) + + // Set default account + linked_account = SSeconomy.get_dep_account(ACCOUNT_SEC) + + +/obj/item/fee_terminal/attack_self(mob/user) + var/obj/item/card/id/user_id = user.get_idcard() + if(istype(user_id) && (ACCESS_SECURITY in user_id.access)) + fee_value = tgui_input_number(user, "Input fee value", "Fee setup", fee_value, 9999, 1) + if(QDELETED(src) || !user.canUseTopic(src)) + return + if(!fee_value) + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + return + src.say("Сумма штрафа установлена на [fee_value]") + else + src.say("Сумма штрафа установлена на [fee_value]") + +/obj/item/fee_terminal/attackby(obj/item/item, mob/living/user, params) + var/obj/item/card/id/id_card = item + if (!istype(id_card)) + src.say("Вам необходимо провести картой по терминалу") + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + return + var/datum/bank_account/account = id_card.registered_account + if (!account) + src.say("К карте не привязан аккаунт") + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + return + if (!(account.account_balance >= fee_value)) + src.say("На карте недостаточно средств") + playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE) + return + account.adjust_money(-1 * fee_value, "уплата штрафа") + linked_account.adjust_money(fee_value, "уплата штрафа") + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE) + security_radio.talk_into(src, "Штраф в размере [fee_value] кредитов уплачен [account.account_holder]") + src.say("Штраф в размере [fee_value] кредитов уплачен") + fee_value = 0 diff --git a/code/modules/asset_cache/assets/paper.dm b/code/modules/asset_cache/assets/paper.dm index e109ccbfa914..9f8b28b8ad89 100644 --- a/code/modules/asset_cache/assets/paper.dm +++ b/code/modules/asset_cache/assets/paper.dm @@ -10,6 +10,7 @@ "stamp-hos" = 'icons/stamp_icons/large_stamp-hos.png', "stamp-rd" = 'icons/stamp_icons/large_stamp-rd.png', "stamp-cap" = 'icons/stamp_icons/large_stamp-cap.png', + "stamp-com" = 'icons/stamp_icons/large_stamp-com.png', "stamp-qm" = 'icons/stamp_icons/large_stamp-qm.png', "stamp-law" = 'icons/stamp_icons/large_stamp-law.png', "stamp-chap" = 'icons/stamp_icons/large_stamp-chap.png', diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index fbd489615447..bde6b3508de8 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -366,8 +366,8 @@ return "Code Scotch" /proc/get_all_jobs() - return list("Assistant", "Captain", "Blueshield", "Head of Personnel", "Bridge Officer", "Bartender", "Cook", "Entertainer", "Botanist", "Quartermaster", "Cargo Technician", - "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", + return list("Assistant","Bridge Officer", "Captain", "Blueshield", "Head of Personnel", "Bridge Officer", "Bartender", "Cook", "Entertainer", "Botanist", "Quartermaster", "Cargo Technician", + "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Internal Affairs Agent", "Chaplain", "Chief Engineer", "Station Engineer", "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic", "Research Director", "Scientist", "Roboticist", "Expeditor", "Head of Security", "Warden", "Detective", "Security Officer", "Brig Physician", "Peacekeeper", "Prisoner", "NanoTrasen Representative", "Bouncer") //BlueMoon edit diff --git a/code/modules/jobs/job_types/juridical/bridgeofficer.dm b/code/modules/jobs/job_types/command/bridgeofficer.dm similarity index 61% rename from code/modules/jobs/job_types/juridical/bridgeofficer.dm rename to code/modules/jobs/job_types/command/bridgeofficer.dm index fee0536698c4..01904ce598b7 100644 --- a/code/modules/jobs/job_types/juridical/bridgeofficer.dm +++ b/code/modules/jobs/job_types/command/bridgeofficer.dm @@ -1,27 +1,44 @@ /datum/job/bridgeofficer title = "Bridge Officer" // A courpse shared the same name as was causing issiues flag = BRDIGEOFF //Wanted to use BO but.. that broke the blob. Woops - department_head = list("Captain", "Head of Personnel") + auto_deadmin_role_flags = DEADMIN_POSITION_HEAD + department_head = list("Captain") department_flag = ENGSEC faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "The captain and the head of personnel" - selection_color = "#7e3d48" + supervisors = "The captain" + selection_color = "#aac1ee" req_admin_notify = 0 minimal_player_age = 20 - exp_requirements = 180 - exp_type = EXP_TYPE_CREW - exp_type_department = EXP_TYPE_SERVICE - considered_combat_role = FALSE + exp_requirements = 100 + exp_type = EXP_TYPE_COMMAND + exp_type_department = EXP_TYPE_COMMAND + considered_combat_role = TRUE outfit = /datum/outfit/job/bridgeofficer plasma_outfit = /datum/outfit/plasmaman/bridgeofficer //SPLURT CHANGES (Changes the custom spawn text for the Bridge Officer) - custom_spawn_text = "You are an assistant who's primary focus is serving the Heads of Staff. Nothing more. Nothing less." - access = list(ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_BRIDGE_OFFICER, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_SECURITY) - minimal_access = list(ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_BRIDGE_OFFICER, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_SECURITY) - paycheck = PAYCHECK_MEDIUM - paycheck_department = ACCOUNT_CIV + custom_spawn_text = "You are an Captain deputy." + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, + ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, + ACCESS_BRIDGE_OFFICER) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_VAULT, + ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, + ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, + ACCESS_BRIDGE_OFFICER) + paycheck = PAYCHECK_COMMAND + + paycheck = PAYCHECK_COMMAND + paycheck_department = ACCOUNT_SEC alt_titles = list("Command Secretary", "Command Officer", "Bridge Secretary", "Ensign", "Bridge Bitch", "Bridge Canine", "Captain Pet", "Command Pet", "Dick Attachment", "Pussy Attachment", "Bridge Advisor", "Bridge Intern", "Bridge Pet") display_order = JOB_DISPLAY_ORDER_BO blacklisted_quirks = list(/datum/quirk/mute, /datum/quirk/brainproblems, /datum/quirk/insanity, /datum/quirk/bluemoon_criminal) @@ -32,15 +49,17 @@ jobtype = /datum/job/bridgeofficer id = /obj/item/card/id/silver belt = /obj/item/clipboard - ears = /obj/item/radio/headset/headset_bo + ears = /obj/item/radio/headset/headset_bo/bowman uniform = /obj/item/clothing/under/rank/bridgeofficer head = /obj/item/clothing/head/bridgeofficer gloves = /obj/item/clothing/gloves/color/black glasses = /obj/item/clothing/glasses/sunglasses shoes = /obj/item/clothing/shoes/sneakers/brown l_pocket = /obj/item/pda - backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1) + + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1, /obj/item/stamp/command=1, /obj/item/gun/energy/civilian=1) box = /obj/item/storage/box/survival/command + accessory = /obj/item/clothing/accessory/permit/head /datum/outfit/job/bridgeofficer/syndicate name = "Syndicate Bridge Officer" @@ -49,7 +68,7 @@ //belt = /obj/item/pda/syndicate/no_deto gloves = /obj/item/clothing/gloves/combat - ears = /obj/item/radio/headset/headset_bo + ears = /obj/item/radio/headset/headset_bo/bowman uniform = /obj/item/clothing/under/rank/bridgeofficer head = /obj/item/clothing/head/bridgeofficer glasses = /obj/item/clothing/glasses/sunglasses @@ -60,8 +79,9 @@ duffelbag = /obj/item/storage/backpack/duffelbag/syndie box = /obj/item/storage/box/survival/syndie pda_slot = ITEM_SLOT_BELT - backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1, /obj/item/gun/energy/e_gun=1, /obj/item/stamp/law=1, /obj/item/syndicate_uplink=1) + backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced = 1, /obj/item/gun/energy/e_gun=1, /obj/item/stamp/command=1, /obj/item/syndicate_uplink=1) + implants = list(/obj/item/implant/mindshield) /datum/outfit/plasmaman/bridgeofficer name = "Bridge Officer Plasmaman" diff --git a/code/modules/jobs/job_types/command/captain.dm b/code/modules/jobs/job_types/command/captain.dm index 3734d81d7a62..15d438540bb2 100644 --- a/code/modules/jobs/job_types/command/captain.dm +++ b/code/modules/jobs/job_types/command/captain.dm @@ -51,14 +51,15 @@ id = /obj/item/card/id/gold belt = /obj/item/pda/captain - glasses = /obj/item/clothing/glasses/sunglasses + glasses = /obj/item/clothing/glasses/hud/security/sunglasses ears = /obj/item/radio/headset/heads/captain/alt gloves = /obj/item/clothing/gloves/color/captain uniform = /obj/item/clothing/under/rank/captain suit = /obj/item/clothing/suit/armor/vest/capcarapace shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/caphat - backpack_contents = list( /obj/item/station_charter=1, /obj/item/modular_computer/tablet/preset/advanced=1) + + backpack_contents = list( /obj/item/station_charter=1, /obj/item/modular_computer/tablet/preset/advanced=1, /obj/item/stamp/command=1) box = /obj/item/storage/box/survival/command backpack = /obj/item/storage/backpack/captain diff --git a/code/modules/jobs/job_types/juridical/lawyer.dm b/code/modules/jobs/job_types/juridical/lawyer.dm index 450460c73490..d5ce1dc92068 100644 --- a/code/modules/jobs/job_types/juridical/lawyer.dm +++ b/code/modules/jobs/job_types/juridical/lawyer.dm @@ -1,23 +1,24 @@ /datum/job/lawyer - title = "Lawyer" + title = "Internal Affairs Agent" flag = LAWYER department_head = list("NanoTrasen Representative") department_flag = ENGSEC faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the NanoTrasen Representative" + supervisors = "the Corporation Representative" selection_color = "#7e3d48" - considered_combat_role = FALSE + considered_combat_role = TRUE exp_requirements = 100 exp_type = EXP_TYPE_SECURITY outfit = /datum/outfit/job/lawyer plasma_outfit = /datum/outfit/plasmaman/bar //yes, this is correct, there's no 'lawyer' plasmeme outfit - access = list(ACCESS_LAWYER, ACCESS_BRIG, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_SECURITY) - minimal_access = list(ACCESS_LAWYER, ACCESS_BRIG, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_SECURITY) - paycheck = PAYCHECK_EASY + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM, ACCESS_LAWYER, ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, ACCESS_HEADS) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MINERAL_STOREROOM, ACCESS_LAWYER, ACCESS_MEDICAL, ACCESS_RESEARCH, ACCESS_CARGO, ACCESS_ENGINE, ACCESS_HEADS) + + paycheck = PAYCHECK_HARD paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) @@ -34,7 +35,7 @@ ) /datum/outfit/job/lawyer - name = "Lawyer" + name = "Internal Affairs Agent" jobtype = /datum/job/lawyer belt = /obj/item/pda/lawyer @@ -53,12 +54,14 @@ chameleon_extras = /obj/item/stamp/law - backpack_contents = list(/obj/item/stamp/law=1) + backpack_contents = list(/obj/item/stamp/law=1, /obj/item/gun/energy/civilian=1, /obj/item/modular_computer/tablet/preset/advanced = 1) box = /obj/item/storage/box/survival/security + accessory = /obj/item/clothing/accessory/permit/staff + implants = list(/obj/item/implant/mindshield) /datum/outfit/job/lawyer/syndicate - name = "Syndicate Lawyer" + name = "Syndicate Internal Affairs Agent" jobtype = /datum/job/lawyer //belt = /obj/item/pda/syndicate/no_deto diff --git a/code/modules/jobs/job_types/juridical/magistrate.dm b/code/modules/jobs/job_types/juridical/magistrate.dm index 9a34e66517bf..16a09cad0611 100644 --- a/code/modules/jobs/job_types/juridical/magistrate.dm +++ b/code/modules/jobs/job_types/juridical/magistrate.dm @@ -10,7 +10,7 @@ spawn_positions = 1 minimal_player_age = 35 supervisors = "Представители Центрального Командования и Космический Закон" - selection_color = "#7e3d48" + selection_color = "#aac1ee" considered_combat_role = FALSE exp_requirements = 180 exp_type = EXP_TYPE_COMMAND diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 7e312878a20d..8014d89c664d 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -1,5 +1,6 @@ GLOBAL_LIST_INIT(command_positions, list( "Captain", + "Bridge Officer", "Head of Personnel", "Head of Security", "Chief Engineer", @@ -15,8 +16,9 @@ GLOBAL_LIST_INIT(engineering_positions, list( "Atmospheric Technician")) GLOBAL_LIST_INIT(law_positions, list( - "Lawyer", - "Bridge Officer")) + "NanoTrasen Representative", + "Internal Affairs Agent", + )) GLOBAL_LIST_INIT(medical_positions, list( diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index fad628e392f9..6065dbf72d36 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -52,7 +52,7 @@ shoes = /obj/item/clothing/shoes/jackboots /datum/outfit/mafia/lawyer - name = "Mafia Lawyer" + name = "Mafia Internal Affairs Agent" uniform = /obj/item/clothing/under/rank/civilian/lawyer/bluesuit suit = /obj/item/clothing/suit/toggle/lawyer diff --git a/code/modules/mafia/roles.dm b/code/modules/mafia/roles.dm index a48f890d1084..ac44a39a1cb9 100644 --- a/code/modules/mafia/roles.dm +++ b/code/modules/mafia/roles.dm @@ -413,7 +413,7 @@ current_defended = null /datum/mafia_role/lawyer - name = "Lawyer" + name = "Internal Affairs Agent" desc = "You can choose a person during the day to provide extensive legal advice to during the night, preventing night actions." revealed_outfit = /datum/outfit/mafia/lawyer role_type = TOWN_SUPPORT diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index b9cfbe9beb9e..a9211a08453b 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -50,7 +50,7 @@ var/static/list/engineering = list("Chief Engineer" = "Chief Engineer", "Station Engineer" = "Engineer", "Atmospherics Technician" = "Technician") var/static/list/medical = list("Chief Medical Officer" = "C.M.O.", "Medical Doctor" = "M.D.", "Chemist" = "Pharm.D.") var/static/list/research = list("Research Director" = "Ph.D.", "Roboticist" = "M.S.", "Scientist" = "B.S.") - var/static/list/legal = list("Lawyer" = "Esq.") + var/static/list/legal = list("Internal Affairs Agent" = "Esq.") var/list/prefixes var/list/suffixes diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index 63c63f3b9570..01a89c088e35 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -55,7 +55,7 @@ /obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user) var/deconvert = FALSE if(M.mind == target && !M.owns_soul()) - if(user.mind && (user.mind.assigned_role == "Lawyer") || (user.mind.assigned_role == "NanoTrasen Representative")) + if(user.mind && (user.mind.assigned_role == "Internal Affairs Agent") || (user.mind.assigned_role == "NanoTrasen Representative")) deconvert = TRUE 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 diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index d39ea9f1f482..89796cc57a1e 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -39,6 +39,11 @@ icon_state = "stamp-cap" dye_color = DYE_CAPTAIN +/obj/item/stamp/command + name = "command rubber stamp" + icon_state = "stamp-com" + dye_color = DYE_COMMAND + /obj/item/stamp/hop name = "head of personnel's rubber stamp" icon_state = "stamp-hop" diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm index fbfd626ae769..5a6787164ee8 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm @@ -223,3 +223,12 @@ build_path = /obj/item/reagent_containers/glass/bottle/vial/large category = list("initial","Medical","Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + +/datum/design/spray_bottle + name = "Spray Bottle" + id = "spray_bottle" + build_type = AUTOLATHE | PROTOLATHE + materials = list(/datum/material/iron = 200, /datum/material/glass = 1000) + build_path = /obj/item/reagent_containers/spray + category = list("initial","Medical","Medical Designs") + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm index e81b700ebf45..11532ad74c3c 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm @@ -40,6 +40,13 @@ ///////////// ////MISC///// ///////////// +/datum/design/toner + name = "Printer Toner" + id = "toner" + build_type = AUTOLATHE + materials = list(/datum/material/iron = 10, /datum/material/glass = 20) + build_path = /obj/item/toner + category = list("initial", "Misc") /datum/design/camera name = "Camera" diff --git a/code/modules/research/designs/autoylathe_designs.dm b/code/modules/research/designs/autoylathe_designs.dm index 0ea1ccad1057..ecba83dd252f 100644 --- a/code/modules/research/designs/autoylathe_designs.dm +++ b/code/modules/research/designs/autoylathe_designs.dm @@ -362,7 +362,7 @@ build_path = /obj/item/toy/figure/janitor /datum/design/autoylathe/figure/lawyer - name = "Lawyer" + name = "Internal Affairs Agent" id = "lawfigure" materials = list(/datum/material/plastic = 500, /datum/material/iron = 50) build_path = /obj/item/toy/figure/lawyer diff --git a/code/modules/tcg/pack_1.dm b/code/modules/tcg/pack_1.dm index a3920fcdaa84..d8205392deac 100644 --- a/code/modules/tcg/pack_1.dm +++ b/code/modules/tcg/pack_1.dm @@ -447,7 +447,7 @@ card_type = "Unit" /datum/tcg_card/pack_1/lawyer - name = "Lawyer" + name = "Internal Affairs Agent" desc = "Nanotrasen knows the value of a good lawyer. That's why they're all working hard at our home offices defending us from frivolous labor suits from lazy no-good employees who should be working hard instead of slacking off reading trading cards." rules = "When an opponent attacks with a creature with 3 or more power this card gains Taunt." icon_state = "lawyer" diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 81e95023dbfa..8e833398ffa5 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -16,7 +16,8 @@ /obj/item/flashlight/seclite = 4, /obj/item/restraints/legcuffs/bola/energy = 12, /obj/item/evidencebag = 20, - /obj/item/secbat = 5) + /obj/item/secbat = 5, + /obj/item/fee_terminal = 10) contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/storage/belt/sabre/secbelt = 1) diff --git a/config/blanks.json b/config/blanks.json index 52f5d5006660..e842884e5158 100644 --- a/config/blanks.json +++ b/config/blanks.json @@ -1,967 +1,909 @@ [ { - "code": "NT-CMD-JA", - "category": "Командование", - "name": "Приказ о Приёме на Работу", + "code": "УН-П", + "category": "Универсальное", + "name": "Письмо", "info": [ + "

[____________________]

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Дата:

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Номер приказа: [_____]

", - "
Дата составления: [_____________]

", - "

Желаемая должность

", - "
", - "
Приказ
", - "
(распоряжение)
", - "
о приёме работника на работу
", - "
", - "
", - "
Принять на работу:
", - "[___________________________________]", - "
(фамилия, имя, отчество)
", - "


", - "

в [___________________________________] Отдел

", - "
(Отдел Космической Станции)
", - "в качестве [___________________________________]", - "
(Должность, специальность, квалификация)
", - "по причине [___________________________________]", - "
(условия приёма на работу)
", "
", "
", "
", - "С окладом:[________________]", - "

Месяц и Год: [___]:[_____]

", - "С надбавкой:[________________]", "
", - "

Решение о назначении

", + "

Поле под дополнительные подписи:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", "
", - "С испытательным сроком: [_____________________________]", - "
", - "Основание: [__________________________________________]", - "Ответственный: [_______________________________________]", - "С приказом ознакомлен: [________________________________]" + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-CMD-JT", - "category": "Командование", - "name": "Приказ о временном прекращении (расторжении) трудового договора с работником (увольнении)", + "code": "УН-О", + "category": "Универсальное", + "name": "Отчёт", "info": [ - "

Приказ о временном прекращении (расторжении) трудового договора с работником (увольнении)

", - "
", - "

ФИО уволенного лица:

", - "

[___________________________________________________]

", - "

Занимаемая должность

", - "

[___________________________________________________]

", - "

Описание причины для увольнения:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

ФИО Главы Персонала или заместителя((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Решение Главы Персонала:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата решения:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати

", - "
", - "
Решение главы отдела или его заместителя является достаточным основанием для увольнения. Если решение об увольнении принимает только Глава Персонала или его заместитель, в поля начальник отдела необходимо ввести “Отсутствует”.

", - "
", - "

ФИО главы отдела или заместителя((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Решение главы отдела:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата решения:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати

", - "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" - ] - }, - { - "code": "NT-CMD-JR", - "category": "Командование", - "name": "Перевод на Другую Должность", - "info": [ - "

Перевод на Другую Должность

", - "
", - "

Ф.И работника:

", - "

[___________________________________________________]

", - "

Прошлая должность:

", - "

[___________________________________________________]

", - "

Новая должность:

", - "

[___________________________________________________]

", - "

Причина:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Ф.И главы персонала или его заместителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Решение Главы Персонала:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Отчёт [____________________]

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись получателя:

", + "

[________________________________________________________________]

", + "

Должность получателя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для штампа

", - "

Инициалы Главы Персонала или заместителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Решение Главы Отдела:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата решения:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати

", - "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" - ] - }, - { - "code": "NT-CMD-C", - "category": "Командование", - "name": "Жалоба", - "info": [ - "

Жалоба

", - "
", - "

Ф.И жалующегося ((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Текст жалобы:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Написав и подписав эту жалобу, вы даете согласие на обработку персональных данных Мега-Корпорацией Nanotrasen и Триглавом Синдикат.

", - "
", - "

Ф.И получателя ((Ваша Подпись)):

", - "

[___________________________________]

", - "

Предпринятые действия:

", - "

[___________________________________]

", - "

[___________________________________]

", - "

Дата рассмотрения жалобы:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати:

", - "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "

Время оформления: [___]:[___]

", + "

Время принятия: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", + "
", + "

Поле под дополнительные подписи:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-CMD-O", - "category": "Командование", - "name": "Приказ", + "code": "УН-Р1", + "category": "Универсальное", + "name": "Разрешение Ф1", "info": [ - "

Приказ

", - "
", - "

Ф.И составителя приказа ((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Приказываю:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Разрешение на оборудование

", + "
", + "

Владение [_]

", + "

Пользование [_]

", + "
", + "
Проставьте + или - в соответствующих полях

", + "
", + "

Список предметов, подпадающих под разрешение:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись получателя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время оформления: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Приказ может быть адресован не только одному, но и группе сотрудников, также как и всему отделу. Информация о количестве получивших приказ должна быть в описании требования. Лицо ответственное за назначение приказа должно написать имя получателя.

", + "
", + "
", + "
", "
", - "

Ф.И составителя приказа;(Ваша Подпись):

", - "

[___________________________________________________]

", - "

Прочие уточнения:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для штампа

", + "

Поле под дополнительные подписи:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-CMD-PH", - "category": "Командование", - "name": "Разрешение на выполнение опасной деятельности", + "code": "УН-Р2", + "category": "Универсальное", + "name": "Разрешение Ф2", "info": [ - "

Разрешение на выполнение опасной деятельности

", - "
", - "

Ф.И просителя ((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Описание деятельности:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Ответственность за любой урон имуществу или сотрудникам во время исполнения опасной деятельности лежит на запрашиваемом и разрешающем лице.

", - "
", - "

Ф.И разрешающего опасную деятельность:((Ваша Подпись))

", - "

[___________________________________________________]

", + "

Разрешение на деятельность

", + "
", + "

Список действий, подпадающих под разрешение:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись получателя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для штампа

", + "

Время оформления: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "

Поле под дополнительные подписи:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-SCR-W", - "category": "Служба Безопасности", - "name": "Ордер на Арест", + "code": "УН-А", + "category": "Универсальное", + "name": "Акт о передаче", "info": [ - "

Ордер на Арест

", - "
", - "

Ф.И. арестованного:

", - "

[___________________________________________________]

", - "

Причина:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Вердикт:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Форма ареста имеет юридическую и корпоративную силу, если она проштампована и подписана начальником службы безопасности или его заместителем. Формы ареста следует использовать только во время использования Зеленого и Синего кодов угроз объекта «NanoTrasen». В случае более высокого кода угрозы корпорация «NanoTrasen» разрешает сотрудникам службы безопасности производить аресты с устного одобрения Ответственного Офицера.

", - "
", - "

Ф.И. Ответственного Офицера ((Ваша Подпись)):

", - "

[___________________________________________________]

", + "

Акт о передаче

", + "
", + "

Список переданых объектов:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись получателя:

", + "

[________________________________________________________________]

", + "

Должность получателя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати

", + "

Время оформления: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-SCR-SW", - "category": "Служба Безопасности", - "name": "Ордер на обыск", + "code": "УН-ЗА", + "category": "Универсальное", + "name": "Заявление", "info": [ - "

Ордер на Обыск

", + "

Заявление [__________________]

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись получателя:

", + "

[________________________________________________________________]

", + "

Должность получателя:

", + "

[________________________________________________________________]

", + "

Дата:

", + "

Время оформления: [___]:[___]

", + "

Время принятия: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "

ФИО личности, что подлежит обыску:

", - "

[___________________________________________________]

", - "

Причина:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "
", + "
", + "
", "
", - "
Форма ареста имеет юридическую и корпоративную силу, если она проштампована и подписана начальником службы безопасности или его заместителем. Формы ареста следует использовать только во время использования Зеленого и Синего кодов угроз объекта «NanoTrasen». В случае более высокого кода угрозы корпорация «NanoTrasen» разрешает сотрудникам службы безопасности производить аресты с устного одобрения Ответственного Офицера.

", + "

Поле под дополнительные подписи:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", "
", - "

Ф.И. Ответственного Офицера ((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати

", - "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-SCR-IR", - "category": "Служба Безопасности", - "name": "Отчёт о допросе", + "code": "УН-ЗП", + "category": "Универсальное", + "name": "Запрос", "info": [ - "

Interrogation Report

", - "
", - "

Ф.И. допрашиваемого:

", - "

[___________________________________________________]

", - "

Причина для допроса:

", - "

[___________________________________________________]

", - "

Время начала допроса:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Время окончания допроса:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Ход допроса:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Иные материалы (Заметки допроса):

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Корпорация NanoTrasen Рекомендует использовать записывающие устройства для допроса.

", - "
", - "

Ф.И. следователя ((Ваша Подпись)):

", - "

[___________________________________________________]

", + "

Запрос [__________________]

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись получателя:

", + "

[________________________________________________________________]

", + "

Должность получателя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати

", + "

Время оформления: [___]:[___]

", + "

Время принятия: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, + + { - "code": "NT-SCR-SR", - "category": "Служба Безопасности", - "name": "Отчёт о Безопасности", + "code": "КОМ-О", + "category": "Командование", + "name": "Отчёт о выполнении цели", "info": [ - "

Отчёт о Безопасности

", - "
", - "

Имя подотчетного лица (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Текст Отчета:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дополнительная Информация:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата составления отчета:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "
", - "

Ф.И. Лица, получившего отчет (Ваша Подпись):

", - "

[___________________________________________________]

", + "

Отчёт о выполнении цели

", + "
", + "

Состояние целей:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Прочее:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "
Данный документ считается действительным только при наличии подписи и печати.

" ] }, + { - "code": "NT-SCR-EO", - "category": "Служба Безопасности", - "name": "Приказ о Применении Смертной Казни", + "code": "КОМ-П", + "category": "Командование", + "name": "Приказ", "info": [ - "

Приказ о Применении Смертной Казни

", - "
", - "

Имя приговоренного к казни:

", - "

[___________________________________________________]

", - "

Причина казни:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Метод казни:

", - "

[___________________________________________________]

", - "
", - "
Только высшее руководство станции, Центральное Командование или Совет Директоров Nanotrasen имеет право выдавать приказ о казни. Всегда помните, что применение казни — исключительная мера наказания. Подписывая этот приказ, вы берете полную ответственность за любые возможные ошибки в процессе. Этот документ должен быть приложен к свидетельству смерти (NT-MDC-DC) после завершения наказания..

", - "
", - "

Ф.И отдающего приказ о казни ((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Дополнительная Информация:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Приказ

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для штампа

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати.

" ] }, + { - "code": "NT-SCR-PP", - "category": "Служба Безопасности", - "name": "Разрешение на Владение", + "code": "ЮР-ПО", + "category": "Юриспруденция", + "name": "Повестка", "info": [ - "

Разрешение на Владение

", - "
", - "

Имя Владельца:

", - "

[___________________________________________________]

", - "

Список Предметов:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Данное разрешение допускает владение, хранение и использование перечисленного оборудования лицом, указанным в разрешении. Назначенное лицо должно предъявить данное разрешение любому сотруднику Службы Безопасности по первому требованию. Разрешение может быть аннулировано и отозвано в любое время без причины. При заполнении данной формы уполномоченное лицо должно заполнить все пустые поля.

", - "
", - "

ФИ Составителя (подпись):

", - "

[___________________________________________________]

", - "

Дополнительная Информация:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Повестка [______________]

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати.

", + "
Данный документ имеет юридическую силу, только если составлен уполномоченным лицом и обязывает на равне с приказом явится указанному лицу или группе лиц в указанное место в указанное время

" ] }, { - "code": "NT-SCR-SE", - "category": "Инженерный Отдел", - "name": "Разрешение на Выдачу Оборудования из Арсенала", + "code": "ЮР-ПР", + "category": "Юриспруденция", + "name": "Приговор", "info": [ - "

Разрешение на Выдачу Оборудования из Арсенала

", - "
", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Цель Применения Оборудования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Перечень Оборудования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Приговор [______________]

", + "
", + "

Имя приговорённого: [________________________]

", + "

Приговор: [________________________]

", + "

Статьи и модификаторы:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", - "
", - "
Ответственность за ненадлежащее получение оборудования несет лицо, подписавшее разрешение на выдачу оборудования. Пустые области должны быть заполнены при заполнении бумаги.

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Причина Выдачи:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати.

", + "
Данный документ имеет юридическую силу, только если составлен уполномоченным лицом.

" ] }, { - "code": "NT-SCR-CS", - "category": "Служба Безопасности", - "name": "Судебная Повестка", + "code": "ЮР-УДО", + "category": "Юриспруденция", + "name": "УДО", "info": [ - "

Судебная Повестка

", - "
", - "

Кто Вызывает (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Кого Вызывают (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Причина Вызова:

", - "

[___________________________________________________]

", - "

Требование прибыть до [__] : [__]. (По Станционному Времени)", - "

Место под Штампы

", - "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" - ] - }, - { - "code": "NT-SCR-LRF", - "category": "Служба Безопасности", - "name": "Судебный Иск", - "info":[ - "

Судебный Иск", - "

Prosecuters's name (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Affected Parties:

", - "

[___________________________________________________]

", - "

The Accused Party:

", - "

[___________________________________________________]

", - "

Description of Events:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Requested Punishment:

", - "

[___________________________________________________]

", + "

Условно досрочное освобождение

", + "
", + "

Имя освобождённого: [________________________]

", + "

Заменённый приговор: [________________________]

", + "

Дополнительная информация:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись исполнителя:

", + "

[________________________________________________________________]

", + "

Должность исполнителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", - "
", - "
Написав и подписав эту форму, вы даете согласие на обработку ваших персональных данных Мега-Корпорацией Nanotrasen и Триглавом Синдикат.

", - "
", - "

Name of offical to take action:

", - "

[___________________________________]

", - "

Official Decision:

", - "

[___________________________________]

", - "

Notes:

", - "

[___________________________________]

", - "

Date the suit was reviewed:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - - "

Место под Штампы

", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Время исполнения: [___]:[___]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати.

", + "
Данный документ имеет юридическую силу, только если составлен уполномоченным лицом.

" ] }, { - "code": "NT-ENG-PW", - "category": "Инженерный Отдел", - "name": "Разрешение на Выполнение Нестандартных Работ", + "code": "ЮР-СП", + "category": "Юриспруденция", + "name": "Судебное предписание", "info": [ - "

Разрешение на Выполнение Нестандартных Работ

", - "
", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Описание Работы/Перестройки:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Судебное предписание

", + "
", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись судьи:

", + "

[________________________________________________________________]

", + "

Должность судьи:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Ответственность за любой ущерб, причиненный Nanotrasen во время выполнения описанных работ, лежит на лице, запрашивающем разрешение, и лице, выдающем разрешение.

", - "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Дополнительная Информация:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати.

", + "
Данный документ имеет юридическую силу, только если составлен судьёй по результам судебного заседания. Сила данного документа равносильна приказу.

" ] }, + { - "code": "NT-ENG-PE", - "category": "Инженерный Отдел", - "name": "Разрешение на Выдачу Инженерного Оборудования", + "code": "СБ-ОО", + "category": "Служба Безопасности", + "name": "Ордер на обыск", "info": [ - "

Разрешение на Выдачу Инженерного Оборудования

", - "
", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Цель Применения Оборудования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Перечень Оборудования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Ордер на обыск

", + "
", + "

Обыскиваемый субъект: [________________________________]

", + "

Причина обыска:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", - "
", - "
Ответственность за ненадлежащее получение оборудования несет лицо, подписавшее разрешение на выдачу оборудования. Пустые области должны быть заполнены при заполнении бумаги.

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Причина Выдачи:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется .

", + "
Данный документ имеет юридическую силу, только если составлен уполномоченным лицом.

" ] }, { - "code": "NT-RSH-PR", - "category": "Отдел Разработок и Исследований", - "name": "Разрешение на Выполнение Нестандартного Исследования", + "code": "СБ-ОА", + "category": "Служба Безопасности", + "name": "Ордер на арест", "info": [ - "

Разрешение на Выполнение Нестандартного Исследования

", - "
", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Описание Исследования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Ордер на арест

", + "
", + "

Задерживаемый субъект: [________________________________]

", + "

Причина задержания:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Ответственность за любой ущерб, нанесенные Объекту Пакта во время проведения описанных здесь исследований, несет лицо, запрашивающее разрешение, и лицо, выдающее разрешение.

", - "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Дополнительная Информация:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется .

", + "
Данный документ имеет юридическую силу, только если составлен уполномоченным лицом.

" ] }, { - "code": "NT-RSH-PE", - "category": "Отдел Разработок и Исследований", - "name": "Разрешение на Выдачу Высокотехнологичного Оборудования", + "code": "НИО-РН", + "category": "НИО", + "name": "Разрешение о распространении нанитов", "info": [ - "

Разрешение на Выдачу Высокотехнологичного Оборудования

", - "
", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Цель Применения Оборудования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Перечень Оборудования:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Разрешение на распространение нанитов

", + "
", + "

Полная информация о распространяемом наборе:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись изготовителя:

", + "

[________________________________________________________________]

", + "

Должность изготовителя:

", + "

[________________________________________________________________]

", + "

Подпись санкционировавшего:

", + "

[________________________________________________________________]

", + "

Должность санкционировавшего:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", - "
", - "
Ответственность за ненадлежащее получение оборудования несет лицо, подписавшее разрешение на выдачу оборудования. Пустые области должны быть заполнены при заполнении бумаги

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Причина Выдачи:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати.

", + "
Данный документ имеет юридическую силу, только если санкционирован лицом, уполномоченным разрешать распространение нанитов.

" ] }, { - "code": "NT-MDC-MP", - "category": "Медицинский Отдел", - "name": "Медицинское Предписание", + "code": "МЕД-РВ", + "category": "Медицина", + "name": "Разрешение о распространении вируса", "info": [ - "

Медицинское Предписание

", - "
", - "

Имя Пациента:

", - "

[___________________________________________________]

", - "

Диагноз:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Рекомендации по Лечению:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Рецепт:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Этот документ дает вам право на получение, хранение и использование перечисленных лекарств. При использовании лекарств пациенты должны следовать рекомендациям своего врача. При заполнении данной формы врач должен указать заполнить все пустые поля во избежание фальсификации.

", - "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", + "

Разрешение на распространение вируса

", + "
", + "

Полная информация о симптомах:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись изготовителя:

", + "

[________________________________________________________________]

", + "

Должность изготовителя:

", + "

[________________________________________________________________]

", + "

Подпись санкционировавшего:

", + "

[________________________________________________________________]

", + "

Должность санкционировавшего:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати.

", + "
Данный документ имеет юридическую силу, только если санкционирован лицом, уполномоченным разрешать распространение вирусов.

" ] }, { - "code": "NT-MDC-AR", - "category": "Медицинский Отдел", - "name": "Отчет о Вскрытии", + "code": "МЕД-Р", + "category": "Медицина", + "name": "Рецепт", "info": [ - "

Отчет о Вскрытии

", - "
", - "

ФИ Тела:

", - "

[___________________________________________________]

", - "

Причина Вскрытия:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Результат Вскрытия:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", + "

Рецепт

", + "
", + "

Имя получателя: [________________________________]

", + "

Список препаратов и дозировка:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время оформления: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-MDC-DC", - "category": "Медицинский Отдел", - "name": "Свидетельство о Смерти", + "code": "МЕД-З", + "category": "Медицина", + "name": "Медицинское заключение", "info": [ - "

Свидетельство о Смерти

", - "
", - "

ФИ Тела:

", - "

[___________________________________________________]

", - "

Подтверждение о Смерти (ФИ):

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Причина Смерти:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Это свидетельство того, что указанное лицо окончательно умерло и не может быть воскрешено. Лицо, подписавшее свидетельство, несет ответственность за неправомерное подтверждение смерти.

", - "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", + "

Медицинское заключение

", + "
", + "

Имя пациента: [________________________________]

", + "

Диагноз: [________________________________]

", + "

Информация:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "

Время оформления: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-SPL-PO", - "category": "Отдел Снабжения", - "name": "Разрешение на Выполнение Нестандартного Заказа", + "code": "МЕД-П", + "category": "Медицина", + "name": "Заключение психиатрической экспертизы", "info": [ - "

Разрешение на Выполнение Нестандартного Заказа

", - "
", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Цель Заказа:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Перечень Заказов:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", + "

Заключение психиатрической экспертизы

", + "
", + "

Имя пациента: [________________________________]

", + "

Диагноз: [________________________________]

", + "

Информация:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Обязательные к исполнению предписания:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Рекомендации:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", - "
", - "
Лицо, подписавшее разрешение на получение посылки, несет ответственность за ненадлежащее получение посылки. При заполнении данной формы Техник Склада должен указать заполнить все пустые поля во избежание фальсификации.

", + "

Время оформления: [___]:[___]

", + "

Дата: [___________]

", + "

Место для печатей

", "
", - "

Имя Ответственного (Ваша Подпись):

", - "

[___________________________________________________]

", - "

Причина Выдачи:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место под Штампы

", + "
", + "
", + "
", "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

", - "
" + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

" ] }, { - "code": "NT-LB", - "category": "Прочее", - "name": "Счет за Обед", + "code": "ОК-ПУ", + "category": "Отдел кадров", + "name": "Приказ об увольнении", "info": [ - "

Счет за Обед

", - "
", - "

Название Бизнес-Места:

", - "

[___________________________________________________]

", - "

Имя Официанта (Ваша Подпись):

", - "

[___________________________________________________]

", - "
", - "

Заказ:

", - "

1. [___________________________________]

", - "

2. [___________________________________]

", - "

3. [___________________________________]

", - "

4. [___________________________________]

", - "

5. [___________________________________]

", - "

6. [___________________________________]

", - "

7. [___________________________________]

", - "

8. [___________________________________]

", - "

9. [___________________________________]

", - "

Цена (Включая Бумагу):

", - "

[___________________________________________________]

", + "

Приказ об увольнении

", + "
", + "

Имя сотрудника: [________________________]

", + "

Замимая должность: [________________________]

", + "

Причина увольнения:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись составителя:

", + "

[________________________________________________________________]

", + "

Должность составителя:

", + "

[________________________________________________________________]

", + "

Подпись исполнителя:

", + "

[________________________________________________________________]

", + "

Должность исполнителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Время исполнения: [___]:[___]

", + "

Место для печатей

", "
", - "
Данный платежный документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Вы должны передать этот документ персоналу объекта в течение 24 часов после оказания услуги для самостоятельного ведения налогового учета.

", - "
" + "
", + "
", + "
", + "
", + "

Поле под дополнительные подписи:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "
", + "
Данный документ считается действительным только при наличии подписи и печати, если таковая имеется.

", + "
Данный документ имеет юридическую силу, только если составлен главой сотрудника или лицом, уполномоченным проводить увольнения.

" ] }, { - "code": "NT-OO", - "category": "Прочее", - "name": "Заявление", + "code": "ОК-ЗПР", + "category": "Отдел кадров", + "name": "Заявление о приёме на работу", "info": [ - "

Заявление

", - "
", - "

Ф.И писаря ((Ваша Подпись)):

", - "

[___________________________________________________]

", - "

Текст:

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "

[___________________________________________________]

", - "
", - "
Написав и подписав это заявление, вы даете согласие на обработку персональных данных Мега-Корпорацией Nanotrasen и Триглавом Синдикат.

", - "
", - "

Ф.И получателя ((Ваша Подпись)):

", - "

[___________________________________]

", - "

Предпринятые действия:

", - "

[___________________________________]

", - "

[___________________________________]

", - "

Дата рассмотрения заявления:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", - "

Место для печати:

", - "
", - "
Этот документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Без подписей и печатей глав или их заместителей этот документ не имеет корпоративной силы.

" + "

Заявление о приёме на работу

", + "
", + "

Желаемая должность: [________________________]

", + "

Информация о соискателе:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись заявителя:

", + "

[________________________________________________________________]

", + "

Подпись будущего главы:

", + "

[________________________________________________________________]

", + "

Подпись исполнителя:

", + "

[________________________________________________________________]

", + "

Должность исполнителя:

", + "

[________________________________________________________________]

", + "

Дата:

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Время исполнения: [___]:[___]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", + "
", + "
Данный документ считается действительным только при наличии необходимых подписей и печатей.

" ] }, { - "code": "NT-PS", - "category": "Прочее", - "name": "Предоставление Платных Услуг", + "code": "ОК-ЗП", + "category": "Отдел кадров", + "name": "Заявление о переводе", "info": [ - "

Предоставление Платных Услуг

", - "
", - "

Название Бизнес-Места:

", - "

[___________________________________________________]

", - "

Имя Составителя (Ваша Подпись):

", - "

[___________________________________________________]

", - "
", - "

Перечень Оказанных Услуг:

", - "

1. [___________________________________]

", - "

2. [___________________________________]

", - "

3. [___________________________________]

", - "

4. [___________________________________]

", - "

5. [___________________________________]

", - "

6. [___________________________________]

", - "

7. [___________________________________]

", - "

8. [___________________________________]

", - "

9. [___________________________________]

", - "

Цена (Включая Бумагу):

", - "

[___________________________________________________]

", + "

Заявление о переводе

", + "
", + "

Занимаемая должность: [________________________]

", + "

Желаемая должность: [________________________]

", + "

Причина перевода:

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

[________________________________________________________________]

", + "

Подписи и печати

", + "

Подпись заявителя:

", + "

[________________________________________________________________]

", + "

Подпись текущего главы:

", + "

[________________________________________________________________]

", + "

Подпись будущего главы:

", + "

[________________________________________________________________]

", + "

Подпись исполнителя:

", + "

[________________________________________________________________]

", + "

Должность исполнителя:

", + "

[________________________________________________________________]

", "

Дата:

", - "

Время: [___].[___].[___]

", - "

Месяц и Год: [___]:[_____]

", + "

Время: [___]:[___]

", + "

Дата: [___________]

", + "

Время исполнения: [___]:[___]

", + "

Место для печатей

", + "
", + "
", + "
", + "
", "
", - "
Данный платежный документ является собственностью Мега-Корпорации Nanotrasen и Триглава Синдикат. Вы должны передать этот документ персоналу объекта в течение 24 часов после оказания услуги для самостоятельного ведения налогового учета.

", - "
" + "
Данный документ считается действительным только при наличии необходимых подписей и печатей.

" ] } ] diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 98fcfb06a003..6a16c0ecffa7 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index f8c5a68725e9..02f38dbaebf6 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 40d134a161aa..54de8b22d0fe 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 4853c925d997..2d4ec8d28555 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/stamp_icons/large_stamp-com.png b/icons/stamp_icons/large_stamp-com.png new file mode 100644 index 000000000000..c4bc4e83bf19 Binary files /dev/null and b/icons/stamp_icons/large_stamp-com.png differ diff --git a/modular_bluemoon/SmiLeY/code/crew_console.dm b/modular_bluemoon/SmiLeY/code/crew_console.dm index bc5633703150..e3846d3aded8 100644 --- a/modular_bluemoon/SmiLeY/code/crew_console.dm +++ b/modular_bluemoon/SmiLeY/code/crew_console.dm @@ -4,13 +4,17 @@ luminosity = 1 light_power = 3 var/canalarm = FALSE - var/obj/item/radio/radio + var/obj/item/radio/Radio + var/radio_key = /obj/item/encryptionkey/headset_med /obj/machinery/computer/crew/Initialize(mapload, obj/item/circuitboard/C) . = ..() - radio = new/obj/item/radio(src) - radio.listening = FALSE - radio.recalculateChannels() + Radio = new/obj/item/radio(src) + if(radio_key) + Radio.keyslot = new radio_key + Radio.subspace_transmission = TRUE + Radio.canhear_range = 0 // anything greater will have the bot broadcast the channel as if it were saying it out loud. + Radio.recalculateChannels() alarm() /obj/machinery/computer/crew/proc/alarm() @@ -42,7 +46,6 @@ /obj/machinery/computer/crew/proc/alert_radio(canalarm, injuredcount) if(canalarm) - radio.set_frequency(FREQ_MEDICAL) - radio.talk_into(src, "[injuredcount] нуждаются в оказании срочной медицинской помощи.", RADIO_CHANNEL_MEDICAL) + Radio.talk_into(src, "Внимание. Сотрудники Космической Станции нуждаются в срочной медицинской помощи. Количество: [injuredcount]", RADIO_CHANNEL_MEDICAL, list(z)) #undef SENSORS_UPDATE_PERIOD diff --git a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers_event.dm b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers_event.dm index 5931cb76f78c..c577f16f5f9f 100644 --- a/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers_event.dm +++ b/modular_bluemoon/kovac_shitcode/code/modules/antagonists/vox_scavengers_event.dm @@ -52,7 +52,7 @@ name = "Vox Scavengers" antag_flag = "Vox Scavengers" required_type = /mob/dead/observer - enemy_roles = list("Security Officer", "Detective", "Head of Security", "Captain") + enemy_roles = list("Security Officer", "Detective", "Head of Security","Bridge Officer", "Captain") required_enemies = list(0,0,0,0,0,0,0,0,0,0) required_candidates = 0 weight = 3 diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index c1ffe4bd753d..c3e0702ab962 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -113,7 +113,7 @@ path = /obj/item/clothing/head/kepi/orvi/command subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS restricted_desc = "Heads of Staff" - restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") + restricted_roles = list("Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") /datum/gear/head/orvkepieng name = "Federation Kepi, eng" @@ -144,7 +144,7 @@ description = "A visored cap. Intended to be used with ORV uniform." path = /obj/item/clothing/head/kepi/orvi/service subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS - restricted_desc = "Service, Cargo and Civilian, barring Clown, Mime and Lawyer" + restricted_desc = "Service, Cargo and Civilian, barring Clown, Mime and Internal Affairs Agent" restricted_roles = list("Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain", "Cargo Technician", "Shaft Miner") /datum/gear/head/orvkepiass diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 4c2852c9f6b0..0dbcb80f4e5c 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -415,7 +415,7 @@ path = /obj/item/clothing/under/rank/captain/util subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Command" - restricted_roles = list("Quartermaster", "Research Director", "Chief Medical Officer", "Head Of Security", "Head Of Personnel", "Captain") + restricted_roles = list("Quartermaster", "Research Director", "Chief Medical Officer", "Head Of Security", "Head Of Personnel","Bridge Officer", "Captain") /datum/gear/uniform/grey/eng/mech name = "Mechanic's Uniform" @@ -559,7 +559,7 @@ name = "TMP uniform, service" path = /obj/item/clothing/under/trek/fedutil/service subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS - restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer" + restricted_desc = "Service and Civilian, barring Clown, Mime and Internal Affairs Agent" restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain") //Orvilike @@ -568,7 +568,7 @@ path = /obj/item/clothing/under/trek/command/orv subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS restricted_desc = "Heads of Staff" - restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") + restricted_roles = list("Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster") /datum/gear/uniform/orvcmd_capt name = "ORV uniform, capt" @@ -626,7 +626,7 @@ path = /obj/item/clothing/under/trek/orv/service subcategory = LOADOUT_SUBCATEGORY_UNIFORM_JOBS restricted_roles = list("Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain", "Cargo Technician", "Shaft Miner") - restricted_desc = "Service, Cargo and Civilian, barring Clown, Mime and Lawyer" + restricted_desc = "Service, Cargo and Civilian, barring Clown, Mime and Internal Affairs Agent" //Memes /datum/gear/uniform/gear_harnesses diff --git a/modular_sand/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/modular_sand/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 75237c33b47c..0f713181a159 100644 --- a/modular_sand/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/modular_sand/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -4,6 +4,7 @@ new /obj/item/tank/internals/emergency_oxygen/double(src) new /obj/item/bikehorn/rubberducky/captain(src) new /obj/item/lighter/cap(src) + new /obj/item/megaphone/command(src) /obj/structure/closet/secure_closet/hop/PopulateContents() ..() diff --git a/modular_splurt/code/game/objects/items/miscellaneous.dm b/modular_splurt/code/game/objects/items/miscellaneous.dm index a91982e39e22..627bd6fd5b66 100644 --- a/modular_splurt/code/game/objects/items/miscellaneous.dm +++ b/modular_splurt/code/game/objects/items/miscellaneous.dm @@ -125,6 +125,11 @@ desc = "A card indicating that the Head of staff is allowed to carry a weapon." icon_state = "compermit" +/obj/item/clothing/accessory/permit/staff + name = "Staff weapon permit" + desc = "A card indicating that the staff is allowed to carry a weapon." + icon_state = "permit" + /obj/item/clothing/accessory/permit/bar name = "bar weapon permit" desc = "A card indicating that the barkeep is allowed to carry a weapon, most likely their shotgun." diff --git a/modular_splurt/code/modules/antagonists/slaver/slaver.dm b/modular_splurt/code/modules/antagonists/slaver/slaver.dm index 80a0411a9269..270825a6b258 100644 --- a/modular_splurt/code/modules/antagonists/slaver/slaver.dm +++ b/modular_splurt/code/modules/antagonists/slaver/slaver.dm @@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(slavers_ransom_values, list( "Clown" = SLAVER_STANDARD_RANSOM, "Mime" = SLAVER_STANDARD_RANSOM, "Curator" = SLAVER_STANDARD_RANSOM, - "Lawyer" = SLAVER_STANDARD_RANSOM, + "Internal Affairs Agent" = SLAVER_STANDARD_RANSOM, "Chaplain" = SLAVER_STANDARD_RANSOM, "Station Engineer" = SLAVER_STANDARD_RANSOM, "Atmospheric Technician" = SLAVER_STANDARD_RANSOM, @@ -47,7 +47,7 @@ GLOBAL_LIST_INIT(slavers_ransom_values, list( "Prisoner" = SLAVER_STANDARD_RANSOM, "Stowaway" = SLAVER_STANDARD_RANSOM, "Curator" = SLAVER_STANDARD_RANSOM, - "Lawyer" = SLAVER_STANDARD_RANSOM, + "Internal Affairs Agent" = SLAVER_STANDARD_RANSOM, "Chaplain" = SLAVER_STANDARD_RANSOM, "Bouncer" = SLAVER_STANDARD_RANSOM, )) diff --git a/modular_splurt/code/modules/client/loadout/head.dm b/modular_splurt/code/modules/client/loadout/head.dm index d837444a33da..34048abc6ca6 100644 --- a/modular_splurt/code/modules/client/loadout/head.dm +++ b/modular_splurt/code/modules/client/loadout/head.dm @@ -17,7 +17,7 @@ restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Warden","Detective","Security Officer","Brig Physician","Blueshield","Bridge Officer") /datum/gear/head/orvkepicom - restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster", "Bridge Officer") + restricted_roles = list("Head of Security","Bridge Officer", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster", "Bridge Officer") /datum/gear/head/orvkepisec restricted_roles = list("Warden", "Detective", "Security Officer", "Head of Security", "Brig Physician", "Blueshield") diff --git a/modular_splurt/code/modules/client/loadout/uniform.dm b/modular_splurt/code/modules/client/loadout/uniform.dm index aa9e2adcebda..720390e37c5e 100644 --- a/modular_splurt/code/modules/client/loadout/uniform.dm +++ b/modular_splurt/code/modules/client/loadout/uniform.dm @@ -94,7 +94,7 @@ restricted_roles = list("Medical Doctor", "Virologist", "Chemist", "Geneticist", "Paramedic", "Brig Physician") /datum/gear/uniform/grey/com - restricted_roles = list("Quartermaster", "Research Director", "Chief Medical Officer", "Head Of Security", "Head Of Personnel", "Captain", "Blueshield", "Bridge Officer") + restricted_roles = list("Quartermaster", "Research Director", "Chief Medical Officer", "Head Of Security", "Head Of Personnel","Bridge Officer", "Captain", "Blueshield", "Bridge Officer") /datum/gear/uniform/trekcmdtos restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster","Bridge Officer") diff --git a/tgstation.dme b/tgstation.dme index 407f331c7c12..1f32d3184b4e 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1357,6 +1357,7 @@ #include "code\game\objects\items\devices\doorCharge.dm" #include "code\game\objects\items\devices\electroadaptive_pseudocircuit.dm" #include "code\game\objects\items\devices\electrochromatic_kit.dm" +#include "code\game\objects\items\devices\fee_terminal.dm" #include "code\game\objects\items\devices\flashlight.dm" #include "code\game\objects\items\devices\forcefieldprojector.dm" #include "code\game\objects\items\devices\geiger_counter.dm" @@ -2645,6 +2646,7 @@ #include "code\modules\jobs\job_types\cargo\cargo_technician.dm" #include "code\modules\jobs\job_types\cargo\shaft_miner.dm" #include "code\modules\jobs\job_types\command\blueshield.dm" +#include "code\modules\jobs\job_types\command\bridgeofficer.dm" #include "code\modules\jobs\job_types\command\captain.dm" #include "code\modules\jobs\job_types\command\chief_engineer.dm" #include "code\modules\jobs\job_types\command\chief_medical_officer.dm" @@ -2654,7 +2656,6 @@ #include "code\modules\jobs\job_types\command\research_director.dm" #include "code\modules\jobs\job_types\engineer\atmospheric_technician.dm" #include "code\modules\jobs\job_types\engineer\station_engineer.dm" -#include "code\modules\jobs\job_types\juridical\bridgeofficer.dm" #include "code\modules\jobs\job_types\juridical\lawyer.dm" #include "code\modules\jobs\job_types\juridical\magistrate.dm" #include "code\modules\jobs\job_types\medbay\chemist.dm"