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

Aine Longcoats #59

Merged
merged 28 commits into from
Jul 31, 2024
Merged

Aine Longcoats #59

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c190e86
initial commit
foxcumberland Jul 23, 2024
55df2ff
Merge branch 'Fansana:master' into Aine-Longcoats
foxcumberland Jul 24, 2024
1d18def
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
8a56a49
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
12ffea0
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
5a169f0
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
b9d8f04
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
24e8fa6
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
foxcumberland Jul 25, 2024
35da8b9
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
c2614f5
Update Resources/Prototypes/Catalog/VendingMachines/Inventories/cloth…
foxcumberland Jul 25, 2024
d3b0a8a
Update Resources/Prototypes/Catalog/VendingMachines/Inventories/detdr…
foxcumberland Jul 25, 2024
3efc96a
Update Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
foxcumberland Jul 25, 2024
8ab2089
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
a46050e
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
3ef523e
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
b9790d3
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
020806a
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
735929d
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
559c260
Update Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
foxcumberland Jul 25, 2024
2b109f2
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
foxcumberland Jul 25, 2024
b8785ce
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
foxcumberland Jul 25, 2024
7f695bc
Update Resources/Prototypes/Catalog/Fills/Lockers/security.yml
foxcumberland Jul 25, 2024
77c68b3
(allegedly) changed filename to fix rsi, stripped armor from non-sec …
foxcumberland Jul 31, 2024
f94119d
Rename Icon.png to icon.png
foxcumberland Jul 31, 2024
2065346
Merge branch 'Aine-Longcoats' of https://github.com/foxcumberland/flo…
foxcumberland Jul 31, 2024
9deaf67
Update wintercoats.yml
foxcumberland Jul 31, 2024
287ee30
Update repdrobe.yml
FoxxoTrystan Jul 31, 2024
e3a6d67
Update meta.json
FoxxoTrystan Jul 31, 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
13 changes: 13 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- id: SpaceCashLuckyBill # DeltaV - LO steal objective, see Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml
- id: BoxPDACargo # Delta-V
- id: QuartermasterIDCard # Delta-V
- id: ClothingLongcoatLO
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3

