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

MinorTweaks #698

Merged
merged 23 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ff356e5
MinorTweaks
EstKemran Feb 1, 2024
55c95b4
Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
EstKemran Feb 1, 2024
c100693
Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
EstKemran Feb 1, 2024
1a75424
Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
EstKemran Feb 1, 2024
1af2193
Update Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
EstKemran Feb 1, 2024
d1f262b
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
49f3203
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
8341344
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
a14133f
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
46b0a6b
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
7900448
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
9c69cca
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
83b9785
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
68032b3
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
EstKemran Feb 1, 2024
fbab550
FixNotes
EstKemran Feb 2, 2024
b18b447
fixtegs
EstKemran Feb 2, 2024
c7738c7
Revert "fixtegs"
EstKemran Feb 2, 2024
b1d5fd8
Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits…
EstKemran Feb 2, 2024
748808b
Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits…
EstKemran Feb 2, 2024
a4fadfd
Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits…
EstKemran Feb 2, 2024
d672084
Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits…
EstKemran Feb 2, 2024
ed97967
Update Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits…
EstKemran Feb 2, 2024
76fe9d7
Update Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml
EstKemran Feb 2, 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
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,7 @@
- id: ClothingHeadHatWarden
- id: ClothingHeadHatBeretWarden
- id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion
- id: ClothingOuterCoatWarden #SS220-MinorTweaks start
- id: ClothingOuterCoatWardenAlt
- id: ClothingOuterWinterWarden
- id: ClothingEyesGlassesSunglasses #SS220-MinorTweaks end
18 changes: 9 additions & 9 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
prob: 0.3
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSunglasses
# - id: ClothingEyesGlassesSunglasses #SS220-MinorTweaks
- id: ClothingHeadsetAltSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
# - id: ClothingOuterCoatWarden #SS220-MinorTweaks
# - id: ClothingOuterWinterWarden #SS220-MinorTweaks
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: ClothingOuterHardsuitWarden
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
# - id: ClothingEyesHudSecurity #SS220-MinorTweaks

- type: entity
id: LockerWardenFilled
Expand All @@ -34,17 +34,17 @@
prob: 0.3
- id: ClothingBeltSecurityFilled
- id: Flash
- id: ClothingEyesGlassesSunglasses
# - id: ClothingEyesGlassesSunglasses #SS220-MinorTweaks
- id: ClothingHeadsetAltSecurity
- id: ClothingHandsGlovesCombat
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: ClothingOuterCoatWardenAlt # Corvax-SecFashion
# - id: ClothingOuterCoatWarden SS220-MinorTweaks start
# - id: ClothingOuterWinterWarden
# - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion #SS220-MinorTweaks end
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: HoloprojectorSecurity
- id: ClothingEyesHudSecurity
# - id: ClothingEyesHudSecurity #SS220-MinorTweaks
#SS220-Pilot
- type: entity
id: LockerPilotFilled
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,20 @@
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: ExplosionResistance #SS220-MinorTweaks
damageCoefficient: 0.7
- type: Armor
modifiers:
coefficients:
Blunt: 0.8
Slash: 0.8
Piercing: 0.7
Blunt: 0.85 #0.8 #SS220-MinorTweaks start
Slash: 0.85 #0.8
Piercing: 0.80 #0.7
Radiation: 0.7
Caustic: 0.8 #SS220-MinorTweaks end
Stamina: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.65
sprintModifier: 0.65
walkModifier: 0.90 #0.65 SS220-MinorTweaks
sprintModifier: 0.90 #0.65 SS220-MinorTweaks
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitBrigmedic
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Command/blue_shield.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
equipment:
jumpsuit: ClothingUniformJumpsuitBlueShield
back: ClothingBackpackFilled
shoes: ClothingShoesBootsJack
# shoes: ClothingShoesBootsJack #SS220-MinorTweaks
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesBlueShield
head: ClothingHeadHatBeretNavyBlue
outerClothing: ClothingOuterArmorBulletproof
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
access: [ [ "Blueshield" ] ]
- type: StorageFill
contents:
- id: WeaponDisabler
amount: 1
- id: WeaponSubMachineGunDrozd
# - id: WeaponDisabler #SS220-MinorTweaks
# amount: 1 #SS220-MinorTweaks
- id: WeaponSubMachineGunDrozdRubber #SS220-MinorTweaks(#Rubber)
amount: 1
- id: MagazinePistolSubMachineGun
amount: 2
- id: MagazinePistolSubMachineGunRubber #SS220-MinorTweaks
amount: 2
Loading