DeltaV-Station · Neptune-Zvezda · Dec 20, 2023 · Dec 21, 2023 · Dec 21, 2023 · Dec 21, 2023
@@ -20,8 +20,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
@@ -53,6 +53,12 @@
       - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+#    - id: ClothingUnderSocksStripedCaptainBlueandGold 
+
+#    - id: ClothingUnderSocksStripedCaptainBlueandWhite 
+
+#    - id: ClothingUnderSocksStripedCaptainBlueandWhite 
+
 
 - type: entity
   id: LockerCaptainFilled
@@ -83,6 +89,10 @@
       - id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
       - id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
+#   - id: ClothingUnderSocksStripedCaptainBlueandGold 
+#   - id: ClothingUnderSocksStripedCaptainBlueandWhite 
+#   - id: ClothingUnderSocksStripedCaptainBlueandWhite 
+
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
@@ -121,6 +131,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
@@ -146,6 +157,9 @@
       - id: BoxEncryptionKeyEngineering
       - id: AccessConfigurator
       - 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
       - id: CEIDCard # Delta-V
@@ -171,6 +185,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
 
@@ -201,6 +216,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
@@ -225,6 +241,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
@@ -246,7 +263,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
@@ -266,7 +283,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
@@ -296,6 +313,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
@@ -323,6 +341,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

@@ -14,3 +14,4 @@
     ClothingOuterWinterAtmos: 2
     ClothingNeckScarfStripedLightBlue: 3
     ClothingShoesBootsWinterAtmos: 2 #Delta V: Add departmental winter boots
+    ClothingUnderSocksStripedEngineeringAtmos: 3 # DeltaV - Neptune's striped socks
@@ -15,3 +15,5 @@
     ClothingOuterWinterMiner: 2
     ClothingNeckScarfStripedBrown: 3
     ClothingShoesBootsWinterCargo: 2
+    ClothingUnderSocksStripedCargo: 3 # DeltaV - Neptune's striped socks
+    ClothingUnderSocksStripedCargoQm: 3 # DeltaV - Neptune's striped socks
@@ -14,3 +14,4 @@
     ClothingHeadsetMedical: 2
     ClothingOuterWinterChem: 2
     ClothingShoesBootsWinterChem: 2 #Delta V: Add departmental winter boots
+    ClothingUnderSocksStripedWhiteandOrange: 2 # DeltaV - Neptune's striped socks
@@ -16,3 +16,4 @@
     ClothingOuterWinterEngi: 2
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
+    ClothingUnderSocksStripedEngineering: 5 # DeltaV - Neptune's striped socks
@@ -18,6 +18,9 @@
     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

@@ -16,3 +16,4 @@
     ClothingNeckScarfStripedPurple: 3
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2
+    ClothingUnderSocksStripedScience: 3 # DeltaV - Neptune's striped socks
@@ -25,3 +25,5 @@
     ClothingEyesBlindfold: 1
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
+    ClothingUnderSocksStripedSecurityJackboots: 5
+    ClothingUnderSocksStripedSecurity: 5
@@ -4,6 +4,6 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockPrideFilled
-  cost: 1100
+  cost: 1300
   category: Service
   group: market
@@ -25,5 +25,18 @@
        ClothingHeadHatXmasCrown: 2
        BedsheetRainbow: 2
        ClothingUniformColorRainbow: 2
+       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
        ClothingUnderSocksCoder: 1
-       ClothingUnderSocksBee: 1
+       ClothingUnderSocksBee: 1
@@ -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: []