Skip to content

Commit

Permalink
Пилот и прочее (#471)
Browse files Browse the repository at this point in the history
* shkaf

* lockers

* shkaff

* mundir

* bomber

* beret

* pilotdelta.yml

* Update security_pilot.yml

* ofmundir

* veshi

* Update Resources/Textures/SS220/Clothing/OuterClothing/Armor/secbomber.rsi/meta.json

Co-authored-by: Kit0vras <[email protected]>

* Update Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json

Co-authored-by: Kit0vras <[email protected]>

* Update Resources/Textures/SS220/Clothing/Uniforms/OfficerMundir.rsi/meta.json

Co-authored-by: Kit0vras <[email protected]>

* Update Resources/Prototypes/SS220/VladIsLove/VladIsLove.yml

Co-authored-by: Kit0vras <[email protected]>

* Update Resources/Prototypes/SS220/VladIsLove/VladIsLove.yml

Co-authored-by: Kit0vras <[email protected]>

* Update Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

Co-authored-by: Kit0vras <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml

Co-authored-by: Dexler <[email protected]>

* Apply suggestions from code review

Co-authored-by: Dexler <[email protected]>

* Update Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

Co-authored-by: Kit0vras <[email protected]>

* Delete Resources/Prototypes/SS220/VladIsLove/VladIsLove.yml

* mundiri

* armor

* beret

* meta

* moodac

* booomber

---------

Co-authored-by: Kit0vras <[email protected]>
Co-authored-by: Dexler <[email protected]>
  • Loading branch information
3 people authored Oct 29, 2023
1 parent 44c5e31 commit 325ccb1
Show file tree
Hide file tree
Showing 35 changed files with 236 additions and 10 deletions.
26 changes: 25 additions & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@
components:
- type: AccessReader
access: [["Detective"]]

- type: entity
id: LockerEvidence
parent: LockerSecurity
Expand All @@ -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
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Head/PilotBeret.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
11 changes: 11 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Uniforms/Mundir.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions Resources/Prototypes/SS220/Maps/delta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down Expand Up @@ -99,4 +100,4 @@
minimapData: !type:StationMinimapData
mapTexture: SS220/ViewableMaps/220Delta.png
originOffset: -80, -35
mapScale: 6.4
mapScale: 6.4
4 changes: 0 additions & 4 deletions Resources/Prototypes/SS220/Roles/Jobs/security_pilot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions Resources/Textures/SS220/Clothing/Uniforms/Mundir.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
}
]
}
13 changes: 11 additions & 2 deletions Resources/Textures/Structures/Storage/closet.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,16 @@
{
"name": "paramed_open"
},
{
{
"name": "podpil"
},
{
"name": "podpil_door"
},
{
"name": "podpil_open"
},
{
"name": "psych_secure"
},
{
Expand Down Expand Up @@ -557,4 +566,4 @@
"name": "ussp_open"
}
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 325ccb1

Please sign in to comment.