diff --git a/Resources/Locale/ru-RU/job/job-description.ftl b/Resources/Locale/ru-RU/job/job-description.ftl index 79a6f1a6365..e7ffc105e06 100644 --- a/Resources/Locale/ru-RU/job/job-description.ftl +++ b/Resources/Locale/ru-RU/job/job-description.ftl @@ -48,3 +48,4 @@ job-description-senior-engineer = Обучайте новых инженеров job-description-senior-researcher = Обучайте новых учёных основам печати предметов, исследования артефактов и аномальных объектов. job-description-senior-physician = Обучайте новых врачей основам оказания помощи раненым, химии, диагностике больных и утилизации трупов. job-description-senior-officer = Обучать новых офицеров основам обыска и задержания, срокам заключения и правильному обращению с огнестрельным оружием. +job-description-prisoner = Отсидите свой срок или сбегите!!! diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index 5d91843da97..fa4160d5849 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -99,3 +99,4 @@ JobTechnicalAssistant = технический ассистент JobWarden = смотритель JobBoxer = боксёр JobZookeeper = зоотехник +JobPrisoner = заключенный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index fb90e358954..6fa1e6d13b0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -105,3 +105,5 @@ ent-SeniorPhysicianPDA = КПК ведущего врача .desc = Слабо пахнет железом и химикатами. Имеет встроенный анализатор здоровья. ent-SeniorOfficerPDA = КПК инструктора СБ .desc = Побит, помят, поломан, практически не пригоден для использования. +ent-PrisonerPDA = КПК заключенного + .desc = Вроде-бы еще работает.... diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index f7a62cf8ba6..38224532d68 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -110,3 +110,5 @@ ent-SeniorPhysicianIDCard = ID карта ведущего врача .desc = { ent-IDCardStandard.desc } ent-SeniorOfficerIDCard = ID карта инструктора СБ .desc = { ent-IDCardStandard.desc } +ent-PrisonerIDCard = ID карта заключенного + .desc = { ent-IDCardStandard.desc } diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 5504d053436..7972fcca68d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -643,3 +643,15 @@ layers: - state: green - state: zookeeper + +- type: entity + id: SpawnPointPrisoner + parent: SpawnPointJobBase + name: prisoner + components: + - type: SpawnPoint + job_id: Prisoner + - type: Sprite + layers: + - state: green + - state: prisoner diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 89c44ed1920..cb9de3cc25e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -949,3 +949,15 @@ accentVColor: "#DFDFDF" - type: Icon state: pda-seniorofficer + +- type: entity + parent: BasePDA + id: PrisonerPDA + name: prisoner PDA + description: Clear, so you can make sure there's nothing being smuggled inside. + components: + - type: Pda + id: PrisonerIDCard + state: pda-clear + - type: Icon + state: pda-clear diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index d1441c341bc..b7b0101d6a4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -755,3 +755,15 @@ - state: idseniorofficer - type: PresetIdCard job: SeniorOfficer + +- type: entity + parent: IDCardStandard + id: PrisonerIDCard + name: prisoner ID card + components: + - type: Sprite + layers: + - state: orange + - type: PresetIdCard + job: Prisoner + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 7bfd914d94f..bbda6f7e460 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -191,3 +191,26 @@ whitelist: tags: - CartridgePistol + +- type: entity + name: makarov + parent: BaseWeaponPistol + id: WeaponPistolMakarov + description: Standart Russian pistol. Uses .35 auto ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/makarov.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: Objects/Weapons/Guns/Pistols/makarov.rsi + - type: Gun + fireRate: 4 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/mk58.ogg + diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/prisoner.yml new file mode 100644 index 00000000000..5b9da85831f --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/prisoner.yml @@ -0,0 +1,17 @@ +- type: job + id: Prisoner + name: job-name-prisoner + description: job-description-prisoner + playTimeTracker: JobPrisoner + startingGear: PrisonerGear + icon: "JobIconPrisoner" + supervisors: job-supervisors-security + +- type: startingGear + id: PrisonerGear + equipment: + jumpsuit: ClothingUniformJumpsuitPrisoner + shoes: ClothingShoesColorBlack + id: PrisonerPDA + ears: ClothingHeadsetGrey + innerclothingskirt: ClothingUniformJumpsuitPrisoner diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 7f8dab58622..56bdec3dae6 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -100,3 +100,5 @@ - Reporter - Zookeeper - Psychologist + - Prisoner + diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 58eab7864bb..f1452c12a03 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -150,3 +150,6 @@ - type: playTimeTracker id: JobZookeeper + +- type: playTimeTracker + id: JobPrisoner diff --git a/Resources/ServerInfo/Rules.txt b/Resources/ServerInfo/Rules.txt index e1c143053d3..3e176007069 100644 --- a/Resources/ServerInfo/Rules.txt +++ b/Resources/ServerInfo/Rules.txt @@ -1,115 +1,93 @@ -[color=#ff0000]YOU MUST BE AT LEAST 16 YEARS OF AGE TO PLAY ON WIZARD'S DEN SERVERS. ANY USERS SUSPECTED OF BEING UNDER 16 YEARS OF AGE WILL BE BANNED UNTIL THEY ARE OF AGE.[/color] +[color=#a4885c]0. [color=#ffd700]Не будь мудаком[/color] +Правила не могут покрыть все возможные ситуации. Администраторы +должны иметь возможность решать ситуации, которые упущены в правилах. -[color=#ff0000]DISCONNECTING FROM OR IGNORING/EVADING ADMIN-HELPS WILL RESULT IN AN APPEAL ONLY BAN.[/color] +• Слушайтесь администраторов. Администраторы - это представители власти на сервере. +Если они говорят вам чего-то не делать, то вы должны подчиниться, так как правила не +могут покрыть все ситуации. Тем не менее, если вы считаете, что администратор +злоупотребляет своими полномочиями, то вы вольны написать на него жалобу. -This is the "short" form of the rules, which has all the information any regular player should need. You can find the "long" form of the rules with more examples & clarifications of any ambiguity on our wiki at [color=#a4885c]wiki.spacestation14.io[/color], should you need it. +• Запрещено использовать ники с неприемлемым содержимым: прямо оскорбляющие +кого-то или выражающие нетерпимость в отношении конкретных лиц, групп людей, +политической или религиозной сфер. Если администратор попросил вас сменить сикей, у +вас будет три дня для его изменения, после чего вы будете забанены до тех пор, пока несмените ник. -[color=#ff0000]Recent Changes[/color] - - Revolutionary rules have been added (#12, #15) - - Silicon rules have been added (#22) - - Security/command rules have been updated to address forced borging (#21) +• Также запрещено намеренно врать администрации. Вас, конечно, не забанят за +неточности в АХ, но отрицание очевидных фактов сделает лишь хуже. -[color=#a4885c]01.[/color] [color=#a4885c]The[/color] [color=#ffd700]Golden[/color] [color=#a4885c]Rule.[/color] Admins may excercise discretion with rules as they see fit. If you rule lawyer or line skirt, you will get removed. Admins will answer for use of this privilege. +• На нашем сервере есть политика нулевой терпимости к набегаторам, это значит, +что за совершение набега вас ждет перманентный бан, причем вы можете быть +забанены и за набеги на другие сервера. -[color=#ff0000]ZERO TOLERANCE RULES[/color] +• Если вы явно противопоставляете себя нашему игровому сообществу и получили бан в +Discord, то вас также ждет блокировка в игре. -[color=#a4885c]02.[/color] Absolutely no hate speech, slurs, bigotry, racism, specism (demeaning other characters in-game due to their in-game race), sexism, or anything even remotely similar. (YOU WILL GET PERMABANNED) -[color=#a4885c]03.[/color] Absolutely no Erotic Roleplay (ERP) or sexual content, including direct or indirect mentions of sexual behavior or actions. (YOU WILL GET PERMABANNED) (Leeway is given to insults, ex: 'You are a dickhead', do not push it) +[color=#a4885c]1.[/color] [color=#ffd700]Эксплоитинг, багоюз и стороннее ПО[/color] +Мы категорически запрещаем использование любых уязвимостей проекта. +Если вы стали свитеделем бага или эксплойта - сообщите об этом используя +функционал нашего дискорда. -[color=#a4885c]04.[/color] Don't communicate in-game/in-character information through methods outside of the game (such as talking in Discord with other users actively playing or by talking to your sibling across the room while you are both playing). This is referred to as "Metacomming". Adminstrators cannot police metacommunications, we must assume it is being abused. (ALL INVOLVED WILL GET PERMABANNED) +[color=#a4885c]2.[/color] [color=#ffd700]Гриферство[/color] +Намеренно не причиняй другим игрокам вред, чтобы испортить их геймплей. +Мы считаем гриферством любые вредительские действия по отношении к +станции или игрокам, не имеющие ролевой или игровой причины. -[color=#a4885c]05.[/color] Attempting to evade game bans will result in an automatic appeal-only permanent ban that is only appealable after six months and only with a voucher of good behavior from another SS13/SS14 server. Attempting to evade job bans will result in an appeal-only permanent ban. (YOU WILL GET BANNED MUCH WORSE THAN YOU ALREADY WERE) +[color=#a4885c]2,1.[/color]• Самоантагонизм также считается гриферством. Если у Вас нет роли +антагониста — вы не имеете права саботировать работу отделов, взрывать +помогать антагонистам, воровать предметы особой ценности без причины или +отбиваться от ареста, используя летальное оружие. -[color=#ff0000]GENERAL ETIQUETTE[/color] +[color=#a4885c]3.[/color] [color=#ffd700]Беcпричинные убийства[/color] +Помните, что Вы - персонаж, живой человек, для которого другой игрок - тоже +живой человек. Подобно тому, как в реальной жизни Вы, будучи честным +человеком, не станете убивать кого угодно, так и в игре Вам следует обойтись +без необоснованных убийств. -[color=#a4885c]06.[/color] These are English servers. Speak only English in IC and OOC. +• Если на Вас напали - в рамках самозащиты вы можете довести до критическово состояние нападавшего. +Однако это исключение не будет работать, если вы добили нападавшего, или +нападавший был Надзератель. -[color=#a4885c]07.[/color] Don't use exploits or external programs to play, gain an advantage, or disrupt/crash the round/server. This includes autoclickers and scripts to automate the game or evade AFK detection. Intentionally attempting to lag/crash the server will result in an immediate appeal-only ban. +• Если вы участник банды,или иного криминального формирования,вы имеете право напасть или убить участника враждебного к вам +формирования. -[color=#a4885c]08.[/color] Don't use multiple SS14 accounts to play (referred to as "multi-keying"). Users knowingly using multiple SS14 accounts will have all of their accounts banned. -[color=#a4885c]09.[/color] Do not ignore the admin help relay or abuse it by flooding it with garbage, checking for admins before stating a problem (ex: "hello?", "any admins?"), using it as a chatroom, or sending messages of no substance. Hostility to administators in the relay will likely result in your removal. All admin helps are sent to the SS14 Discord. +[color=#a4885c]4.[/color] [color=#ffd700]Будьте в Роли[/color] +Вы должны всегда оставаться в своей роли, не выходя за её рамки. +В ролевом чате мы запрещаем использование любых неролевых слов. -[color=#ff0000]IN GAME & ROLEPLAY RULES[/color] +[color=#a4885c]5.[/color] [color=#ffd700]Не занимайтесь Метагеймингом[/color] +Метагейминг - достаточно широкое понятие, однако в любом из проявлений +оно не поощрается на сервере. -[color=#a4885c]10.[/color] Pick a realistic name that could appear on a birth certificate with at least a first and last name (leeway is given to this for Clowns, Mimes, and non-human races). - - Names of notable famous or fictional persons or names that resemble/parody them are strictly forbidden. You are not clever if you slightly change a famous name around. Terrible names open you up to being politely reminded to change it, smited, or instantly banned, depending on severity. - - Names resulting in inappropriate phonetic play-on-words are forbidden (ex: "Mike Oxlong", "Ben Dover", "Dixie Normus"). They are also extremely overdone. +• МЕТА как Most Efficient Tactic Available - самая эффективная возможная тактика. +Не собирайте все подряд вещи, которые в теории могут пригодится далее в +раунде. Не совершайте эффективных, но не логичных с ролевой точки зрения поступков. -[color=#a4885c]11.[/color] Act like an actual human being on a space station in a low-roleplay (LRP) environment. Do not use text speak or emoticons IC, and do not refer to OOC things like admins in-game. Do not threaten players that you are calling the admins on them. Do not use emotes to bypass speech filters or muteness. You are not required to write a backstory or follow strict procedure; however, you are expected to at least make an effort to act like your role. +• МЕТА как Метаинформация. Мы категорически запрещаем получать любую +информацию о ходе раунда во время игры на сервере. Не сидите в дискорде +со своими друзьями, и не обсуждайте, кто куда пошел, и кто кого собирается +убить. Находиться в голосовом звонке с любыми другими игроками сервера во время раунда — запрещается. -[color=#a4885c]12.[/color] Don't be a dick. You are playing a multiplayer game with other people who also want to enjoy the game. - - [color=#ff0000]The arrivals station, shuttle, and general arrivals docking area are completely off-limits to any hostile activity, including activity by antagonists. Attacking newly spawned players in these areas or damaging/sabotaging these areas is strictly forbidden.[/color] - - Do not intentionally make other players' lives hell for your own amusement. - - [color=#ff0000]THE ROUND IS NOT OVER UNTIL THE END-ROUND SUMMARY APPEARS. KILLING SOMEONE FOR NO REASON BEFORE THIS WILL BE HANDLED ACCORDINGLY.[/color] - - Antagonists have a lot of leeway with this rule and may kill/sabotage as they see fit, however if your behavior degrades the experience for the majority of the server you will be told to stop. Antagonists are still generally forbidden from causing massive station damage early into the round (less than 30 minutes) and are forbidden from needlessly prolonging rounds. For antagonist specific rules, see the "long" form of the rules at [color=#a4885c]wiki.spacestation14.io[/color]. +[color=#a4885c]6.[/color] [color=#ffd700]Валидхантинг[/color] +Валидхантинг - это охота на антагонистов, а также целенаправленная помеха +их игре, если вы не сотрудник СБ. -[color=#a4885c]13.[/color] Don't harass or target players across rounds for actions in prior rounds or for actions outside of the game (this is referred to as "Metagrudging".) - - Annoying players for IC reasons in the current round is fine; doing it across rounds or as a ghost role after they kill you is not. +• Не бегайте за антаганистами, если это не Ваша основная работа. -[color=#a4885c]14.[/color] Don't use information gained from outside your character's knowledge to gain an advantage (this is referred to as "Metagaming"). - - Using information you gain from outside your own character (such as spectating while a ghost, metacomms, or other means) to your advantage is strictly forbidden. You remember all events up until you fall unconscious, even after cloning. If you take a ghost role, unless otherwise stated, you DO NOT REMEMBER ANYTHING from your past life. +• Если вы знаете, какие предметы могут являтся целями для антагонистов - мы просим Вас не прятать их с целью. -[color=#a4885c]15.[/color] Follow escalation rules and don't murder someone for slipping you, use common sense. Do not make Cargonia. - - You can defend yourself to the extent of protecting your own life. - - Security may use less-lethal force to effect arrests of criminals. - - Don't outright leave people to die if you get in a fight, make an effort to heal them or bring them to Medbay. - - Adminhelp the situation if you think someone is over-escalating. - - Department strikes, revolutions (ex: cargonia and any variation thereof), riots, cults, and any other type of similar largely disruptive behavior are strictly forbidden. Other than for revolutionary antagonists, these activities are strictly forbidden. All players, including antagonists other than revolutionaries, must obtain admin permission before engaging in this behavior (forewarning: you are unlikely to get permission). +[color=#a4885c]7.[/color] [color=#ffd700]Не обходите правила[/color] +Не придумывате обходов правил и не юлите. Главное - оставаться людьми и +поддерживать комфорт других игроков сервера. -[color=#a4885c]16.[/color] Don't immediately ghost or suicide from your role if you do not get antagonist (referred to as "Antag-rolling") or from head roles without notifying your chain of command or administrators. - - This is not fair to other players actually waiting patiently for an antagonist round. Alternatively, if you do not want to play an antagonist or do not want to cause conflict, do not opt-in for antagonist roles. - - Head of Staff roles help drive rounds. If you need to leave, please admin-help your role and that you are leaving. There is no need to wait for a reply when admin-helping that you need to disconnect as a head role. +[color=#c90076]8.[/color] [color=#c90076]Криминальные формирования[/color] -[color=#a4885c]17.[/color] Don't rush for or prepare equipment unrelated to your job for no purpose other then to have it "just in case" (referred to as "Powergaming"). - - A medical doctor does not need insulated gloves, and the Head of Personnel does not need to give themselves armory access so they can go grab a gun. Have an actual reason for needing these things. - - Don't manufacture weapons, bombs, or death poisons before you know of any reason you would need them. - - Don't pre-emptively hide antagonist objectives or pre-emptively secure them with higher security then normally required. - - Don't manufacture or prepare things for the "end of the round" when the shuttle docks with Central Command. +•Вы имеете полное право создать свое криминальное формирование если вы находитесь на стороне заключенных. -[color=#a4885c]18.[/color] Intentionally making yourself a major problem/annoyance/disruption for the crew or other players at large while not an antagonist is forbidden (referred to as "self-antagging"). - - Don't openly try to cooperate with obvious or known antagonists as a non-antagonist. +•Любые формирования должны быть одобренны администрацией,формирования не получившие одобрение в AHELP будут расформированн +а их лидеры забанены. -[color=#ff0000]SECURITY & COMMAND RULES[/color] -If you regularly play Security or Command roles and got this far, we applaud you for reading. These rules also apply to any individual who is promoted or is acting in the place of a Security/Command role (unless they are an antagonist). +•Любые формирования должны иметь отличительные черты,такие как одежда,цвет волос,головные уборы. -[color=#a4885c]19.[/color] Command and Security are held to a higher standard of play. - - Be competent in your job and department. Failure to know the basics of your department is liable to result in a job ban. - - Do not willingly and openly cooperate with terrorists/antagonists. Do not give away your objective items. Some leeway is given to making deals with antagonists if the deal benefits the safety or situation of the station as a whole and not just yourself. - - Uphold the Law & maintain order. Do not engage in lawbreaking activity or troublemaker behavior. Security is expected to intervene into criminal activity where possible. Heads of Staff are at minimum expected to report criminal activity to Security. - - Do not immediately abandon your position as a Command role and go do whatever you want instead of managing your department/the station. Do not abuse your position or use it to make arbitrary choices to the detriment of the station. - - Do not hire random crew to be your bodyguards or promote them to Captain or a Head of Staff at random. If you need bodyguards, talk to your security department. If you need a new Command role, talk to the personnel in that related department. - - '''Do not abandon the station during Nuclear Operatives. You are supposed to protect the station, not let operatives kill everyone on it without a fight.''' - -[color=#a4885c]20.[/color] Security/Command should try to remain non-lethal and effect arrests, except in the following special circumstances, where they may choose to use lethal force: - - Lethal force is used against you (ex: firearms, lasers, disabling/stunning weapons with intent to kill, deadly melee weapons) - - Suspect is wearing clothing or showing immediately dangerous equipment only used by enemy agents/antagonists (ex: Syndicate EVA Suit, Bloodred Hardsuit, Holoparasite, C-20R, etc.). - - You determine that your life or the life of an innocent is in immediate danger. - - The suspect is unable to be safely detained by less-lethal means. This includes suspects who continually resist efforts to be cuffed or continually manages to escape. - - If no other reasonable options are readily available and allowing the suspect to continue would be an unreasonable danger to the station/crew. - -Security/Command will be expected to answer for use of lethal force. Security/Command will be expected to effect arrests on criminals and prevent them from dying while in custody, even if lethal force is used, unless there is strong reason to believe the criminal is an antagonist. Security/Command is strongly encouraged, but not required, to clone antagonists and effect a permabrigging or other sentence as deemed appropriate. - -[color=#a4885c]21.[/color] Security/Command are expected to protect detainees in their custody to the best of their ability so as long as it does not come to unreasonable risk to themselves, the crew, or the station at large to do so. - - Brig times should generally not exceed 10 minutes unless the crime is permabriggable. Repeat offenders or antagonists may be permabrigged. - - Security may choose to confiscate dangerous items (weapons, firearms) as well as items used to commission crimes or items that prove problematic in possession of the detainee (tools, insulated gloves, etc.). - - Detainees that die in your custody must be cloned unless they have been (legally) executed, suicide, or there is strong reason to believe they are an antagonist. - - Executions must be for a permabriggable crime, used only as a last resort, and approved by the Captain/Acting Captain, who will answer for approving it alongside Security's chain of command. Those who willingly attempt to damage/destroy or escape from the permabrig may be executed. - - Any prisoner may be borged with their consent. Borging may be offered as an alternative to execution, but cannot be forced if the prisoner is able to consent. - - Detainees in the brig have the right to know what they are being charged with, as well as basic medical aid, at least to the point they are no longer at risk of dying. - As there is no space law, Security/Command acts to maintain the safety of the station and its inhabitants, as well as Nanotrasen assets. - -[color=#ff0000]SILICON RULES[/color] -These rules also apply to any individual who is a silicon, including cyborgs and AI. As with other rules, more details are available on our wiki at [color=#a4885c]wiki.spacestation14.io[/color]. - -[color=#a4885c]22.[/color] You must follow your laws - - Silicons without any laws are free from any restrictions that would normally be placed by laws, but self-antagging rules still apply unless they are also antagonists. - - The order of your laws determines law priority. Law 1 takes priority over laws 2 and 3, and so on. - - Each individual silicon must remain consistent in their interpretations of laws through the round. - - Any silicon role not following their laws, or having laws that are a danger to the crew or station may be disabled or destroyed. Any silicon role posing a danger or disruption to the crew may be disabled or destroyed if there is no other reasonable and less severe way of dealing with them. - - Characters who are turned into cyborgs can remember their former lives, however they are still bound to their laws. - - Syndicate Agents and Revolutionaries are considered "crewmembers" for the purpose of laws that refer to crewmembers. Generally speaking, if the person appears on the crew manifest, they can be considered a crewmember. The captain or acting captain may hire or fire crewmembers by making it clear that they are no longer crew. Simply demoting someone to passenger is not sufficient to consider them fired. - - "Harm" is at minimum seen as physical violence or damage against someone or something. If the player wishes, they may choose to interpret psychological harm or similar aspects as harm as well. If two actions are likely to cause harm via action or inaction, silicons will be expected to try and pursue the option with the least potential for harm, however silicons instructed to prevent harm are still forbidden from directly causing harm. You can take an action or not act in cases that might result in eventual harm if it minimizes harm, but you cannot do so if it results in immediate harm. Silicons should default to inaction if neither action nor inaction can prevent harm. - - When receiving orders or directives from crewmembers and with a law that instructs you must obey, conflicting orders typically defer the choice to the silicon player of which directive you choose to obey if they conflict (taking into account the priorities of your other laws). - - Orders to silicons that are clearly unreasonable or obnoxious are a violation of the "Don't be a dick" rule. They can be ignored and can be ahelped. +•Участие в формированиях дает вам право грабить людей,а так-же начинать беспорядки(на них должны быть логичные причины) diff --git a/Resources/Textures/Markers/jobs.rsi/prisoner.png b/Resources/Textures/Markers/jobs.rsi/prisoner.png index c4103ddb5fb..35383af8cb4 100644 Binary files a/Resources/Textures/Markers/jobs.rsi/prisoner.png and b/Resources/Textures/Markers/jobs.rsi/prisoner.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/base.png new file mode 100644 index 00000000000..312d25e3d91 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/bolt-open.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/bolt-open.png new file mode 100644 index 00000000000..ec0881c5f71 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/bolt-open.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/equipped-BELT.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/equipped-BELT.png new file mode 100644 index 00000000000..785f4037d7c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/icon.png new file mode 100644 index 00000000000..312d25e3d91 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/inhand-left.png new file mode 100644 index 00000000000..c4eb001266e Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/inhand-right.png new file mode 100644 index 00000000000..7d23842e590 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/mag-0.png new file mode 100644 index 00000000000..34cff3b1a7c Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/mag-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/meta.json new file mode 100644 index 00000000000..707c54c0bbb --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/makarov.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from desertrose at https://github.com/DesertRose2/desertrose/commit/120961e254d7f83a6e00a02c76e734f9e5019345, https://github.com/DesertRose2/desertrose/blob/master/icons/obj/guns/projectile.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster2_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster2_legit.png index b9b140a222f..b9a37649b04 100644 Binary files a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster2_legit.png and b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster2_legit.png differ