diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 7b1b1ab2ff6b..9c4459eae6f5 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -50,7 +50,31 @@ - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: ClothingEyesHudSecurity - +#SS220-Pilot +- type: entity + id: LockerPilotFilled + suffix: Filled + parent: LockerPilot + components: + - type: StorageFill + contents: + - id: FlashlightSeclite + - id: WeaponDisabler + prob: 0.3 + - id: ClothingOuterArmorBobmer + - id: ClothingHeadHatPilotBeret + - id: ClothingBeltSecurityFilled + - id: Flash + - id: ClothingEyesGlassesSecurity + - id: ClothingHandsGlovesCombat + - id: ClothingShoesBootsJack + - id: ClothingEyesHudSecurity + - id: ClothingOuterHardsuitSecurity + - id: HandheldGPSBasic + - id: PilotBriefing + - id: YellowOxygenTankFilled + - id: NitrogenTankFilled + - type: entity id: LockerSecurityFilled suffix: Filled diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 144ef91c89e9..9d54219182e8 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -359,7 +359,7 @@ components: - type: AccessReader access: [["Detective"]] - + - type: entity id: LockerEvidence parent: LockerSecurity @@ -369,6 +369,21 @@ - type: AccessReader access: [["Security"]] +#SS220-Pilot +- type: entity + id: LockerPilot + parent: LockerSecurity + name: шкаф пилота СБ + description: Место для хранения пожитков славных лётчиков Корпорации. + components: + - type: Appearance + - type: EntityStorageVisuals + stateBaseClosed: podpil + stateDoorOpen: podpil_open + stateDoorClosed: podpil_door + - type: AccessReader + access: [["Security"]] #WMT + # Syndicate - type: entity id: LockerSyndicatePersonal diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Head/PilotBeret.yml b/Resources/Prototypes/SS220/Entities/Clothing/Head/PilotBeret.yml new file mode 100644 index 000000000000..a133d97f00e5 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Head/PilotBeret.yml @@ -0,0 +1,15 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatPilotBeret + name: берет лётчика + description: Берет с наушниками... Чтоб уши грели. + components: + - type: Sprite + sprite: SS220/Clothing/Head/Hats/beret_pilot.rsi + - type: Clothing + sprite: SS220/Clothing/Head/Hats/beret_pilot.rsi + - type: Tag + tags: + - ClothMade + - HamsterWearable + - WhitelistChameleon \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/ArmorBobmer.yml b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/ArmorBobmer.yml new file mode 100644 index 000000000000..275078a7b0a1 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/OuterClothing/ArmorBobmer.yml @@ -0,0 +1,25 @@ +- type: entity + parent: ClothingOuterBase + id: ClothingOuterArmorBobmer + name: бронированный бомбер + description: Настоящие лётчики носят и бронежилеты, и модные куртки. + components: + - type: Sprite + sprite: SS220/Clothing/OuterClothing/Armor/secbomber.rsi + - type: Clothing + sprite: SS220/Clothing/OuterClothing/Armor/secbomber.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.65 + Heat: 0.70 + - type: Tag + tags: + - WhitelistChameleon + - type: PressureProtection + highPressureMultiplier: 0.02 + lowPressureMultiplier: 1000 + - type: TemperatureProtection + coefficient: 0.001 \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml new file mode 100644 index 000000000000..33b4c1723533 --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml @@ -0,0 +1,11 @@ +- type: entity + parent: UnsensoredClothingUniformBase + id: ClothingUniformMundir + name: солдатский мундир + description: Отражение силы, дисциплины и патриотизма в статной форме. + suffix: Ebent + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/Mundir.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/Mundir.rsi \ No newline at end of file diff --git a/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/OfficerMundir.yml b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/OfficerMundir.yml new file mode 100644 index 000000000000..415ee0b2734b --- /dev/null +++ b/Resources/Prototypes/SS220/Entities/Clothing/Uniforms/OfficerMundir.yml @@ -0,0 +1,11 @@ +- type: entity + parent: UnsensoredClothingUniformBase + id: ClothingUniformOfficerMundir + name: офицерский мундир + description: Строгий и авторитетный наряд военного. + suffix: Ebent + components: + - type: Sprite + sprite: SS220/Clothing/Uniforms/OfficerMundir.rsi + - type: Clothing + sprite: SS220/Clothing/Uniforms/OfficerMundir.rsi diff --git a/Resources/Prototypes/SS220/Maps/delta.yml b/Resources/Prototypes/SS220/Maps/delta.yml index dc74814d8fa2..8254edcd7a3d 100644 --- a/Resources/Prototypes/SS220/Maps/delta.yml +++ b/Resources/Prototypes/SS220/Maps/delta.yml @@ -31,7 +31,8 @@ HeadOfSecurity: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Warden: [ 1, 1 ] - Detective: [ 1, 1 ] + Detective: [ 1, 1 ] + SecurityPilot: [ 1, 1 ] SecurityOfficer: [ 5, 5 ] SecurityCadet: [ 3, 3 ] Brigmedic: [ 1, 1 ] @@ -99,4 +100,4 @@ minimapData: !type:StationMinimapData mapTexture: SS220/ViewableMaps/220Delta.png originOffset: -80, -35 - mapScale: 6.4 \ No newline at end of file + mapScale: 6.4 diff --git a/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml b/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml index a100923d5fef..62c5e169151e 100644 --- a/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml +++ b/Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml @@ -28,14 +28,10 @@ back: ClothingBackpackSecurityPilotFilled shoes: ClothingShoesBootsCombatFilled eyes: ClothingEyesGlassesSecurity - head: ClothingHeadHatBeretSecurity # Corvax-Resprite - outerClothing: ClothingOuterHardsuitSecurity - suitstorage: YellowOxygenTankFilled id: SecurityPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58Nonlethal - pocket2: HandheldGPSBasic innerClothingSkirt: ClothingUniformJumpskirtSec satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET-hamster.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET-hamster.png new file mode 100644 index 000000000000..a1f025c9a460 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..4e8697be24a1 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/icon.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/icon.png new file mode 100644 index 000000000000..0b236dd84c9f Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-left.png new file mode 100644 index 000000000000..aa29aa640601 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-right.png new file mode 100644 index 000000000000..c11a6f4f0a60 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/meta.json b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/meta.json new file mode 100644 index 000000000000..ade65863af2d --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Head/Hats/beret_pilot.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..f66a30ae7cc5 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/icon.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/icon.png new file mode 100644 index 000000000000..a4aa114f98cb Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-left.png new file mode 100644 index 000000000000..6c70d874ede8 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-right.png new file mode 100644 index 000000000000..1ebbcd99966b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json new file mode 100644 index 000000000000..a43adbadac40 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/2fea0a59470c476cf3f927833d3918d89cbe6af8 and edited by wheremytea (Discord)", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 000000000000..a74defff38e6 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..50c446335cd2 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/icon.png new file mode 100644 index 000000000000..9c2d4f50c327 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-left.png new file mode 100644 index 000000000000..d4c4914a9f34 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-right.png new file mode 100644 index 000000000000..d119d6ece8e3 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json new file mode 100644 index 000000000000..e04e4e76ad93 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by glek3197 (Discord) for SS220", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 000000000000..f3b510063dcb Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..2ce4fd6a8418 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/icon.png b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/icon.png new file mode 100644 index 000000000000..2a1de22d417b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/icon.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-left.png b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-left.png new file mode 100644 index 000000000000..5d5d6a34cf4b Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-left.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-right.png b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-right.png new file mode 100644 index 000000000000..db46ebe013a0 Binary files /dev/null and b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/inhand-right.png differ diff --git a/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/meta.json b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/meta.json new file mode 100644 index 000000000000..e04e4e76ad93 --- /dev/null +++ b/Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt", + "copyright": "Made by glek3197 (Discord) for SS220", + + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 08a9dd6bd9a7..774f60a725b5 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -428,7 +428,16 @@ { "name": "paramed_open" }, - { + { + "name": "podpil" + }, + { + "name": "podpil_door" + }, + { + "name": "podpil_open" + }, + { "name": "psych_secure" }, { @@ -557,4 +566,4 @@ "name": "ussp_open" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Storage/closet.rsi/podpil.png b/Resources/Textures/Structures/Storage/closet.rsi/podpil.png new file mode 100644 index 000000000000..b8c8e94ffadb Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/podpil.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/podpil_door.png b/Resources/Textures/Structures/Storage/closet.rsi/podpil_door.png new file mode 100644 index 000000000000..74cdf68e73bd Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/podpil_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/podpil_open.png b/Resources/Textures/Structures/Storage/closet.rsi/podpil_open.png new file mode 100644 index 000000000000..fc0068d6c203 Binary files /dev/null and b/Resources/Textures/Structures/Storage/closet.rsi/podpil_open.png differ