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.

Sign up for GitHub

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

Jump to bottom

Make Security Dripped Out Again #660

Merged
merged 66 commits into from
Aug 11, 2024
Merged

Make Security Dripped Out Again #660

Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
a5d62c3
Moves Flash to Loadouts
Tmanzxd Aug 3, 2024
ff05ae5
Gave all of nonspecialist security an extra magazine. Move Flashes to…
Tmanzxd Aug 3, 2024
db662ec
Made security loadout items more generic to the department.
Tmanzxd Aug 3, 2024
bb0cf53
Check changenotes message.
Tmanzxd Aug 3, 2024
984d566
Fixing Errors
Tmanzxd Aug 3, 2024
ad41f3e
more bugfixing
Tmanzxd Aug 3, 2024
2edb66c
More Bugfixing
Tmanzxd Aug 3, 2024
72bed5b
Still fixing Exception errors
Tmanzxd Aug 3, 2024
f7f1608
Fixed all errors, finishing touches start here
Tmanzxd Aug 3, 2024
98474c4
Added HoS Winter Coat and Alt Slim Vest
Tmanzxd Aug 3, 2024
d590b36
Slight Rebalance
Tmanzxd Aug 3, 2024
fe38825
Added Neckwear
Tmanzxd Aug 3, 2024
4a8e136
removed scarfs
Tmanzxd Aug 3, 2024
04257b4
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 3, 2024
ee11c37
Reduce point cost of nitriles.
Tmanzxd Aug 3, 2024
4501683
Last tweak
Tmanzxd Aug 3, 2024
c82d309
Update Resources/Prototypes/Loadouts/Jobs/security.yml
Tmanzxd Aug 3, 2024
111a38a
Attempt to fix #2431
Tmanzxd Aug 3, 2024
c30f12b
Removed duplicate IDs
Tmanzxd Aug 3, 2024
1717e41
Added note for a future PR
Tmanzxd Aug 3, 2024
92a4e77
Fixed all errors, further tweaked values. Loadout max point value may…
Tmanzxd Aug 3, 2024
9148953
Resolved Suggestion changes
Tmanzxd Aug 3, 2024
71202a4
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 3, 2024
4993bd9
Fixed Armorplatecarrier ID
Tmanzxd Aug 3, 2024
17a49b4
Merge branch 'FixUpSecLoadouts' of https://github.com/Tmanzxd/Einstei…
Tmanzxd Aug 3, 2024
1806716
Changelog update. Updated Migrations.
Tmanzxd Aug 3, 2024
c1f95bd
Added eeMigrations.yml
Tmanzxd Aug 4, 2024
c29991f
Moved Brigmedic filled bags to backpack.yml
Tmanzxd Aug 4, 2024
a6b689e
Removed old wizden security vest sprites, added deltaV security vest …
Tmanzxd Aug 4, 2024
9ea3421
Update Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoa…
Tmanzxd Aug 4, 2024
a17a0a7
Merge branch 'master' into FixUpSecLoadouts
Tmanzxd Aug 4, 2024
3ce9786
revert changelog changes
Tmanzxd Aug 4, 2024
8f9f1c2
Merge branch 'FixUpSecLoadouts' of https://github.com/Tmanzxd/Einstei…
Tmanzxd Aug 4, 2024
68ff1a6
Remove indent
Tmanzxd Aug 4, 2024
3a3b325
Merge branch 'master' into FixUpSecLoadouts
Tmanzxd Aug 4, 2024
89a0a22
Revert changelog manual change
Tmanzxd Aug 4, 2024
273d0bf
Merge branch 'FixUpSecLoadouts' of https://github.com/Tmanzxd/Einstei…
Tmanzxd Aug 4, 2024
fa4e82c
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 4, 2024
1dc6664
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 4, 2024
dd98408
Revert changelog.yml and deltaMigrations.yml changes
Tmanzxd Aug 4, 2024
a81a0d0
Moved brigmedic duffel and satchel fills into their respective files.
Tmanzxd Aug 4, 2024
1954c1c
Revert Armor and Vests YML and Directory changes for Armor Vests.
Tmanzxd Aug 4, 2024
0c0f05f
Revert armor value changes, these will be reflected in another PR.
Tmanzxd Aug 4, 2024
f3b33a7
Moved Security.rsi back to /armor/ directory
Tmanzxd Aug 4, 2024
204a72e
Readded vests.rsi, oops.
Tmanzxd Aug 4, 2024
e94a8d7
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 4, 2024
a08176d
Port Durathread.rsi and plateCarrier.rsi from DeltaV
Tmanzxd Aug 4, 2024
7be1bac
Merge branch 'FixUpSecLoadouts' of https://github.com/Tmanzxd/Einstei…
Tmanzxd Aug 4, 2024
5301d7a
Gave Slim armor vest same armor values
Tmanzxd Aug 4, 2024
2aa5757
Added Durathread Vests and Armor Carriers in favor of Armor Vests. Co…
Tmanzxd Aug 5, 2024
27cad62
AAAAAAAAAAAAAAAAAA (Fixed Duplicate ID Error)
Tmanzxd Aug 5, 2024
f13a086
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 5, 2024
cc93c61
Update Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoa…
Tmanzxd Aug 7, 2024
537de79
Merge branch 'master' into FixUpSecLoadouts
Tmanzxd Aug 7, 2024
41cc628
Removed Vest.rsi from armor, resolved changes requested.
Tmanzxd Aug 7, 2024
87a6afa
Merge branch 'FixUpSecLoadouts' of https://github.com/Tmanzxd/Einstei…
Tmanzxd Aug 7, 2024
044d87e
Merge branch 'master' into FixUpSecLoadouts
Tmanzxd Aug 8, 2024
80d6462
Commented out wizden armor modifiers
Tmanzxd Aug 10, 2024
98eb441
Revert "Removed old wizden security vest sprites, added deltaV securi…
Tmanzxd Aug 10, 2024
d5355cb
Revert "Commented out wizden armor modifiers"
Tmanzxd Aug 10, 2024
8827044
Revert "Removed old wizden security vest sprites, added deltaV securi…
Tmanzxd Aug 10, 2024
50786f5
Revert "Gave Slim armor vest same armor values"
Tmanzxd Aug 10, 2024
c8c2fe0
Don't know how those got deleted but its fixed.
Tmanzxd Aug 10, 2024
33e5159
Merge branch 'Simple-Station:master' into FixUpSecLoadouts
Tmanzxd Aug 10, 2024
fabcc3d
The Purge
Tmanzxd Aug 10, 2024
1d58a7b
Update Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satch…
Tmanzxd Aug 10, 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/Migrations/eeMigrations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# 2024-03-08
ClothingBackpackSatchelBrigmedicDeltaVFilled: ClothingBackpackSatchelBrigmedicFilled
ClothingBackpackDuffelBrigmedicDeltaVFilled: ClothingBackpackDuffelBrigmedicFilled
ClothingBackpackBrigmedicDeltaVFilled: ClothingBackpackBrigmedicFilled
22 changes: 19 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,23 @@
components:
- type: StorageFill
contents:
- id: Flash
# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
- id: MagazinePistol

