diff --git a/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl b/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl index 1fe33b2139..3acc0fece1 100644 --- a/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl +++ b/Resources/Locale/ru-RU/_sunrise/prototypes/access/accesses.ftl @@ -1 +1,3 @@ id-card-access-level-blueshield = Синий Щит +id-card-access-level-ntrep = Представитель NT +id-card-access-level-magistrat = Магистрат diff --git a/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl b/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl index bc3013e61c..43528355d3 100644 --- a/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl +++ b/Resources/Locale/ru-RU/_sunrise/prototypes/entities/structures/doors/airlocks/access.ftl @@ -7,3 +7,13 @@ ent-AirlockBlueShieldGlassLocked = { ent-AirlockCommandGlass } ent-AirlockMaintBlueShieldLocked = { ent-AirlockMaintCommandLocked } .suffix = Синий Щит, Закрыт .desc = { ent-AirlockMaintCommandLocked.desc } + +ent-AirlockNtrepLocked = { ent-AirlockCommand } + .suffix = Представитель NT, Закрыт + .desc = { ent-AirlockCommand.desc } +ent-AirlockNtrepGlassLocked = { ent-AirlockCommandGlass } + .suffix = Представитель NT, Закрыт + .desc = { ent-AirlockCommandGlass.desc } +ent-AirlockMaintNtrepLocked = { ent-AirlockMaintCommandLocked } + .suffix = Представитель NT, Закрыт + .desc = { ent-AirlockMaintCommandLocked.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl index 1a5d302484..02efa0381b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/head/hats.ftl @@ -1,2 +1,2 @@ -ent-ClothingHeadHatCapNtrep = фуражка представителя nt +ent-ClothingHeadHatCapNtrep = фуражка представителя NT .desc = Фуражка справедливости над командованием! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl index e292eb1409..20a0c0be16 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/outerclothing/suits.ftl @@ -1,4 +1,4 @@ -ent-ClothingOuterCoatNtrep = пиджак представителя nt +ent-ClothingOuterCoatNtrep = пиджак представителя NT .desc = Элегантная черная куртка, стандартный атрибут представителей Nanotrasen. -ent-ClothingOuterCoatNtrepOpen = растёгнутый пиджак представителя nt +ent-ClothingOuterCoatNtrepOpen = растёгнутый пиджак представителя NT .desc = Элегантная черная куртка, стандартный атрибут представителей Nanotrasen. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl index 100a22adcc..878c7b1649 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpskirts.ftl @@ -1,2 +1,2 @@ -ent-ClothingUniformJumpskirtNtrep = юбка-костюм представителя nt +ent-ClothingUniformJumpskirtNtrep = юбка-костюм представителя NT .desc = Эту юбку-костюм лучше не видеть. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl index 7983e0f5c7..77af5eb800 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/clothing/uniforms/jumpsuits.ftl @@ -1,4 +1,4 @@ -ent-ClothingUniformJumpsuitNtrep = костюм представителя nt +ent-ClothingUniformJumpsuitNtrep = костюм представителя NT .desc = Этот костюм лучше не видеть. - ent-ClothingUniformJumpsuitNtrepFormal = праздничный костюм представителя nt +ent-ClothingUniformJumpsuitNtrepFormal = праздничный костюм представителя NT .desc = Этот костюм лучше не видеть. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl new file mode 100644 index 0000000000..9072b45032 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/misc/rubber_stamp.ftl @@ -0,0 +1,4 @@ +ent-RubberStampNtrep = печать представителя NT + .suffix = НЕ МАППИТЬ + .desc = { ent-RubberStampBase.desc } +stamp-component-stamped-name-ntrep = Представитель NT \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl new file mode 100644 index 0000000000..01ace618d8 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_sunrise/entities/objects/weapons/melee/cane-nt.ftl @@ -0,0 +1,3 @@ +ent-CaneNT = изысканная трость + .suffix = НЕ МАППИТЬ + .desc = Трость с особой гравировкой. Кажется, она хорошо подходит для отражения нападений... \ No newline at end of file diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index 9227f94d96..da03795d5a 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -22,6 +22,8 @@ - HeadOfPersonnel - Cryogenics - BlueShield + - Magistrat + - Ntrep - type: accessLevel id: EmergencyShuttleRepealAll diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 5cf5c08717..2b9d63de6d 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -32,4 +32,6 @@ - Chapel - Hydroponics - Atmospherics + - Magistrat - BlueShield + - Ntrep diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index 3c5bc93b42..d7374a9628 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -119,6 +119,9 @@ - CentralCommand - NuclearOperative - SyndicateAgent + - BlueShield + - Ntrep + - Magistrat privilegedIdSlot: name: id-card-console-privileged-id ejectSound: /Audio/Machines/id_swipe.ogg diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 89dc4d4755..650d04f93a 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -456,7 +456,7 @@ components: - type: Appearance - type: AccessReader - access: [["Command"]] + access: [["Ntrep"]] - type: EntityStorageVisuals stateBaseClosed: hop stateDoorOpen: hop_open diff --git a/Resources/Prototypes/_Sunrise/Access/command.yml b/Resources/Prototypes/_Sunrise/Access/command.yml new file mode 100644 index 0000000000..185a4f17b5 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Access/command.yml @@ -0,0 +1,3 @@ +- type: accessLevel + id: Ntrep + name: id-card-access-level-ntrep \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml index 2a589ce9ee..ca0a7a56da 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml @@ -248,7 +248,6 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCapNtrep - noSpawn: true name: nt representive cap description: The cap of justice over command! components: diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml index 38f7cc00d5..5c2eca29d1 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/suits.yml @@ -19,6 +19,12 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 - type: entity parent: ClothingOuterBase @@ -30,6 +36,12 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep_open.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/ntrep_open.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.8 - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml index cccd5a2342..524ff00edc 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/Electronics/door_access.yml @@ -5,3 +5,11 @@ components: - type: AccessReader access: [["BlueShield"]] + +- type: entity + parent: DoorElectronics + id: DoorElectronicsNtrep + suffix: Ntrep, Locked + components: + - type: AccessReader + access: [["Ntrep"]] diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml index 07eb77405f..0f9939d44f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Misc/rubber_stamp.yml @@ -38,3 +38,16 @@ - type: Sprite sprite: _Sunrise/Objects/Misc/stamps.rsi state: stamp-magistrat + +- type: entity + name: NT representative's rubber stamp + parent: RubberStampBase + id: RubberStampNtrep + components: + - type: Stamp + stampedName: stamp-component-stamped-name-ntrep + stampedColor: "#fcc032" + stampState: "paper_stamp-ntrep" + - type: Sprite + sprite: _Sunrise/Objects/Misc/stamps.rsi + state: stamp-ntrep \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml new file mode 100644 index 0000000000..f71599943b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/cane-nt.yml @@ -0,0 +1,71 @@ +- type: entity + name: fancy cane + parent: BaseItem + id: CaneNT + description: A cane with special engraving on it. It seems well suited for fending off assailants... + components: + - type: Sprite + sprite: _Sunrise/Objects/Weapons/Melee/cane-nt.rsi + layers: + - state: cane-nt + map: [ "enum.ToggleVisuals.Layer" ] + - type: Stunbaton + energyPerUse: 25 + - type: ItemToggle + predictable: false + soundActivate: + collection: sparks + params: + variation: 0.250 + soundDeactivate: + collection: sparks + params: + variation: 0.250 + soundFailToActivate: + path: /Audio/Machines/button.ogg + params: + variation: 0.250 + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Blunt: 0 + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 10 + bluntStaminaDamageFactor: 2.0 + angle: 60 + animation: WeaponArcSlash + - type: StaminaDamageOnHit + damage: 40 + sound: /Audio/Weapons/egloves.ogg + - type: StaminaDamageOnCollide + damage: 40 + sound: /Audio/Weapons/egloves.ogg + - type: LandAtCursor + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: UseDelay + - type: Item + heldPrefix: off + size: Normal + - type: DisarmMalus + malus: 0.300 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: cane-nt-active} + False: {state: cane-nt} + - type: Riggable + - type: SolutionContainerManager + solutions: + battery: + maxVol: 5 + - type: InjectableSolution + solution: battery + - type: DrawableSolution + solution: battery \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml index 9e7f943efd..0f36f18583 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Doors/Airlocks/access.yml @@ -24,6 +24,33 @@ - type: ContainerFill containers: board: [ DoorElectronicsBlueShield ] + +- type: entity + parent: AirlockCommandGlass + id: AirlockNtrepGlassLocked + suffix: Ntrep, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsNtrep ] + +- type: entity + parent: AirlockMaint + id: AirlockMaintNtrepLocked + suffix: Ntrep, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsNtrep ] + +- type: entity + parent: AirlockCommand + id: AirlockNrepLocked + suffix: Ntrep, Locked + components: + - type: ContainerFill + containers: + board: [ DoorElectronicsNtrep ] #Hatches - type: entity diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml index f61bb7ecee..3556407581 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Command/nanotrasenrepresentative.yml @@ -12,6 +12,9 @@ supervisors: job-supervisors-centcom canBeAntag: false access: + - Armory + - Cryogenics + - Lawyer - Command - Bar - Service @@ -33,6 +36,7 @@ - Atmospherics - Cargo - Medical + - Ntrep special: - !type:AddImplantSpecial implants: [MindShieldImplant] @@ -45,3 +49,8 @@ head: ClothingHeadHatCapNtrep id: NanoTrasenRepresentativePDA ears: ClothingHeadsetAltCommand + pocket1: FlippoEngravedLighter + storage: + back: + - RubberStampNtrep + - CaneNT diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index 9fe559b115..6ffe630a01 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -230,6 +230,9 @@ }, { "name": "paper_stamp-psychologist" + }, + { + "name": "paper_stamp-ntrep" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ntrep.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ntrep.png new file mode 100644 index 0000000000..0d879d45d0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-ntrep.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json index 61cbd5793e..96ebe61851 100644 --- a/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json +++ b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/meta.json @@ -15,6 +15,9 @@ }, { "name": "stamp-magistrat" + }, + { + "name": "stamp-ntrep" } ] } diff --git a/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/stamp-ntrep.png b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/stamp-ntrep.png new file mode 100644 index 0000000000..7c8c3dee71 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/stamps.rsi/stamp-ntrep.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt-active.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt-active.png new file mode 100644 index 0000000000..3f0bd231f1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt-active.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt.png new file mode 100644 index 0000000000..dbdd22d24e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/cane-nt.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/meta.json new file mode 100644 index 0000000000..0d47f28f0e --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/meta.json @@ -0,0 +1,85 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4397d63a55dac7d0536eb9bcc0a0f68634858c50", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cane-nt" + }, + { + "name": "cane-nt-active", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-left.png new file mode 100644 index 0000000000..e007724539 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-right.png new file mode 100644 index 0000000000..0d62ad449d Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-left.png new file mode 100644 index 0000000000..3122c1acdd Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-right.png new file mode 100644 index 0000000000..95ed354769 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Weapons/Melee/cane-nt.rsi/on-inhand-right.png differ