new-frontiers-14 · whatston3 · Sep 25, 2024 · Sep 2, 2024 · Sep 2, 2024 · Sep 2, 2024
diff --git a/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs b/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs
@@ -26,6 +26,8 @@ public PaletteColorPicker()
         var i = 0;
         foreach (var palette in _prototypeManager.EnumeratePrototypes<ColorPalettePrototype>())
         {
+            if (palette.Hidden) // Frontier: selectively hide palettes
+                continue; // Frontier: selectively hide palettes
             Palettes.AddItem(palette.Name);
             Palettes.SetItemMetadata(i, palette); // ew
             i += 1;

diff --git a/Content.Shared/Decals/ColorPalettePrototype.cs b/Content.Shared/Decals/ColorPalettePrototype.cs
@@ -8,4 +8,5 @@ public sealed partial class ColorPalettePrototype : IPrototype
     [IdDataField] public string ID { get; } = null!;
     [DataField("name")] public string Name { get; private set; } = null!;
     [DataField("colors")] public Dictionary<string, Color> Colors { get; private set; } = null!;
+    [DataField("hidden")] public bool Hidden { get; private set; } = false; // Frontier
 }
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -36,3 +36,7 @@ ghost-role-information-taxibot-description = Drive passengers to where they need
 
 ghost-role-information-hovertaxibot-name = Hovertaxibot
 ghost-role-information-hovertaxibot-description = Fly passengers to where they need to go, remember to check they can breathe!
+
+# Adopted from space-wizards #26265 (Thank you, PolterTzi)
+ghost-role-information-yipyip-name = Yip Yip
+ghost-role-information-yipyip-description = Notorious lounge lizard and bartender at Bahama Mama's. This drink-slinging kobold lives to serve his patrons.
diff --git a/Resources/Maps/_NF/POI/bahama.yml b/Resources/Maps/_NF/POI/bahama.yml
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -783,7 +783,7 @@
     spawned:
     - id: FoodMeat
       amount: 3
-    - id: DrinkTequilaBottleFull
+    - id: DrinkPremiumTequilaBottleFull # Frontier: Tequila<PremiumTequila
       amount: 1
   - type: Tag
     tags:

diff --git a/Resources/Prototypes/_NF/Entities/Markers/warp_point.yml b/Resources/Prototypes/_NF/Entities/Markers/warp_point.yml
@@ -152,6 +152,15 @@
   - type: WarpPoint
     location: Derelict McCargo
 
+- type: entity
+  id: WarpPointNFBahama
+  parent: WarpPoint
+  suffix: POI, Bahama
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WarpPoint
+    location: Bahama Mama's
+
 - type: entity
   id: WarpPointNFEdison
   parent: WarpPoint
@@ -162,4 +171,3 @@
     location: Edison Power Plant
 
 # Events
-
diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
@@ -186,3 +186,45 @@
   - type: NpcFactionMember
     factions:
       - Cat
+
+# Adopted from space-wizards #26265 (Thank you, PolterTzi)
+- type: entity
+  name: Yip Yip
+  parent: MobKobold
+  id: MobKoboldYipyip
+  description: He lives in a pineapple on the Frontier!
+  components:
+  - type: GhostRole
+    prob: 1
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    prototype: KoboldYipyip
+    name: ghost-role-information-yipyip-name
+    description: ghost-role-information-yipyip-description
+    rules: ghost-role-information-nonantagonist-rules
+  - type: GhostTakeoverAvailable
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeat
+      amount: 3
+    - id: DrinkPremiumRumBottleFull
+      amount: 1
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - DoorBumpOpener
+    - VimPilot
+  - type: Loadout
+    prototypes: [ MobKoboldGear ]
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: RandomSprite # Random with one choice.
+    available:
+      - enum.DamageStateVisualLayers.Base:
+          kobold: YipYipColors
+      - horns:
+          horns_curled: YipYipHornColors
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml
@@ -253,7 +253,15 @@
     - state: pirate
     - state: idpiratefirstmate
 
-# Pets
+- type: entity
+  parent: PunPunIDCard
+  id: YipYipIDCard
+  name: yip yip ID card
+  components:
+  - type: PresetIdCard
+    name: Yip Yip
+
+# Cats
 - type: entity
   parent: CourierIDCard
   id: ClippyIDCard
@@ -276,4 +284,4 @@
   name: cappy ID card
   components:
   - type: PresetIdCard
-    name: Cappy
+    name: Cappy
diff --git a/Resources/Prototypes/_NF/Entities/Spawners/mobs.yml b/Resources/Prototypes/_NF/Entities/Spawners/mobs.yml
@@ -36,3 +36,17 @@
   - type: ConditionalSpawner
     prototypes:
       - MobCatCappy
+
+# Adopted from space-wizards #26265 (Thank you, PolterTzi)
+- type: entity
+  name: Yip Yip Spawner
+  id: SpawnMobKoboldYipyip
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: green
+      - state: ai
+  - type: ConditionalSpawner
+    prototypes:
+      - MobKoboldYipyip
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/fax_machine.yml
@@ -192,6 +192,15 @@
   - type: FaxMachine
     name: "NFSD Outpost Lawyer"
 
+- type: entity
+  parent: FaxMachineBase
+  id: FaxMachineNFBahama
+  suffix: POI, Bahama
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: FaxMachine
+    name: "Bahama Mama's"
+
 - type: entity
   parent: [BaseStructureDisableToolUse, FaxMachineBase]
   id: FaxMachineNFEdison

diff --git a/Resources/Prototypes/_NF/Palettes/yipyip.yml b/Resources/Prototypes/_NF/Palettes/yipyip.yml
@@ -0,0 +1,14 @@
+# An entire palette of one colour for Yip Yip.
+- type: palette
+  id: YipYipColors
+  name: YipYipColors
+  hidden: true
+  colors:
+    TechniCyan: "#1ddfbe"
+
+- type: palette
+  id: YipYipHornColors
+  name: YipYipHornColors
+  hidden: true
+  colors:
+    hornB: "#eec7ab"
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml b/Resources/Prototypes/_NF/PointsOfInterest/bahamamamas.yml
@@ -0,0 +1,31 @@
+# Author Info
+# GitHub: Tych0theSynth (https://github.com/tych0thesynth)
+# Discord: Tych0
+
+# Maintainer Info
+# GitHub: Tych0theSynth (https://github.com/tych0thesynth)
+# Discord: Tych0
+
+# Notes:
+# I want to lie, shipwrecked and comatose, drinking fresh mango juice.
+- type: pointOfInterest
+  id: Bahama
+  name: "Bahama Mama's"
+  rangeMin: 1200
+  rangeMax: 2900
+  iffColor: "#ffa600" #yellorange for faction style
+  spawnChance: 1
+  spawnGroup: RestStop
+  gridPath: /Maps/_NF/POI/bahama.yml
+
+- type: gameMap
+  id: Bahama
+  mapName: "Bahama Mama's"
+  mapPath: /Maps/_NF/POI/bahama.yml
+  minPlayers: 0
+  stations:
+    Bahama:
+      stationProto: DeadDropFrontierOutpost
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: "Bahama Mama's"
diff --git a/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml b/Resources/Prototypes/_NF/PointsOfInterest/tinniasrest.yml
@@ -14,6 +14,7 @@
   rangeMin: 1200
   rangeMax: 2900
   iffColor: "#ffa600" #yellorange for faction style
+  spawnGroup: RestStop
   gridPath: /Maps/_NF/POI/tinnia.yml
 
 - type: gameMap

diff --git a/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml b/Resources/Prototypes/_NF/Roles/Ghostroles/whitelisted.yml
@@ -63,3 +63,11 @@
   rules: ghost-role-information-freeagent-rules
   entityPrototype: VariedXenoArtifactItem # Don't spawn this.  FIXME: entity has no ghost role component.
   whitelisted: true
+
+- type: ghostRole
+  id: KoboldYipyip
+  name: ghost-role-information-yipyip-name
+  description: ghost-role-information-yipyip-description
+  rules: ghost-role-information-nonantagonist-rules
+  entityPrototype: MobKoboldYipyip
+  whitelisted: true
diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_NF/Roles/Jobs/Fun/misc_startinggear.yml
@@ -16,3 +16,12 @@
     head: ClothingHeadHatNfsdSmallCampaign
     id: CappyIDCard
     belt: ClothingBeltNfsdWebbing
+
+# Adopted from space-wizards #26265 (Thank you, PolterTzi)
+- type: startingGear
+  id: MobKoboldGear
+  equipment:
+    head: ClothingHeadHatStrawHat
+    ears: ClothingHeadsetService
+    jumpsuit: ClothingUniformJumpsuitHawaiRed
+    id: YipYipIDCard