Merge pull request #390 from Memeji/Nikko-Loadout

Nikko Loadout Changes (+ Extras)

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -154,7 +154,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockSalvageEquipmentFilled
-  cost: 1000
+  cost: 1300
   category: cargoproduct-category-name-engineering
   group: market
 

Resources/Prototypes/Catalog/Fills/Lockers/misc.yml

@@ -274,7 +274,6 @@
         - id: null
           orGroup: HypnoTempPlush
         #HypnoTemp Merch - End
-        # Floof - End
         # Syndicate loot
         - id: null
           prob: 0.95
@@ -288,30 +287,31 @@
         - id: ClothingBackpackDuffelSyndicate
           prob: 0.005
           orGroup: syndiemaintloot
-        #- id: CyberPen # DeltaV - Nuh uh
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: CigPackSyndicate
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
+        - id: CyberPen # Floof - Yuh huh, it's funny
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: CigPackSyndicate
+          prob: 0.005
+          orGroup: syndiemaintloot
         - id: ClothingBackpackDuffelSyndicatePyjamaBundle
           prob: 0.005
           orGroup: syndiemaintloot
-        #- id: ClothingBeltMilitaryWebbing
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: ClothingShoesBootsCombatFilled
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
-        #- id: ToolboxSyndicateFilled
-        #  prob: 0.005
-        #  orGroup: syndiemaintloot
+        - id: ClothingBeltMilitaryWebbing
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: ClothingShoesBootsCombatFilled
+          prob: 0.005
+          orGroup: syndiemaintloot
+        - id: ToolboxSyndicateFilled
+          prob: 0.005
+          orGroup: syndiemaintloot
         - id: BalloonSyn
           prob: 0.005
           orGroup: syndiemaintloot
-        #- id: WeaponSniperMosin
-        #  prob: 0.0010
-        #  orGroup: syndiemaintloot
+        - id: WeaponSniperMosin
+          prob: 0.005
+          orGroup: syndiemaintloot
+        # Floof - End
 
 - type: entity
   id: ClosetWallMaintenanceFilledRandom
@@ -515,7 +515,7 @@
           prob: 0.005
           orGroup: syndiemaintloot
         - id: WeaponSniperMosin
-          prob: 0.0010
+          prob: 0.005
           orGroup: syndiemaintloot
 
 - type: entity

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -30,6 +30,9 @@
     ClothingHeadHatPumpkin: 2
     ClothingHeadHatShrineMaidenWig: 2
     ClothingOuterSuitShrineMaiden: 2
+    ClothingHeadHatWitch1: 2 # Floof - Witch
+    ClothingHeadHatWitch: 2 # Floof - Witch
+    ClothingOuterSuitWitchRobes: 2 # Floof - Witch
     Gohei: 2
     ClothingHeadHatRedRacoon: 2
     ClothingOuterRedRacoon: 2
@@ -90,6 +93,7 @@
     ClothingMaskNeckGaiterRed: 2
     ClothingNeckBellCollar: 2
     ClothingOuterUnathiRobe: 1
+    ClothingNeckCloakRedHood: 1 # Floofstation - Red Cloak
     # Floofstation - Departmental Socks ect
     ClothingUniformMusicianThong: 2
     ClothingUnderSocksMusician: 2

Resources/Prototypes/CharacterItemGroups/serviceGroups.yml

@@ -102,6 +102,8 @@
       id: LoadoutServiceBartenderBoxBeanbags
     - type: loadout
       id: LoadoutServiceBartenderBoxLightRifleRubber
+    - type: loadout
+      id: LoadoutServiceBartenderBoxMagnumRubber # Floofstation
 
 - type: characterItemGroup
   id: LoadoutBartenderWeapon
@@ -110,6 +112,10 @@
       id: LoadoutServiceBartenderShotgunDoubleBarreledRubber
     - type: loadout
       id: LoadoutServiceBartenderMosinRubber
+    - type: loadout
+      id: LoadoutServiceBartenderArgentiNonlethal # Floofstation
+    - type: loadout
+      id: LoadoutServiceBartenderRepeaterNonlethal # Floofstation
 
 - type: characterItemGroup
   id: LoadoutBartenderUniforms
@@ -182,4 +188,4 @@
     - type: loadout
       id: LoadoutServiceJumpsuitJanitorIdris
     - type: loadout
-      id: LoadoutServiceJumpsuitJanitorOrion
+      id: LoadoutServiceJumpsuitJanitorOrion

Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml

@@ -13,3 +13,10 @@
       map: [ "empty-icon" ]
   # todo: add itemcomponent with inhandVisuals states using unused texture and animation assets in kinetic_accelerator.rsi
   # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi
+  - type: StaticPrice
+    price: 270
+  - type: Construction #Frontier
+    graph: PKASawn #Frontier
+    node: start #Frontier
+    deconstructionTarget: null #Frontier
+  - type: Wieldable # Frontier

Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatHoodRedHood
+  name: Red Hood
+  description: A hood of a red cloak, made to keep the harsh light out of a traveler's eyes. Sometimes it sparkles in the light of the sun.
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Head/Hoods/redhood.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/Head/Hoods/redhood.rsi
+  - type: Tag
+    tags:
+    - WhitelistChameleon
+  - type: HideLayerClothing
+    slots:
+    - Hair

Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml

@@ -0,0 +1,16 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakRedHood
+  name: Red Cloak
+  description: A cloak made for travel and comfort. Slightly smells of cherry pie?
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/Neck/Cloaks/redhood.rsi
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHatHoodRedHood
+    requiredSlot:
+    - neck
+    slot: head
+  - type: ContainerContainer
+    containers:
+      toggleable-clothing: !type:ContainerSlot {}

Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml

@@ -0,0 +1,10 @@
+- type: entity # From Upstream
+  parent: ClothingOuterBase
+  id: ClothingOuterSuitWitchRobes
+  name: witch robes
+  description: Magic is all about the spell power, ZE!
+  components:
+  - type: Sprite
+    sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi
+  - type: Clothing
+    sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi

Resources/Prototypes/Floof/Loadouts/Jobs/service.yml

@@ -288,6 +288,21 @@
     jobs:
     - Janitor
 
+- type: loadout
+  id: LoadoutClothingNeckCloakJanitor
+  category: JobsServiceUncategorized
+  cost: 2
+  exclusive: true
+  requirements:
+    - !type:CharacterJobRequirement
+      jobs:
+        - Janitor
+    - !type:CharacterPlaytimeRequirement
+      tracker: JobJanitor
+      min: 36000 # 10 hours
+  items:
+  - ClothingNeckCloakJanitor
+
 #TO BE ADDED - Botanist
 #TO BE ADDED - Reporter
 

Resources/Prototypes/Floof/Loadouts/neck.yml

@@ -9,6 +9,17 @@
     - !type:CharacterItemGroupRequirement
       group: LoadoutNeck2
 
+- type: loadout
+  id: LoadoutItemsNeckRedHood
+  category: Neck
+  cost: 1
+  exclusive: true
+  items:
+    - ClothingNeckCloakRedHood
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutNeck2
+
 # Generic collars
 - type: loadout
   id: LoadoutItemsNeckBlueCollar

Resources/Prototypes/Floof/Loadouts/outerClothing.yml

@@ -87,3 +87,13 @@
   requirements:
     - !type:CharacterItemGroupRequirement
       group: LoadoutOuter2
+
+- type: loadout
+  id: LoadoutClothingOuterSuitWitchRobes
+  category: Outer
+  cost: 1
+  items:
+    - ClothingOuterSuitWitchRobes
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutOuter2

Resources/Prototypes/Loadouts/Jobs/service.yml

@@ -291,6 +291,20 @@
   items:
     - MagazineBoxLightRifleRubber
 
+- type: loadout # Floof
+  id: LoadoutServiceBartenderBoxMagnumRubber
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderAmmo
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - MagazineBoxMagnumRubber
+
 - type: loadout
   id: LoadoutServiceBartenderShotgunDoubleBarreledRubber
   category: JobsServiceBartender
@@ -319,6 +333,34 @@
   items:
     - WeaponSniperMosinRubber
 
+- type: loadout # Floof
+  id: LoadoutServiceBartenderArgentiNonlethal
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - WeaponRevolverArgentiNonlethal
+
+- type: loadout # Floof
+  id: LoadoutServiceBartenderRepeaterNonlethal
+  category: JobsServiceBartender
+  cost: 0
+  exclusive: true
+  requirements:
+    - !type:CharacterItemGroupRequirement
+      group: LoadoutBartenderWeapon
+    - !type:CharacterJobRequirement
+      jobs:
+        - Bartender
+  items:
+    - WeaponSniperRepeaterNonlethal
+
 - type: loadout
   id: LoadoutServiceJumpsuitBartenderNt
   category: JobsServiceBartender

Resources/Prototypes/SoundCollections/announcements.yml

@@ -26,3 +26,17 @@
   - /Audio/Announcements/RoundEnd/susguyeatscrew.ogg
   - /Audio/Announcements/RoundEnd/this_drink.ogg
   - /Audio/Announcements/RoundEnd/truth_imagination.ogg
+  - /Audio/Announcements/RoundEnd/oney.ogg
+  # Floof added sounds
+  - /Audio/Floof/Announcements/RoundEnd/bangindonk.ogg
+  - /Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg
+  - /Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg
+  - /Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg
+  - /Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg
+  - /Audio/Floof/Announcements/RoundEnd/filledwith.ogg
+  - /Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg
+  - /Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg
+  - /Audio/Floof/Announcements/RoundEnd/lottawords.ogg
+  - /Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg
+  - /Audio/Floof/Announcements/RoundEnd/whatashame.ogg
+  - /Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg

Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml

@@ -0,0 +1,10 @@
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCloakJanitor
+  name: janitor's cloak
+  description: An exquisite cloak fitting for those who save the station from messes and slips. The unsung heroes who work thanklessly while we make a mess over the bar. Pure angels of patience and an iron will! ...It's also waterproof!
+  components:
+  - type: Sprite
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi
+  - type: Clothing
+    sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi