Merge branch 'Fansana:master' into Upstream-Merge-08/16/2024

cynical24 · Aug 20, 2024 · 2503a65 · 2503a65
2 parents f9451d8 + 83162d5
commit 2503a65
Show file tree

Hide file tree

Showing 291 changed files with 3,415 additions and 23 deletions.
diff --git a/Resources/Changelog/Floof.yml b/Resources/Changelog/Floof.yml
@@ -538,3 +538,17 @@ Entries:
       message: Cum/Milk regeneration doesn't use hunger.
   id: 73
   time: '2024-08-17T23:21:19.0000000+00:00'
+- author: ShatteredSwords
+  changes:
+    - type: Add
+      message: Adds Seb themselves as their own thing!
+    - type: Tweak
+      message: Seb will always spawn instead of Siobhan in Floof maps.
+  id: 74
+  time: '2024-08-18T21:19:51.0000000+00:00'
+- author: Memeji
+  changes:
+    - type: Add
+      message: Pink Collar
+  id: 75
+  time: '2024-08-19T05:33:04.0000000+00:00'
diff --git a/Resources/Migrations/floofmigration.yml b/Resources/Migrations/floofmigration.yml
@@ -0,0 +1,3 @@
+# 2024-08-16 Floof Only Please message @FracturedSwords on discord if there are any merge conflicts upcoming
+SpawnMobArcticFoxSiobhan: SpawnMobArcticFoxSeb
+MobArcticFoxSiobhan: MobArcticFoxSeb
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -16,3 +16,6 @@
     ClothingNeckScarfStripedBrown: 3
     ClothingShoesBootsWinterCargo: 2
     ClothingNeckCollarLogi: 1 # Floofstation - Collar addition
+    ClothingHandsLogisWarmers: 1 # Floofstation
+    ClothingUnderSocksLogis: 1 # Floofstation
+    ClothingUniformLogisThong: 1 # Floofstation
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -16,6 +16,10 @@
     ClothingHeadHatWitch1: 1
     ClothingOuterPlagueSuit: 1
     ClothingMaskPlague: 1
+    ClothingHandsChaplainWarmers: 1 # Floofstation
+    ClothingUnderSocksChaplain: 1 # Floofstation
+    ClothingUniformChaplainThong: 1 # Floofstation
+    ClothingOuterEpiChaplainMantle: 1 # Floofstation
     #ClothingHeadsetService: 2 # Delta-V - Chaplain is no longer service dept
     BoxCandle: 2
     BoxCandleSmall: 2

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -23,6 +23,7 @@
     ClothingUniformLoinCloth: 5 # FloofStation
     ClothingNeckCollarBlue: 1 # Floofstation - Collar addition
     ClothingNeckCollarBlack: 1 # Floofstation - Collar addition
+    ClothingNeckCollarPink: 1 # Floofstation - Collar addition
     ClothingLongcoatNT: 2 # Floofstation
     ClothingLongcoatAL: 2 # Floofstation
     ClothingLongcoatBrown: 2 # Floofstation

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -17,3 +17,6 @@
     ClothingNeckScarfStripedOrange: 3
     ClothingShoesBootsWinterEngi: 2
     ClothingNeckCollarEngi: 1 # Floofstation - Collar addition
+    ClothingHandsEngiWarmers: 1 # Floofstation
+    ClothingUnderSocksEngi: 1 # Floofstation
+    ClothingUniformEngiThong: 1 # Floofstation
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -13,6 +13,9 @@
     ClothingShoesBootsWinterJani: 2 #Delta V: Add departmental winter boots
     ClothingUniformJumpskirtJanimaid: 2 # Delta V: the maiden outfits no longer require emagging.
     ClothingUniformJumpskirtJanimaidmini: 1
