Revert "bunch o shit"

This reverts commit cad3506.

Resources/Locale/en-US/Floof/flavors/flavor-profiles.ftl

@@ -75,5 +75,3 @@ flavor-base-strange = strange
 flavor-complex-cherry = like cherries
 flavor-complex-walnut = like walnuts
 flavor-complex-despair = despair
-flavor-complex-eggnog = eggnog
-flavor-complex-syndicate-eggnog = like eggnog, and war profiteering

Resources/Locale/en-US/Floof/reagents/meta/consumable/drink/alcohol.ftl

@@ -189,9 +189,3 @@ reagent-desc-jenn-tonic = Light golden and bubbly, what could go wrong?
 
 reagent-name-hallelujah = Hallelujah
 reagent-desc-hallelujah = Exactly what you need.
-
-reagent-name-eggnog = Eggnog
-reagent-desc-eggnog = creamy, pale yellow and topped with a sprinkle of cinnamon.
-
-reagent-name-syndicate-eggnog = Syndicate Eggnog
-reagent-desc-syndicate-eggnog = creamy, pale yellow and topped with a sprinkle of cinnamon and strongly alcoholic.

Resources/Prototypes/Floof/Entities/Objects/Consumable/Drinks/drinks_bottles.yml

@@ -34,44 +34,3 @@
   - type: Sprite
     sprite: Floof/Objects/Consumable/Drinks/bottleocum.rsi
   - type: Sealable
-
-- type: entity
-  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
-  id: DrinkEggnogBottleFull
-  name: eggnog bottle
-  description: A fancy looking bottle of eggnog, with a festive label and sealed cap.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        reagents:
-        - ReagentId: Eggnog
-          Quantity: 100
-  - type: Label
-    currentLabel: eggnog
-  - type: Sprite
-    sprite: Floof/Objects/Consumable/Drinks/syndicate_eggnog_bottle.rsi
-  - type: Sealable
-  - type: SolutionContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: fill-
-- type: entity
-  parent: [DrinkBottleVisualsAll, DrinkBottleGlassBaseFull]
-  id: DrinkSyndicateEggnogBottleFull
-  name: syndicate eggnog bottle
-  description: A bottle of eggnog, with a festive label and sealed cap.
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        reagents:
-        - ReagentId: SyndicateEggnog
-          Quantity: 100
-  - type: Label
-    currentLabel: syndicate eggnog
-  - type: Sprite
-    sprite: Floof/Objects/Consumable/Drinks/syndicate_eggnog_bottle.rsi
-  - type: Sealable
-  - type: SolutionContainerVisuals
-    maxFillLevels: 3
-    fillBaseName: fill-

Resources/Prototypes/Floof/Flavors/flavors.yml

@@ -382,13 +382,3 @@
   id: despair
   flavorType: Complex
   description: flavor-complex-despair
-
-- type: flavor
-  id: eggnog
-  flavorType: Complex
-  description: flavor-complex-eggnog
-
-- type: flavor
-  id: syndicate-eggnog
-  flavorType: Complex
-  description: flavor-complex-syndicate-eggnog

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

@@ -69,7 +69,7 @@
 - type: loadout
   id: LoadoutClothingHandsDetectiveWarmers
   category: JobsSecurity
-  cost: 2
+  cost: 1
   exclusive: true
   items:
   - ClothingHandsDetectiveWarmers
@@ -81,7 +81,7 @@
 - type: loadout
   id: LoadoutClothingUnderSocksDetective
   category: JobsSecurity
-  cost: 2
+  cost: 1
   exclusive: true
   items:
   - ClothingUnderSocksDetective
@@ -98,7 +98,7 @@
 - type: loadout
   id: LoadoutClothingUniformDetectiveThong
   category: JobsSecurity
-  cost: 2
+  cost: 1
   exclusive: true
   items:
   - ClothingUniformDetectiveThong

Resources/Prototypes/Floof/Reagents/Consumable/Drink/alcohol.yml

@@ -1490,81 +1490,4 @@
       - !type:AdjustReagent
         reagent: Ethanol
         amount: 0.06
-
-- type: reagent
-  id: Eggnog
-  name: reagent-name-eggnog
-  parent: BaseAlcohol
-  desc: reagent-desc-eggnog
-  physicalDesc: reagent-physical-desc-creamy
-  flavor: eggnog
-  color: "#F1E0A1"
-  metamorphicSprite:
-    sprite: Floof/Objects/Consumable/Drinks/eggnog.rsi
-    state: icon_empty
-  metamorphicMaxFillLevels: 3
-  metamorphicFillBaseName: fill-
-  metamorphicChangeColor: false
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 1
-      - !type:AdjustReagent
-        reagent: Pomelustine
-        amount: 0.1
-
-- type: reagent
-  id: SyndicateEggnog
-  name: reagent-name-syndicate-eggnog
-  parent: BaseAlcohol
-  desc: reagent-desc-syndicate-eggnog
-  physicalDesc: reagent-physical-desc-creamy
-  flavor: syndicate-eggnog
-  color: "#d8c990"
-  metamorphicSprite:
-    sprite: Floof/Objects/Consumable/Drinks/syndicate_eggnog.rsi
-    state: icon_empty
-  metamorphicMaxFillLevels: 3
-  metamorphicFillBaseName: fill-
-  metamorphicChangeColor: false
-  metabolisms:
-    Drink:
-      effects:
-      - !type:SatiateThirst
-        factor: 1
-      - !type:AdjustReagent
-        reagent: Ethanol
-        amount: 0.08
-
-- type: entity
-  parent: DrinkGlass
-  id: DrinkEggnogGlass
-  suffix: eggnog
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: Eggnog
-          Quantity: 30
-  - type: Icon
-    sprite: Floof/Objects/Consumable/Drinks/eggnog.rsi
-    state: icon
-
-- type: entity
-  parent: DrinkGlass
-  id: DrinkSyndicateEggnogGlass
-  suffix: eggnog
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      drink:
-        maxVol: 30
-        reagents:
-        - ReagentId: SyndicateEggnog
-          Quantity: 30
-  - type: Icon
-    sprite: Floof/Objects/Consumable/Drinks/syndicate_eggnog.rsi
-    state: icon
+

Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml

@@ -9,6 +9,10 @@
 #  whitelistRequired: true
   icon: "JobIconPrisoner"
   supervisors: job-supervisors-security
+  special:
+  - !type:AddComponentSpecial
+    components:
+      - type: Pacified
 
 - type: startingGear
   id: PrisonerGear