Skip to content

Commit 03f0d2b

Browse files
EstKemranKit0vras
andauthored
MinorTweaks (#698)
* MinorTweaks * Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml Co-authored-by: Kit0vras <[email protected]> * FixNotes * fixtegs * Revert "fixtegs" This reverts commit b18b447. * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml Co-authored-by: Kit0vras <[email protected]> * Update Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml Co-authored-by: Kit0vras <[email protected]> --------- Co-authored-by: Kit0vras <[email protected]>
1 parent a015502 commit 03f0d2b

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

+4
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,7 @@
104104
- id: ClothingHeadHatWarden
105105
- id: ClothingHeadHatBeretWarden
106106
- id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion
107+
- id: ClothingOuterCoatWarden #SS220-MinorTweaks start
108+
- id: ClothingOuterCoatWardenAlt
109+
- id: ClothingOuterWinterWarden
110+
- id: ClothingEyesGlassesSunglasses #SS220-MinorTweaks end

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
prob: 0.3
1111
- id: ClothingBeltSecurityFilled
1212
- id: Flash
13-
- id: ClothingEyesGlassesSunglasses
13+
# - id: ClothingEyesGlassesSunglasses #SS220-MinorTweaks
1414
- id: ClothingHeadsetAltSecurity
1515
- id: ClothingHandsGlovesCombat
1616
- id: ClothingShoesBootsJack
17-
- id: ClothingOuterCoatWarden
18-
- id: ClothingOuterWinterWarden
17+
# - id: ClothingOuterCoatWarden #SS220-MinorTweaks
18+
# - id: ClothingOuterWinterWarden #SS220-MinorTweaks
1919
- id: RubberStampWarden
2020
- id: DoorRemoteArmory
2121
- id: ClothingOuterHardsuitWarden
2222
- id: HoloprojectorSecurity
23-
- id: ClothingEyesHudSecurity
23+
# - id: ClothingEyesHudSecurity #SS220-MinorTweaks
2424

2525
- type: entity
2626
id: LockerWardenFilled
@@ -34,17 +34,17 @@
3434
prob: 0.3
3535
- id: ClothingBeltSecurityFilled
3636
- id: Flash
37-
- id: ClothingEyesGlassesSunglasses
37+
# - id: ClothingEyesGlassesSunglasses #SS220-MinorTweaks
3838
- id: ClothingHeadsetAltSecurity
3939
- id: ClothingHandsGlovesCombat
4040
- id: ClothingShoesBootsJack
41-
- id: ClothingOuterCoatWarden
42-
- id: ClothingOuterWinterWarden
43-
- id: ClothingOuterCoatWardenAlt # Corvax-SecFashion
41+
# - id: ClothingOuterCoatWarden SS220-MinorTweaks start
42+
# - id: ClothingOuterWinterWarden
43+
# - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion #SS220-MinorTweaks end
4444
- id: RubberStampWarden
4545
- id: DoorRemoteArmory
4646
- id: HoloprojectorSecurity
47-
- id: ClothingEyesHudSecurity
47+
# - id: ClothingEyesHudSecurity #SS220-MinorTweaks
4848
#SS220-Pilot
4949
- type: entity
5050
id: LockerPilotFilled

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,20 @@
237237
- type: PressureProtection
238238
highPressureMultiplier: 0.3
239239
lowPressureMultiplier: 1000
240+
- type: ExplosionResistance #SS220-MinorTweaks
241+
damageCoefficient: 0.7
240242
- type: Armor
241243
modifiers:
242244
coefficients:
243-
Blunt: 0.8
244-
Slash: 0.8
245-
Piercing: 0.7
245+
Blunt: 0.85 #SS220-MinorTweaks start
246+
Slash: 0.85
247+
Piercing: 0.80
248+
Radiation: 0.7
249+
Caustic: 0.8 #SS220-MinorTweaks end
246250
Stamina: 0.8
247251
- type: ClothingSpeedModifier
248-
walkModifier: 0.65
249-
sprintModifier: 0.65
252+
walkModifier: 0.90 #SS220-MinorTweaks
253+
sprintModifier: 0.90 #SS220-MinorTweaks
250254
- type: HeldSpeedModifier
251255
- type: ToggleableClothing
252256
clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic

Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
equipment:
4949
jumpsuit: ClothingUniformJumpsuitBlueShield
5050
back: ClothingBackpackFilled
51-
shoes: ClothingShoesBootsJack
51+
shoes: ClothingShoesBootsCombatFilled
5252
eyes: ClothingEyesGlassesBlueShield
5353
head: ClothingHeadHatBeretNavyBlue
5454
outerClothing: ClothingOuterArmorBulletproof

Resources/Prototypes/SS220/Entities/Structures/Storage/Lockers/blueshield_lockers.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,11 @@
3535
access: [ [ "Blueshield" ] ]
3636
- type: StorageFill
3737
contents:
38-
- id: WeaponDisabler
39-
amount: 1
40-
- id: WeaponSubMachineGunDrozd
38+
# - id: WeaponDisabler #SS220-MinorTweaks
39+
# amount: 1 #SS220-MinorTweaks
40+
- id: WeaponSubMachineGunDrozdRubber #SS220-MinorTweaks(#Rubber)
4141
amount: 1
4242
- id: MagazinePistolSubMachineGun
4343
amount: 2
44+
- id: MagazinePistolSubMachineGunRubber #SS220-MinorTweaks
45+
amount: 2

0 commit comments

Comments
 (0)