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

[WiP] Clothing cleanup (take 2)(reopened) #2386

Open
wants to merge 83 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
98ff991
SS220\Entities\Clothing
chell4592 Sep 6, 2024
35d3186
license fix
chell4592 Sep 9, 2024
611bf49
fix
chell4592 Sep 9, 2024
567396d
try to fix conflicts
chell4592 Sep 9, 2024
1a8db92
Merge branch 'master' into subbotnik
chell4592 Sep 9, 2024
e2a4ee0
another try to fix conflicts
chell4592 Sep 9, 2024
4ed6fea
try to fix fix
chell4592 Sep 9, 2024
66910f8
fix fix fix fix fix
chell4592 Sep 9, 2024
155fb2c
fix...
chell4592 Sep 9, 2024
bef17d0
i hope the last one
chell4592 Sep 9, 2024
4b1e7bd
revert of wizden discounts
lexaSvarshik Oct 6, 2024
ee99aaf
Revert "revert of wizden discounts"
lexaSvarshik Oct 6, 2024
7cda59c
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 9, 2024
069c2d0
Merge remote-tracking branch 'upstream/master'
lexaSvarshik Oct 9, 2024
4e50397
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 12, 2024
178e0fd
Merge remote-tracking branch 'upstream/master'
lexaSvarshik Oct 14, 2024
cfd3eb2
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 16, 2024
eadbc56
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 17, 2024
0e00ee0
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 18, 2024
c738a22
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 19, 2024
bb8f771
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 23, 2024
7038765
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 24, 2024
c1f0dca
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 25, 2024
fea4a43
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 25, 2024
576fb81
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 27, 2024
a847328
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 28, 2024
3b6fc23
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Oct 28, 2024
ebfed57
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Nov 1, 2024
fcccc00
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Nov 4, 2024
080a60a
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Nov 7, 2024
500aeae
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Nov 10, 2024
812c0bc
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Nov 17, 2024
973e3d5
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Nov 29, 2024
41e76a1
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Dec 1, 2024
1c48c94
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Dec 10, 2024
782cd0a
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Dec 11, 2024
d8848db
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Dec 20, 2024
1022e94
Merge branch 'SerbiaStrong-220:master' into master
lexaSvarshik Dec 22, 2024
0a88865
Merge branch 'master' into clothing_cleanup1
lexaSvarshik Dec 22, 2024
6e912e2
Update backpacks.yml
lexaSvarshik Dec 22, 2024
00c35f7
jumpsuits cleaned
lexaSvarshik Dec 22, 2024
b4f729c
jumpskirts cleaned
lexaSvarshik Dec 22, 2024
070a9f8
melkiy nasral
lexaSvarshik Dec 22, 2024
dfea44e
revert submodule?
lexaSvarshik Dec 22, 2024
2af9cf9
Update RobustToolbox
lexaSvarshik Dec 22, 2024
0455dff
Update RobustToolbox
lexaSvarshik Dec 22, 2024
31e2318
UHHH OKAY?
lexaSvarshik Dec 23, 2024
04e6431
blyat melkuu konflikti
lexaSvarshik Dec 23, 2024
21a9fb5
fix blueshield duplicate
lexaSvarshik Dec 23, 2024
b3cbeea
ClothingMaskGasCentcomm duplicate fix
lexaSvarshik Dec 23, 2024
83e5aac
another duplicates
lexaSvarshik Dec 23, 2024
139d909
duplicates in satchels
lexaSvarshik Dec 23, 2024
23f00e3
фпфштю Ищще
lexaSvarshik Dec 23, 2024
ff3e475
ya shas makaronu em
lexaSvarshik Dec 23, 2024
b5fcdb7
remove moooore
lexaSvarshik Dec 23, 2024
207eb17
shlepa shon
lexaSvarshik Dec 23, 2024
c58a4bc
Update jumpsuits.yml
lexaSvarshik Dec 23, 2024
3b5e972
horns duplicate
lexaSvarshik Dec 23, 2024
70644b8
another duplicate
lexaSvarshik Dec 23, 2024
f32da8e
all duplicates
lexaSvarshik Dec 23, 2024
2bb7877
THERE IS EML WITHOUT PROTOTYPES, HAPPY NOW?
lexaSvarshik Dec 23, 2024
9d5c10a
another duplicates
lexaSvarshik Dec 23, 2024
c2fafc7
WHO DID THIS
lexaSvarshik Dec 23, 2024
1914542
what bacpack forgot in satchels
lexaSvarshik Dec 23, 2024
44cde35
:gaa:
lexaSvarshik Dec 23, 2024
88b6bce
there is a lot duplicates
lexaSvarshik Dec 23, 2024
828abae
duuuuuplicates
lexaSvarshik Dec 23, 2024
2b4a305
moved from misc to proper place
lexaSvarshik Dec 23, 2024
6fdf0ba
FIXED A BIG BUG!!1!! joking, duplicate removed
lexaSvarshik Dec 23, 2024
29d3205
what da backpacks in satchels doin?
lexaSvarshik Dec 23, 2024
fe26266
who put it here? curse of satchels
lexaSvarshik Dec 23, 2024
f08bc91
no locale i dont care in next pr maybe :(
lexaSvarshik Dec 23, 2024
0047a9d
ti moraychka ya moryak
lexaSvarshik Dec 23, 2024
c47a6a0
ne spite v specific.yml
lexaSvarshik Dec 23, 2024
ef7402e
fix checki
lexaSvarshik Dec 23, 2024
221c13a
ysatyu likvidirovan
lexaSvarshik Dec 24, 2024
72f7281
Create jumpskirts.yml
lexaSvarshik Dec 24, 2024
50f5da3
Merge branch 'master' into clothing_cleanup1
lexaSvarshik Dec 24, 2024
f02a4e1
blueshild old removed, other proto moved
lexaSvarshik Dec 24, 2024
84f4702
Merge branch 'clothing_cleanup1' of https://github.com/lexaSvarshik/s…
lexaSvarshik Dec 24, 2024
9064e9b
some things back
lexaSvarshik Dec 24, 2024
d1564da
move rd armor
lexaSvarshik Dec 24, 2024
5d7c4e1
delete empty files
lexaSvarshik Dec 24, 2024
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
25 changes: 25 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,28 @@
- id: BoxFolderBlue
- id: RubberStampApproved
- id: RubberStampDenied

- type: entity
parent: ClothingBackpack
id: ClothingBackSatchelSRT
name: сумка ГСН
description: Прочная сумка спецназа NanoTrasen.
components:
- type: Sprite
sprite: SS220/Clothing/Satchel/SRTSatchel.rsi
- type: Storage
grid:
- 0,0,6,3

- type: entity
parent: ClothingBackSatchelSRT
id: ClothingBackSatchelSRTFilled
suffix: Заполненный
components:
- type: StorageFill
contents:
- id: BoxSurvivalSecurity
- id: WeaponAdvancedRevolver
- id: WeaponSubMachineGunAtreides
- id: MagazinePistolSubMachineGun
- id: MagazinePistolSubMachineGun
34 changes: 34 additions & 0 deletions Resources/Prototypes/SS220/Entities/Clothing/Back/specific.yml
Original file line number Diff line number Diff line change
@@ -1 +1,35 @@
# © 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: ClothingBackpackHolding
id: ClothingBackpack_admin_Head
suffix: Shitspawn, AdminV
name: Админ шляпы
description: Все шляпы специально для админов
components:
- type: StorageFill
contents:
- id: admin_Head_hell
- id: admin_Head_db_shotgun
- id: admin_Head_magic_guardians
- id: admin_Head_singularitytoy
- id: admin_Head_buffrat
- id: admin_Head_jensencoat
- id: admin_Head_holoclown_guardians
- id: admin_Head_parrot
- id: admin_Head_ghostsheet
- id: admin_Head_mimebot
- id: admin_Head_terminator
- id: admin_Head_tech_guardians
- id: admin_Head_carpsuit
- id: admin_Head_rainbow_slime
- id: admin_Head_miner_guardians
- id: admin_Head_mothroach
- id: admin_Head_plushie_lizard
- id: admin_Head_judge
- id: admin_Head_whiskeybottle
- id: admin_Head_revenant
- id: admin_Head_nuke
- id: admin_Head_watermelon
- id: admin_Head_blue_slime
- id: admin_Head_behonker
30 changes: 24 additions & 6 deletions Resources/Prototypes/SS220/Entities/Clothing/Belt/belts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,14 +249,32 @@
- Bottle
sprite: Clothing/Belt/belt_overlay.rsi
- type: Appearance

- type: entity
parent: ClothingBeltStorageBase
id: ClothingBeltWebbingSRT
name: пояс ГСН
description: Этот пояс позволяет хранить всё необходимое в удобном и быстродоступном месте, а материал из которого он выполнен, позволяет выглядеть ещё более стильно.
components:
- type: Sprite
sprite: Clothing/Belt/assault.rsi
- type: Clothing
sprite: Clothing/Belt/assault.rsi
- type: Storage

- type: entity
parent: ClothingBeltWebbingSRT
id: ClothingBeltWebbingSRTFilled
suffix: Заполненный
components:
- type: StorageFill
contents:
- id: HydroponicsToolMiniHoe
- id: HydroponicsToolSpade
- id: HydroponicsToolClippers
- id: RobustHarvestChemistryBottle

#chief 220
- id: FlashlightSeclite
- id: CombatKnife
- id: Handcuffs
- id: Handcuffs
- id: GrenadeFlashBang
- id: GrenadeFlashBang

- type: entity
parent: ClothingBeltStorageBase
Expand Down
104 changes: 0 additions & 104 deletions Resources/Prototypes/SS220/Entities/Clothing/Hand/hands.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,110 @@
# © 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: ClothingHandsGlovesCaptain
id: ClothingHandsWhiteGlovesCaptain
name: белые перчатки капитана
description: Дорогие перчатки ветерана флотской службы NT.
components:
- type: Sprite
sprite: SS220/Clothing/Hands/whitecapgloves.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/whitecapgloves.rsi

- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesCentcom
name: centcom gloves
description: A pair of high-quality thick centcom gloves decorated with gold embroidery.
components:
- type: Sprite
sprite: SS220/Clothing/Hands/Gloves/centcom_officer.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/Gloves/centcom_officer.rsi
- type: DamageOnInteractProtection
damageProtection:
flatReductions:
Heat: 10
- type: Insulated

- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesNanotrasenDiplomat
name: nanotrasen diplomat gloves
description: A pair of high-quality white thick gloves decorated with gold embroidery, which are issued to a Nanotrasen diplomat.
components:
- type: Sprite
sprite: SS220/Clothing/Hands/Gloves/nanotrasen_diplomat.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/Gloves/nanotrasen_diplomat.rsi
- type: DamageOnInteractProtection
damageProtection:
flatReductions:
Heat: 10
- type: Insulated

- type: entity
parent: ClothingHandsGlovesJanitor
id: ClothingHandsGlovesOrangeJanitor
name: оранжевые резиновые перчатки
description: Высококачественные резиновые перчатки, скрипящие от желания сделать уборку!
suffix: Не маппить
components:
- type: Sprite
sprite: SS220/Clothing/Hands/Gloves/orangejanitor.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/Gloves/orangejanitor.rsi

# Уборщик
- type: entity
parent: ClothingHandsGlovesJanitor
id: ClothingHandsGlovesJanitorJR
name: black rubber gloves Junk Recycles
description: Cleaning gloves with an additional protective coating. They've seen so much...
suffix: JR, For playing time
components:
- type: Sprite
sprite: SS220/Clothing/Hands/Gloves/janitor_jr.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/Gloves/janitor_jr.rsi

- type: entity
parent: ClothingHandsGlovesSyntheticBase
id: ClothingHandsGlovesSecTactical
name: security tactical gloves
description: tactical security element
components:
- type: Sprite
sprite: SS220/Clothing/Hands/Gloves/sectactical.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/Gloves/sectactical.rsi
- type: Fiber
fiberColor: fibers-black

# ЭС
- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesDQ
name: DQ combat gloves
description: Power gloves that multiply the mechanical force of impact.
components:
- type: Insulated
- type: Sprite
sprite: SS220/Clothing/Hands/Gloves/dq_gloves.rsi
- type: Clothing
sprite: SS220/Clothing/Hands/Gloves/dq_gloves.rsi
- type: MeleeWeapon
attackRate: 1.5
damage:
types:
Blunt: 45
animation: WeaponArcFist
- type: Fiber
fiberMaterial: fibers-insulative
- type: FingerprintMask

# SS220 HandWraps begin

- type: entity
parent: ClothingHandsGlovesSyntheticBase
id: ClothingHandWraps
Expand Down Expand Up @@ -199,3 +304,5 @@
- type: Construction
graph: ClothingHandWrapsYellowCraft
node: ClothingHandWraps

# SS220 HandWraps end
Loading
Loading