Expand All @@ -31,6 +32,7 @@
- type: StorageFill
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: ClothingLongcoatCap
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: NukeDisk
- id: PinpointerNuclear
# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system
Expand Down Expand Up @@ -60,6 +62,7 @@
- type: StorageFill
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: ClothingLongcoatCap
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: NukeDisk
- id: PinpointerNuclear
# - id: CaptainIDCard # DeltaV - Replaced by the spare ID system
Expand Down Expand Up @@ -89,6 +92,7 @@
- type: StorageFill
contents:
- id: ClothingOuterArmorCaptainCarapace
- id: ClothingLongcoatCap
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: NukeDisk
- id: PinpointerNuclear
# - id: CaptainIDCard # Delta V - Replaced by spare ID system. The funny biscuit that I cant even eat.
Expand Down Expand Up @@ -117,6 +121,7 @@
- type: StorageFill
contents:
- id: HoPIDCard
- id: ClothingLongcoatHoP
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: ClothingHeadsetAltService # DeltaV - HoP is now a service role, replaces their all channels headset.
- id: BoxPDA
- id: BoxID
Expand Down Expand Up @@ -148,6 +153,7 @@
- type: StorageFill
contents:
- id: ClothingOuterHardsuitEngineeringWhite
- id: ClothingLongcoatCE
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: ClothingMaskBreath
- id: ClothingEyesGlassesMeson
- id: ClothingBeltChiefEngineerFilled
Expand Down Expand Up @@ -176,6 +182,7 @@
- type: StorageFill
contents:
- id: ClothingEyesGlassesMeson
- id: ClothingLongcoatCE
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: ClothingBeltChiefEngineerFilled
- id: ClothingHandsGlovesColorYellow
- id: CigarCase
Expand Down Expand Up @@ -207,6 +214,7 @@
- id: ClothingMaskSterile
- id: ClothingHeadHatBeretCmo
- id: ClothingOuterHardsuitMedical
- id: ClothingLongcoatCMO
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: Hypospray
- id: HandheldCrewMonitor
- id: DoorRemoteMedical
Expand All @@ -232,6 +240,7 @@
- id: ClothingEyesHudMedical
- id: ClothingHeadsetAltMedical
- id: ClothingBackpackDuffelSurgeryFilled
- id: ClothingLongcoatCMO
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: Hypospray
- id: HandheldCrewMonitor
- id: DoorRemoteMedical
Expand All @@ -258,6 +267,7 @@
- id: HandTeleporter
- id: DoorRemoteResearch
- id: ClothingBeltUtilityFilled
- id: ClothingLongcoatRD
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: RubberStampRd
- id: BoxEncryptionKeyScience
- id: BoxPDAScience # Delta-V
Expand All @@ -280,6 +290,7 @@
- id: HandTeleporter
- id: DoorRemoteResearch
- id: ClothingBeltUtilityFilled
- id: ClothingLongcoatRD
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: RubberStampRd
- id: BoxEncryptionKeyScience
- id: BoxPDAScience # Delta-V
Expand All @@ -299,6 +310,7 @@
- id: ClothingEyesHudSecurity
- id: WeaponDisabler
- id: ClothingOuterCoatHoSTrench
- id: ClothingLongcoatHoS
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: ClothingMaskNeckGaiter
- id: ClothingOuterHardsuitCombatHoS # DeltaV - ClothingOuterHardsuitSecurityRed replaced in favour of head of security's advanced combat hardsuit.
- id: ClothingBeltSecurityFilled
Expand Down Expand Up @@ -330,6 +342,7 @@
- id: ClothingEyesHudSecurity
- id: WeaponDisabler
- id: ClothingOuterCoatHoSTrench
- id: ClothingLongcoatHoS
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: ClothingMaskNeckGaiter
- id: ClothingBeltSecurityFilled
- id: ClothingHeadsetAltSecurity
Expand Down
4 changes: 4 additions & 0 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 @@ -16,6 +16,7 @@
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: ClothingLongcoatWarden
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit.
Expand Down Expand Up @@ -45,6 +46,7 @@
- id: ClothingShoesBootsJack
- id: ClothingOuterCoatWarden
- id: ClothingOuterWinterWarden
- id: ClothingLongcoatWarden
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: RubberStampWarden
- id: DoorRemoteArmory
- id: HoloprojectorSecurity
Expand Down Expand Up @@ -119,6 +121,7 @@
- id: ClothingUniformJumpskirtBrigmedic
## - id: ClothingUniformJumpskirtOfLife # DeltaV - nah
## prob: 0.1
- id: ClothingLongcoatBrigmedic
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up.
- id: MedkitFilled
- id: MedkitCombatFilled
Expand Down Expand Up @@ -154,6 +157,7 @@
- id: ClothingOuterHardsuitCombatCorpsman
- id: ClothingUniformJumpsuitBrigmedic
- id: ClothingUniformJumpskirtBrigmedic
- id: ClothingLongcoatBrigmedic
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
- id: HandheldGPSBasic # Added GPS because I just think it should be there tbh.
- id: MedkitFilled
- id: MedkitCombatFilled
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@
ClothingOuterFaCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterDdCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingOuterBcCorporateJacket: 2 # Einstein Engines - Clothing addition
ClothingLongcoatNT: 2
ClothingLongcoatAL: 2
ClothingLongcoatBrown: 2
ClothingLongcoatBlack: 2
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
ClothingShoesBootsFishing: 2 # Nyano - Clothing addition
ClothingHeadTinfoil: 2 # Nyano - Clothing addition
ClothingHeadFishCap: 2
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
ClothingUniformJumpsuitDetectiveGrey: 2
ClothingUniformJumpskirtDetectiveGrey: 2
ClothingOuterVestDetective: 2
ClothingLongcoatBrown: 1
ClothingLongcoatSec: 1
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
ClothingNeckTieDet: 2
ClothingHeadHatFedoraGrey: 2
ClothingHandsGlovesColorBlack: 2
ClothingHandsGlovesLatex: 2
ClothingHeadsetSecurity: 2
ClothingHeadsetSecurity: 2
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
ClothingHeadCage: 2 # Nyanotrasen - Insulative headgear
ClothingOuterArmorPlateCarrier: 2 # DeltaV - moved body armour from SecDrobe to SecTech
ClothingOuterArmorDuraVest: 2
ClothingLongcoatSec: 2
foxcumberland marked this conversation as resolved.
Show resolved Hide resolved
ClothingHeadHelmetBasic: 2 # DeltaV - added helmets to the SecTech. Another line of defense between the tide and your grey matter.
# security officers need to follow a diet regimen!
contrabandInventory:
Expand Down
Loading
Loading