- type: entity
noSpawn: true
parent: ClothingBackpackBrigmedic
id: ClothingBackpackBrigmedicFilled
components:
- type: StorageFill
contents:
- id: EmergencyRollerBedSpawnFolded
- id: BodyBagFolded
- id: Portafib
- id: BruteAutoInjector
amount: 2
- id: BurnAutoInjector
amount: 2
- id: MagazinePistol

- type: entity
noSpawn: true
Expand All @@ -31,10 +46,11 @@
components:
- type: StorageFill
contents:
- id: Flash
- id: ForensicPad
- id: ForensicScanner



- type: entity
noSpawn: true
parent: ClothingBackpackMedical
Expand Down
27 changes: 16 additions & 11 deletions Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,38 @@

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelSecurity
id: ClothingBackpackDuffelSecurityFilled
parent: ClothingBackpackDuffelBrigmedic
id: ClothingBackpackDuffelBrigmedicFilled
components:
- type: StorageFill
contents:
- id: Flash
# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
- id: EmergencyRollerBedSpawnFolded
- id: BodyBagFolded
- id: Portafib
# - id: Flash
- id: BruteAutoInjector
amount: 2
- id: BurnAutoInjector
amount: 2

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelSecurity
id: ClothingBackpackDuffelSecurityFilledDetective
id: ClothingBackpackDuffelSecurityFilled
components:
- type: StorageFill
contents:
- id: Flash
- id: ForensicPad
- id: ForensicScanner
- id: MagazinePistol

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelBrigmedic
id: ClothingBackpackDuffelBrigmedicFilled
parent: ClothingBackpackDuffelSecurity
id: ClothingBackpackDuffelSecurityFilledDetective
components:
- type: StorageFill
contents:
- id: Flash
- id: ForensicPad
- id: ForensicScanner

- type: entity
noSpawn: true
Expand Down
27 changes: 16 additions & 11 deletions Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,38 @@

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelSecurity
id: ClothingBackpackSatchelSecurityFilled
parent: ClothingBackpackSatchelBrigmedic
id: ClothingBackpackSatchelBrigmedicFilled
components:
- type: StorageFill
contents:
- id: Flash
# - id: MagazinePistol # DeltaV - Security doesn't get an extra mag
- id: EmergencyRollerBedSpawnFolded
- id: BodyBagFolded
- id: Portafib
# - id: Flash
Tmanzxd marked this conversation as resolved.
Show resolved Hide resolved
- id: BruteAutoInjector
amount: 2
- id: BurnAutoInjector
amount: 2

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelSecurity
id: ClothingBackpackSatchelSecurityFilledDetective
id: ClothingBackpackSatchelSecurityFilled
components:
- type: StorageFill
contents:
- id: Flash
- id: ForensicPad
- id: ForensicScanner
- id: MagazinePistol

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelBrigmedic
id: ClothingBackpackSatchelBrigmedicFilled
parent: ClothingBackpackSatchelSecurity
id: ClothingBackpackSatchelSecurityFilledDetective
components:
- type: StorageFill
contents:
- id: Flash
- id: ForensicPad
- id: ForensicScanner

- type: entity
noSpawn: true
Expand Down
15 changes: 0 additions & 15 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml
View file
Open in desktop
Tmanzxd marked this conversation as resolved.
Outdated Show resolved Hide resolved

This file was deleted.

15 changes: 0 additions & 15 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml
View file
Open in desktop
Tmanzxd marked this conversation as resolved.
Outdated Show resolved Hide resolved

This file was deleted.

15 changes: 0 additions & 15 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml
View file
Open in desktop
Tmanzxd marked this conversation as resolved.
Outdated Show resolved Hide resolved

This file was deleted.

6 changes: 3 additions & 3 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitBrigmedic
outerClothing: ClothingOuterArmorPlateCarrier
back: ClothingBackpackBrigmedicDeltaVFilled
back: ClothingBackpackBrigmedicFilled
shoes: ClothingShoesBootsCombatFilled
gloves: ClothingHandsGlovesNitrile
eyes: ClothingEyesHudMedical
Expand All @@ -45,5 +45,5 @@
belt: ClothingBeltCorpsmanWebbingFilled
pocket1: WeaponPistolMk58Nonlethal
innerClothingSkirt: ClothingUniformJumpskirtBrigmedic
satchel: ClothingBackpackSatchelBrigmedicDeltaVFilled
duffelbag: ClothingBackpackDuffelBrigmedicDeltaVFilled
satchel: ClothingBackpackSatchelBrigmedicFilled
duffelbag: ClothingBackpackDuffelBrigmedicFilled
1 change: 0 additions & 1 deletion Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
View file
Open in desktop
Tmanzxd marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Numbers for armor here largely taken from /tg/.
# NOTE: Half of the kind of armor you're probably thinking of is in vests.yml. These should probably be merged some day.

#Basic armor vest
- type: entity
parent: ClothingOuterBaseMedium
id: ClothingOuterArmorBasic
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
View file
Open in desktop
Tmanzxd marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@
sprite: Clothing/OuterClothing/Vests/detvest.rsi
- type: Clothing
sprite: Clothing/OuterClothing/Vests/detvest.rsi
- type: Armor #Based on /tg/ but slightly compensated to fit the fact that armor stacks in SS14.
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.70 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
Heat: 0.80
- type: ExplosionResistance
damageCoefficient: 0.90

#Hazard vest
- type: entity
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@
Slash: 0.75
Piercing: 0.75
Heat: 0.75
Caustic: 0.75 #not the full 90% from ss13 because of the head

- type: entity
parent: ClothingOuterWinterCoatToggleable
Expand Down Expand Up @@ -417,12 +418,12 @@
sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi
- type: ToggleableClothing
clothingPrototype: ClothingHeadHatHoodWinterSec
- type: Armor # DeltaV - adds resists to coat
- type: Armor
modifiers:
coefficients:
Blunt: 0.85
Slash: 0.85
Piercing: 0.85 # DeltaV - not as resistant as pre-rebase, but still better than nothing
Piercing: 0.85 #Can save you, but bullets will still hurt. Will take about 10 shots from a Viper before critting, as opposed to 7 while unarmored and 16~ with a bulletproof vest.
Heat: 0.75

- type: entity
Expand Down
Loading
Loading