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

Return Detective Drip #2472

Closed
wants to merge 2 commits into from
+29 −24
Closed

Return Detective Drip #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52de97f
initial commit
rosieposieeee Dec 18, 2024
5a7ef6d
forgot to fix comments
rosieposieeee Dec 18, 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
9 changes: 4 additions & 5 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,11 @@
contents:
- id: ClothingEyesGlassesSecurity
# prob: 0.3 # DeltaV - standardise until HUD balance worked out
# - id: ClothingHeadHatFedoraBrown # DeltaV - removed for incongruence
# - id: ClothingNeckTieDet # DeltaV - removed for incongruence
# - id: ClothingOuterVestDetective # DeltaV - removed for incongruence
# - id: ClothingOuterCoatDetective # DeltaV - removed for incongruence
- id: ClothingHeadHatFedoraBrown # DeltaV
- id: ClothingNeckTieDet # DeltaV
- id: ClothingOuterVestDetective # DeltaV
- id: ClothingOuterCoatDetective # DeltaV
Comment on lines +190 to +193
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need # DeltaV comment as its being reverted to how it is upstream

- id: ClothingHeadsetSecurity # DeltaV - add spare headset.
- id: FlippoEngravedLighter # DeltaV - add due to removal of trench coat
- id: FlashlightSeclite
- id: ForensicScanner
- id: LogProbeCartridge
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
startingInventory:
# ClothingUniformJumpsuitDetective: 2 # DeltaV - removed for incongruence
# ClothingUniformJumpskirtDetective: 2 # DeltaV - removed for incongruence
# ClothingShoesColorBrown: 2 # DeltaV - removed for incongruence
# ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - removed for incongruence
# ClothingHeadHatFedoraBrown: 2 # DeltaV - removed for incongruence
ClothingShoesColorBrown: 2 # DeltaV
ClothingOuterCoatDetectiveLoadout: 2 # DeltaV
ClothingHeadHatFedoraBrown: 2 # DeltaV
Comment on lines +6 to +8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need # DeltaV comment as its being reverted to how it is upstream

Comment on lines +7 to +8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth noting that these have quantity 1 upstream add a # DeltaV comment denoting such a change if we are keeping it to 2

# ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - removed for incongruence
# ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - removed for incongruence
# ClothingOuterVestDetective: 2 # DeltaV - removed for incongruence
# ClothingNeckTieDet: 2 # DeltaV - removed for incongruence
# ClothingHeadHatFedoraGrey: 2 # DeltaV - removed for incongruence
ClothingOuterVestDetective: 2 # DeltaV
ClothingNeckTieDet: 2 # DeltaV
ClothingHeadHatFedoraGrey: 2 # DeltaV
Comment on lines +11 to +13
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need # DeltaV comment as its being reverted to how it is upstream

ClothingUniformJumpsuitForensicSpec: 2 # DeltaV
ClothingUniformJumpskirtForensicSpec: 2 # DeltaV
ClothingHandsGlovesColorBlack: 2
Expand Down
21 changes: 14 additions & 7 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
contents:
- id: SmokingPipeFilledTobacco
- id: FlippoEngravedLighter
# - type: Armor #same as regular sec armor # DeltaV - remove armour as it is no longer security equipment.
# modifiers:
# coefficients:
# Blunt: 0.70
# Slash: 0.70
# Piercing: 0.70
# Heat: 0.80
- type: Armor #same as regular sec armor
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.70
Heat: 0.80

- type: entity
parent: ClothingOuterCoatDetective
Expand All @@ -39,6 +39,13 @@
contents:
- id: SmokingPipeFilledTobacco
- id: FlippoLighter #Not the steal objective, only difference from normal detective trenchcoat
- type: Armor #same as regular sec armor
modifiers:
coefficients:
Blunt: 0.70
Slash: 0.70
Piercing: 0.70
Heat: 0.80
Comment on lines +42 to +48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary to add as it is parenting off of ClothingOuterCoatDetective


- type: entity
parent: ClothingOuterStorageBase
Expand Down
8 changes: 4 additions & 4 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,8 +1254,8 @@
name: loadout-group-detective-head
minLimit: 0
loadouts:
# - DetectiveFedora # DeltaV - removed for incongruence
# - DetectiveFedoraGrey # DeltaV - removed for incongruence
- DetectiveFedora # DeltaV - removed for incongruence
- DetectiveFedoraGrey # DeltaV - removed for incongruence
Comment on lines +1257 to +1258
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove # DeltaV comment

- DetBeret # DeltaV

- type: loadoutGroup
Expand Down Expand Up @@ -1284,8 +1284,8 @@
name: loadout-group-detective-outerclothing
minLimit: 0
loadouts:
# - DetectiveArmorVest # DeltaV - removed for incongruence
# - DetectiveCoat # DeltaV - removed for incongruence
- DetectiveArmorVest # DeltaV
- DetectiveCoat # DeltaV
Comment on lines +1287 to +1288
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't need # DeltaV comment as its being reverted to how it is upstream

- StasecWinterCoatDet # DeltaV
- PlateCarrier # DeltaV
- DuraVest # DeltaV
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@
- SecurityShoes
- SurvivalSecurity
- Trinkets
- SecurityStar
- SecurityStar
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't make unrelated changes in upstream files as it makes it harder to merge. make a separate pr upstream for this

- GroupSpeciesBreathToolSecurity
- SecurityAllFirearm # DeltaV - loadouts
- SecurityAllAmmo # DeltaV - loadouts
Expand Down
1 change: 0 additions & 1 deletion Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
ClothingUniformJumpskirtDetective: 2 # DeltaV - moved from detdrobe
ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - moved from detdrobe
ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - moved from detdrobe
ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - moved from detdrobe
ClothingNeckTieDet: 2 # DeltaV - moved from detdrobe
ClothingHeadHatFedoraBrown: 2 # DeltaV - moved from detdrobe
ClothingHeadHatFedoraGrey: 2
Expand Down
Loading