Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bombers resprite & added pockets, added armoredbomber to pilot loadout #2240

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
loadout-group-security-pilot-backpack = Пилот СБ, рюкзак
loadout-group-security-pilot-head = Пилот СБ, голова
loadout-group-security-pilot-outerclothing = Пилот СБ, верхняя одежда
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@
name: bomber jacket
description: A thick, well-worn WW2 leather bomber jacket.
components:
# SS220 resprite begin
- type: Sprite
sprite: Clothing/OuterClothing/Coats/bomber.rsi
# sprite: Clothing/OuterClothing/Coats/bomber.rsi
sprite: SS220/Clothing/OuterClothing/Coats/bomber.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Coats/bomber.rsi
# sprite: Clothing/OuterClothing/Coats/bomber.rsi
sprite: SS220/Clothing/OuterClothing/Coats/bomber.rsi
# SS220 resprite end

- type: entity
parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt

- type: entity
parent: ClothingOuterBase
parent: ClothingOuterStorageBase
id: ClothingOuterArmorBobmer
name: бронированный бомбер
description: Настоящие лётчики носят и бронежилеты, и модные куртки.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@
id: PilotCapCap
equipment:
head: ClothingHeadPilotCapCap
# Outer
- type: loadout
id: SecBomber
equipment:
outerClothing: ClothingOuterArmorBobmer
12 changes: 12 additions & 0 deletions Resources/Prototypes/SS220/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,18 @@
- SecurityBeret
- SecurityHat
- PilotCapCap

- type: loadoutGroup
id: SecurityPilotOuterClothing
name: loadout-group-security-pilot-outerclothing
loadouts:
- ArmorVest
- ArmorVestSlim
- SecurityOfficerWintercoat
- CoatSecurityOvercoat
- SecBomber
- VestArmorSec
- CyberVestSecurity
# Пилот (Конец)
#! Служба безопасности (Конец)

Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/Loadouts/role_loadouts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
- SecurityNeck #holster loadout
- SecurityJumpsuit
- SecurityBackpack
- SecurityOuterClothing
- SecurityPilotOuterClothing
- SurvivalSecurity
- SecurityShoes
- SecurityPDA
Expand Down
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
@@ -1,7 +1,7 @@
{
"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)",
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Sprited by enmer_ (Discord) for SS220",

"size": {
"x": 32,
Expand All @@ -14,6 +14,10 @@
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
Expand Down
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": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Sprited by enmer_ (Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading