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

Neptune outfit submitions #583

Closed
wants to merge 48 commits into from
Closed

Neptune outfit submitions #583

Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5a9c99c
All But Yml's and Parka made
Neptune-Zvezda Dec 20, 2023
225a29e
Sock Update .2
Neptune-Zvezda Dec 21, 2023
35392ab
Sock bupdate .3
Neptune-Zvezda Dec 21, 2023
76a9a17
Sock update .4
Neptune-Zvezda Dec 21, 2023
f090c46
Outfit Update .5
Neptune-Zvezda Dec 21, 2023
88c1187
Outfit update .6 The Broke Server Bupdate
Neptune-Zvezda Dec 22, 2023
9e4be62
Outfit update .7
Neptune-Zvezda Dec 22, 2023
381c6a8
outfit update .72
Neptune-Zvezda Dec 22, 2023
058b416
Outfit Update .7.3
Neptune-Zvezda Dec 22, 2023
8fa1c65
Merge branch 'master' into Neptune-Outfit-Submitions
Neptune-Zvezda Dec 22, 2023
434d759
outfit update .7.4
Neptune-Zvezda Dec 22, 2023
e487d15
Merge branch 'Neptune-Outfit-Submitions' of https://github.com/Neptun…
Neptune-Zvezda Dec 22, 2023
1bc98f5
Apply suggestions from code review
Neptune-Zvezda Dec 22, 2023
446c661
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Dec 22, 2023
2e9951b
update test 7.4.1.1.1.1.1.1.1.1.1
Neptune-Zvezda Dec 22, 2023
77deacc
Merge branch 'Neptune-Outfit-Submitions' of https://github.com/Neptun…
Neptune-Zvezda Dec 22, 2023
7325f3c
outfit update 7.4.2.2.2.2.2.2.2.2.2
Neptune-Zvezda Dec 22, 2023
f97cbd5
Update StripedSocks.yml
Colin-Tel Dec 22, 2023
fa000c5
I have killed socks
Neptune-Zvezda Dec 22, 2023
8150c5e
i have unkillted socks
Neptune-Zvezda Dec 22, 2023
218358d
suffering
Neptune-Zvezda Dec 22, 2023
5ac4b03
LOOOOO
Neptune-Zvezda Dec 22, 2023
6030a9b
update .7.5
Neptune-Zvezda Dec 22, 2023
ba5a4b4
Update cargo_vending.yml
Colin-Tel Dec 22, 2023
17f432c
Updated N parka
Neptune-Zvezda Dec 22, 2023
e2c9092
Outfit Update .8
Neptune-Zvezda Dec 23, 2023
ebdef1d
Merge branch 'master' into Neptune-Outfit-Submitions
Neptune-Zvezda Dec 23, 2023
f67130e
Outfit update .8.1
Neptune-Zvezda Dec 23, 2023
41589ea
Merge branch 'master' into Neptune-Outfit-Submitions
Neptune-Zvezda Dec 23, 2023
520dbe9
Outfit Update .8.2
Neptune-Zvezda Dec 27, 2023
8e2a4a6
Outfit Update .8.3
Neptune-Zvezda Dec 27, 2023
fbf0b9e
outfit update .8.4
Neptune-Zvezda Dec 28, 2023
9777e8b
Outfit Update .8.5
Neptune-Zvezda Dec 28, 2023
9303174
Outfit update .9.0
Neptune-Zvezda Dec 28, 2023
38d183c
outfit update .9.1
Neptune-Zvezda Dec 29, 2023
df1b610
Outfit update .9.2
Neptune-Zvezda Dec 31, 2023
d03805f
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
ec4e71c
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
60511fd
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
1db82a7
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
d7d16f0
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
09a97df
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
8b07d6b
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
c4d051b
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
4577583
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
5391d61
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
c559ced
Update heads.yml
Neptune-Zvezda Jan 28, 2024
dc6d416
Merge branch 'Neptune-Outfit-Submitions' of https://github.com/Neptun…
Neptune-Zvezda Jan 28, 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
15 changes: 12 additions & 3 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 @@ -25,8 +25,8 @@
- 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: ClothingUnderSocksStripedCargoQm
- id: ClothingShoesBootsWinterLogisticsOfficer #Delta V: Add departmental winter boots

- type: entity
id: LockerCaptainFilledHardsuit
suffix: Filled, Hardsuit
Expand Down Expand Up @@ -66,6 +66,7 @@
- id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots

Copy link
Member

Choose a reason for hiding this comment

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

    - id: ClothingUnderSocksStripedCaptainBlueandGold 
      prob: 0.3
      orGroup: socks 
    - id: ClothingUnderSocksStripedCaptainBlueandWhite 
      prob: 0.3
      orGroup: socks 
    - id: ClothingUnderSocksStripedCaptainBlueandWhite 
      prob: 0.3
      orGroup: socks


- type: entity
id: LockerCaptainFilled
suffix: Filled
Expand Down Expand Up @@ -103,6 +104,7 @@
- id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots


- type: entity
id: LockerHeadOfPersonnelFilled
suffix: Filled
Expand Down Expand Up @@ -143,6 +145,7 @@
- id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesBootsWinterHeadOfPersonel #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedCaptainBlueandWhite # DeltaV - Neptune's striped socks

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down Expand Up @@ -174,6 +177,7 @@
- id: BoxPDAEngineering # Delta-V
- id: CEIDCard # Delta-V
- id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedEngineering # DeltaV - Neptune's striped socks
- id: RCD
- id: RCDAmmo

Expand Down Expand Up @@ -201,6 +205,7 @@
- id: BoxPDAEngineering # Delta-V
- id: CEIDCard # Delta-V
- id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedEngineering # DeltaV - Neptune's striped socks
- id: RCD
- id: RCDAmmo

Expand Down Expand Up @@ -231,6 +236,7 @@
- id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
- id: CMOIDCard # Delta-V
- id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedWhiteandLightBlueBunnySlipper # DeltaV - Neptune's striped socks

- type: entity
id: LockerChiefMedicalOfficerFilled
Expand Down Expand Up @@ -258,6 +264,7 @@
- id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
- id: CMOIDCard # Delta-V
- id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedWhiteandLightBlueBunnySlipper # DeltaV - Neptune's striped socks

- type: entity
id: LockerResearchDirectorFilledHardsuit
Expand All @@ -283,7 +290,7 @@
- id: BoxPDAScience # Delta-V
- id: RDIDCard # Delta-V
- id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots

#Mysta Socks in progress
- type: entity
id: LockerResearchDirectorFilled
suffix: Filled
Expand All @@ -307,7 +314,7 @@
- id: BoxPDAScience # Delta-V
- id: RDIDCard # Delta-V
- id: ClothingShoesBootsWinterMystagogue #Delta V: Add departmental winter boots

#Mysta Socks in progress
- type: entity
id: LockerHeadOfSecurityFilledHardsuit
suffix: Filled, Hardsuit
Expand Down Expand Up @@ -344,6 +351,7 @@
- id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
- id: HoSIDCard # Delta-V
- id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedSecurityJackboots # DeltaV - Neptune's striped socks

- type: entity
id: LockerHeadOfSecurityFilled
Expand Down Expand Up @@ -378,6 +386,7 @@
- id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
- id: HoSIDCard # Delta-V
- id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
- id: ClothingUnderSocksStripedSecurityJackboots # DeltaV - Neptune's striped socks

- type: entity
id: LockerFreezerVaultFilled
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
ClothingOuterWinterAtmos: 2
ClothingNeckScarfStripedLightBlue: 3
ClothingShoesBootsWinterAtmos: 2 #Delta V: Add departmental winter boots
ClothingUnderSocksStripedEngineeringAtmos: 3 # DeltaV - Neptune's striped socks
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
ClothingOuterWinterMiner: 2
ClothingNeckScarfStripedBrown: 3
ClothingShoesBootsWinterCargo: 2
ClothingUnderSocksStripedCargo: 3 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedCargoQm: 3 # DeltaV - Neptune's striped socks
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
ClothingHeadsetMedical: 2
ClothingOuterWinterChem: 2
ClothingShoesBootsWinterChem: 2 #Delta V: Add departmental winter boots
ClothingUnderSocksStripedWhiteandOrange: 2 # DeltaV - Neptune's striped socks
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
ClothingOuterWinterEngi: 2
ClothingNeckScarfStripedOrange: 3
ClothingShoesBootsWinterEngi: 2
ClothingUnderSocksStripedEngineering: 5 # DeltaV - Neptune's striped socks
4 changes: 4 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
UniformScrubsColorBlue: 4
UniformScrubsColorPurple: 4
ClothingShoesBootsWinterMed: 2
ClothingUnderSocksStripedWhiteandLightBlueBunnySlipper: 3 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandLightBlue: 3 # DeltaV - Neptune's striped socks

contrabandInventory: #DeltaV
UniformScrubsColorCybersun: 1 #DeltaV
ClothingHeadHatSurgcapCybersun: 1 #DeltaV
ClothingOuterCoatCybersunWindbreaker: 1 #DeltaV

1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@
ClothingNeckScarfStripedPurple: 3
ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
ClothingShoesBootsWinterSci: 2
ClothingUnderSocksStripedScience: 3 # DeltaV - Neptune's striped socks
2 changes: 2 additions & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingShoesBootsWinterSec: 2
ClothingUnderSocksStripedSecurityJackboots: 5
ClothingUnderSocksStripedSecurity: 5
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
sprite: Objects/Specific/Service/vending_machine_restock.rsi
state: base
product: CrateVendingMachineRestockPrideFilled
cost: 1000
cost: 1250
Neptune-Zvezda marked this conversation as resolved.
Show resolved Hide resolved
category: Service
group: market
14 changes: 13 additions & 1 deletion Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,16 @@
ClothingHeadHatXmasCrown: 2
BedsheetRainbow: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 1
ClothingUnderSocksCoder: 2
ClothingUnderSocksStripedWhiteandLightBlue: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandGreen: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandLightBlueBunnySlipper: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandOrange: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandPurple: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandRed: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedWhiteandYellow: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedYellowandPurple: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedCaptainBlueandGold: 1 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedCaptainBlueandWhite: 2 # DeltaV - Neptune's striped socks
ClothingUnderSocksStripedCaptainGoldandBlue: 1 # DeltaV - Neptune's striped socks
ClothingOuterNParka: 2 # DeltaV - Neptune's striped socks
38 changes: 38 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,41 @@
Slash: 0.85
Piercing: 0.85
Heat: 0.75

- type: entity
parent: ClothingOuterWinterCoat
id: ClothingOuterNParka
name: N Parka
description: A white parka with a purple N. It smells of pudding
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/WinterCoats/NParka.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/WinterCoats/NParka.rsi
- type: TemperatureProtection
coefficient: 0.1
- type: Item
size: 10
- type: Armor
modifiers:
coefficients:
Slash: 0.95
Heat: 0.90
- type: Food
requiresSpecialDigestion: true
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Fiber
Quantity: 30
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
- type: ContainerContainer
containers:
toggleable-clothing: !type:ContainerSlot {}
storagebase: !type:Container
ents: []
Loading
Loading