Merge pull request #482 from JenreyDominos/CC-Outpost,-Shuttle,-Plush…

…ie,-and-locker CC Outpost, Shuttle, Plushie, and Locker
Fansana · Jan 16, 2025 · bade2f1 · bade2f1
2 parents 015a498 + ba31813
commit bade2f1
Show file tree

Hide file tree

Showing 15 changed files with 37,079 additions and 110 deletions.
diff --git a/Resources/Maps/Floof/admin_only/CCO1362.yml b/Resources/Maps/Floof/admin_only/CCO1362.yml
diff --git a/Resources/Maps/Floof/admin_only/CCS6378.yml b/Resources/Maps/Floof/admin_only/CCS6378.yml
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -391,3 +391,36 @@
     - id: SpaceCash1000
     - id: BeachBall
     - id: BikeHorn
+
+- type: entity
+  id: LockerCentCommFilled # CC Locker
+  suffix: Filled
+  parent: LockerCentComm
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingBackpackHolding
+      - id: JetpackBlackFilled
+      - id: DoorRemoteAll
+      - id: RubberStampCentcom
+      - id: RubberStampDenied
+      - id: RubberStampApproved
+      - id: BoxFolderCentComClipboard
+      - id: CentcomPDA
+      - id: BoxFolderCentCom
+      - id: ClothingHeadsetAltCentCom
+      - id: ClothingHeadHatCentcomcap
+      - id: ClothingMaskGasCentcom
+      - id: CentcomIDCard
+      - id: ClothingOuterWinterCCWarden
+      - id: ClothingNeckCloakCentcom
+      - id: AccessConfigurator
+      - id: ClothingOuterHardsuitERTCentcomm
+      - id: WeaponDisabler
+      - id: WeaponPistolN1984
+      - id: ClothingShoesBootsCombatFilled
+      - id: ClothingUniformJumpskirtCentcomDirector
+      - id: ClothingUniformJumpsuitCentcomDirector
+      - id: ClothingEyesGlassesSunglasses
+      - id: ClothingHandsGlovesColorBlack
+      - id: PenCentcom
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -256,28 +256,6 @@
         - id: null #Sets lewd group to 44% chance of spawn
           prob: 0.56
           orGroup: Lewd
-        # HypnoTemp Merch - Start
-        - id: PlushieHypnoTempCap
-          prob: 0.005
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempMysta
-          prob: 0.010
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempHoS
-          prob: 0.010
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempLO
-          prob: 0.025
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempHoP
-          prob: 0.025
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempCMO
-          prob: 0.025
-          orGroup: HypnoTempPlush
-        - id: null
-          orGroup: HypnoTempPlush
-        #HypnoTemp Merch - End
         # Syndicate loot
         - id: null
           prob: 0.95
@@ -455,28 +433,6 @@
         - id: null #Sets lewd group to 44% chance of spawn
           prob: 0.56
           orGroup: Lewd
-        # HypnoTemp Merch - Start
-        - id: PlushieHypnoTempCap
-          prob: 0.005
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempMysta
-          prob: 0.010
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempHoS
-          prob: 0.010
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempLO
-          prob: 0.025
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempHoP
-          prob: 0.025
-          orGroup: HypnoTempPlush
-        - id: PlushieHypnoTempCMO
-          prob: 0.025
-          orGroup: HypnoTempPlush
-        - id: null
-          orGroup: HypnoTempPlush
-        #HypnoTemp Merch - End
         # Floof - End
         # Syndicate loot
         - id: null

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -66,9 +66,25 @@
         - PlushieCatWhite
         - PlushieRatvar
         - PlushieNar
-        - PlushieTrystan
+        - PlushieTrystan # Floof Plushies Start
         - PlushieSlips
         - PlushieJester
+        - PlushieCentCom
+        - PlushieSlimeTider
+        - PlushieChillHuman
+        - PlushieDino
+        - PlushieDragon
+        - PlushieFRavager
+        - PlushieFPraetorian
+        - PlushieFDrone
+        - PlushieFRouny
+        - PlushieHypnoTempCap
+        - PlushieHypnoTempHoS
+        - PlushieHypnoTempHoP
+        - PlushieHypnoTempCE
+        - PlushieHypnoTempCMO
+        - PlushieHypnoTempLO
+        - PlushieHypnoTempMysta # Floof Plushies End
       chance: 0.5
       offset: 0.2
 

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1791,6 +1791,7 @@
       - CrazyGlue
       - PlushieRatvar
       - PlushieNar
+      #Floof Plushies - Start
       #HypnoTemp Plushies - Start
       - PlushieHypnoTempCap
       - PlushieHypnoTempCMO
@@ -1800,14 +1801,24 @@
       - PlushieHypnoTempLO
       - PlushieHypnoTempMysta
       #HypnoTemp Plushies - End
+      - PlushieTrystan
+      - PlushieCentCom
+      - PlushieSlimeTider
+      - PlushieChillHuman
+      - PlushieDino
+      - PlushieDragon
+      - PlushieFRavager
+      - PlushieFPraetorian
+      - PlushieFDrone
+      - PlushieFRouny
+      #Floof Plushies - End
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - PlushieGhost
       - PlushieRGBee
       - PlushieRainbowCarp
       - PlushieJester
       - PlushieSlips
-      - PlushieTrystan
       - PlushieAbductor
       - PlushieAbductorAgent
       - PlushieNuke

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -503,3 +503,17 @@
     stateBaseClosed: hop
     stateDoorOpen: hop_open
     stateDoorClosed: representative_door
+
+# Central Command
+- type: entity
+  id: LockerCentComm
+  name: central command officer locker
+  parent: LockerBaseSecure
+  components:
+  - type: Appearance
+  - type: AccessReader
+    access: [["CentralCommand"]]
+  - type: EntityStorageVisuals
+    stateBaseClosed: CentCom
+    stateDoorOpen: CentCom_open
+    stateDoorClosed: CentCom_door
diff --git a/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Floof/Entities/Objects/Fun/toys.yml
@@ -133,8 +133,8 @@
 - type: entity
   parent: BasePlushie
   id: PlushieDragon
-  name:
-  description:
+  name: dragon plushie
+  description: Rawr Im'ma eat ya!
   components:
   - type: Sprite
     sprite: Floof/Objects/Fun/floof_plush.rsi
@@ -250,3 +250,28 @@
       path: /Audio/Voice/Slime/slime_squish.ogg
       params:
         volume: 1
+
+- type: entity
+  parent: PlushieHuman
+  id: PlushieCentCom
+  name: Central Command plushie
+  description: Your own personal CentCom Pal!
+  components:
+  - type: Sprite
+    sprite: Floof/Objects/Fun/floof_plush.rsi
+    state: pepper
+  - type: UseDelay
+    delay: 1.5
+  - type: EmitSoundOnUse
+    sound:
+      path: /Audio/Animals/mouse_squeak.ogg
+      params:
+        volume: 1
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Animals/mouse_squeak.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Animals/mouse_squeak.ogg
+      params:
+        volume: 1