+    ClothingHandsJanitorWarmers: 1 # Floofstation
+    ClothingUnderSocksJanitor: 1 # Floofstation
+    ClothingUniformJanitorThong: 1 # Floofstation
 
   emaggedInventory: # Delta V: tactical maid outfit set is now the emagg reward.
     ClothingHandsTacticalMaidGloves: 1

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -23,6 +23,9 @@
     ClothingHeadHatSurgcapPurple: 4
     ClothingShoesBootsWinterMed: 2
     ClothingNeckCollarMed: 1 # Floofstation - Collar addition
+    ClothingHandsMedicWarmers: 1 # Floofstation
+    ClothingUnderSocksMedic: 1 # Floofstation
+    ClothingUniformMedicThong: 1 # Floofstation
   contrabandInventory: #DeltaV
     UniformScrubsColorCybersun: 1 #DeltaV
     ClothingHeadHatSurgcapCybersun: 1 #DeltaV

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -15,5 +15,8 @@
     ClothingOuterWinterSci: 2
     ClothingNeckScarfStripedPurple: 3
     ClothingNeckCollarEpi: 1 # Floofstation - Collar addition
+    ClothingHandsEpiWarmers: 1 # Floofstation
+    ClothingUnderSocksEpi: 1 # Floofstation
+    ClothingUniformEpiThong: 1 # Floofstation
     ClothingHeadTinfoil: 2 # Nyanotrasen - Tinfoil hats for Epistemics
     ClothingShoesBootsWinterSci: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -24,6 +24,9 @@
     ClothingNeckScarfStripedRed: 3
     ClothingEyesBlindfold: 1
     ClothingNeckCollarSec: 1 # Floofstation - Collar addition
+    ClothingHandsSecurityWarmers: 1 # Floofstation
+    ClothingUnderSocksSecurity: 1 # Floofstation
+    ClothingUniformSecurityThong: 1 # Floofstation
     ClothingShoesBootsCombat: 1
     ClothingShoesBootsWinterSec: 2
     ClothingShoesBootsCowboyBlack: 1

diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml
@@ -29,4 +29,4 @@
        ClothingUnderSocksBee: 1
   emaggedInventory:
       # 3 for more friends!
-      ClothingUnderSocksCoderValid: 3 # Floofstation
+      ClothingUnderSocksCoderValid: 3 # Floofstation
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: Seb
+  name: Siobhan
   parent: MobArcticFox
   id: MobArcticFoxSiobhan
-  description: His name is "Sebastien de Lys", but he is known as Seb by his friends. A fluffy, adorable arctic fox.
+  description: Her name is pronounced "Shivahn", but she is known as Shivs by her associates. A fluffy, adorable arctic fox.
   components:
   - type: InteractionPopup
     successChance: 1
@@ -13,7 +13,7 @@
   - type: Grammar
     attributes:
       proper: true
-      gender: male
+      gender: female
   - type: Tag
     tags:
     - CannotSuicide

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -533,21 +533,3 @@
     tags:
     - Wine
 
-#Floof
-- type: entity
-  parent: DrinkCanBaseFull
-  id: DrinkNNNCan
-  name: Nikkos Naughty Nectar
-  description: A can of Nikko's Naughty Nectar! Best not to ask how it's made...
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: NikkosNaughtyNectar
-          Quantity: 30
-  - type: Sprite
-    sprite: Objects/Consumable/Drinks/nnn_can.rsi
-  - type: Item
-    sprite: Objects/Consumable/Drinks/nnn_can.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1146,6 +1146,50 @@
       - CarpetWhite
       # Floofstation - Collars
       - ClothingNeckCollarCmd
+      # Floofstation - Socks, Armwarmers ect
+      - ClothingHandsPlainWarmers
+      - ClothingUnderSocksPlain
+      - ClothingUniformThongPlain
+      - ClothingHandsStripeRainbowWarmers
+      - ClothingUnderSocksStripedRainbow
+      - ClothingUniformStripedThongRainbow
+      - ClothingHandsStripePurpleWarmers
+      - ClothingUnderSocksStripedPurple
+      - ClothingUniformStripedThongPurple
+      - ClothingHandsStripeWhiteWarmers
+      - ClothingUnderSocksStripedWhite
+      - ClothingUniformStripedThongWhite
+      # Floofstation - Department Socks, Armwarmers ect
+      - ClothingHandsCaptainWarmers
+      - ClothingUnderSocksCaptain
+      - ClothingUniformCaptainThong
+      - ClothingHandsCommandWarmers
+      - ClothingUnderSocksCommand
+      - ClothingUniformCommandThong
+      - ClothingHandsEngiWarmers
+      - ClothingUnderSocksEngi
+      - ClothingUniformEngiThong
+      - ClothingHandsEpiWarmers
+      - ClothingUnderSocksEpi
+      - ClothingUniformEpiThong
+      - ClothingHandsChaplainWarmers
+      - ClothingUnderSocksChaplain
+      - ClothingUniformChaplainThong
+      - ClothingHandsLogisWarmers
+      - ClothingUnderSocksLogis
+      - ClothingUniformLogisThong
+      - ClothingHandsMedicWarmers
+      - ClothingUnderSocksMedic
+      - ClothingUniformMedicThong
+      - ClothingHandsSecurityWarmers
+      - ClothingUnderSocksSecurity
+      - ClothingUniformSecurityThong
+      - ClothingHandsServiceWarmers
+      - ClothingUnderSocksService
+      - ClothingUniformServiceThong
+      - ClothingHandsJanitorWarmers
+      - ClothingUnderSocksJanitor
+      - ClothingUniformJanitorThong
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - ClothingHeadHatCentcomcap

diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml b/Resources/Prototypes/Floof/Entities/Clothing/Hands/miscgloves.yml
@@ -0,0 +1,135 @@
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsPlainWarmers
+  name: plain arm-warmers
+  description: A pair of rather plain arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/plainwarmer.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-black
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsBeeWarmers
+  name: bee arm-warmers
+  description: A pair of rather buzzy arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/beewarmer.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-yellow
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsCoderWarmers
+  name: coder arm-warmers
+  description: A pair of rather nice arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/coderwarmer.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-white
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsCoderValidWarmers
+  name: coder valid arm-warmers
+  description: A pair of rather nice arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/codervalidwarmer.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-red
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsStripeWhiteWarmers
+  name: striped white arm-warmers
+  description: A pair of rather nice arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/stripewarmerwhite.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-white
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsStripePurpleWarmers
+  name: striped purple arm-warmers
+  description: A pair of rather nice arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/stripewarmerpurple.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-purple
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsStripeRainbowWarmers
+  name: striped rainbow arm-warmers
+  description: A pair of rather nice arm-warmers
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/stripewarmerrainbow.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-colorful
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsSexCompGlovesRed
+  name: red sex competition gloves
+  description: It looks like it should be part of a competition.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/sexcompredgloves.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-red
+  - type: FingerprintMask
+
+- type: entity
+  parent: ClothingHandsBase
+  id: ClothingHandsSexCompGlovesBlue
+  name: blue sex competition gloves
+  description: It looks like it should be part of a competition.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Under/Gloves/sexcompbluegloves.rsi
+  - type: Fiber
+    fiberMaterial: fibers-synthetic
+    fiberColor: fibers-blue
+  - type: FingerprintMask
+
diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/misc.yml
@@ -19,3 +19,25 @@
     sprite: Clothing/Head/Hats/dogears.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/dogears.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadSexCompCirclet
+  name: sex competition circlet
+  description: It looks like it should be part of a competition.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Head/sexcompcirclet.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Head/sexcompcirclet.rsi
+
+- type: entity
+  parent: ClothingHeadHatHoodWinterBase
+  id: ClothingHeadHatHoodMarsHoodieHood
+  noSpawn: true
+  name: pink hoodie hood
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Head/hoodmarshoodie.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Head/hoodmarshoodie.rsi
diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/collars.yml
@@ -20,6 +20,17 @@
   - type: Clothing
     sprite: Floof/Clothing/Neck/collar_black.rsi
 
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCollarPink
+  name: pink collar
+  description: A cute pink collar.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/collar_pink.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Neck/collar_pink.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCollarEpi