Replace Vestine-derivatives in plant mutations, change uplink prices & hypopen to...

* Initial commit

* It's a toxin!

* Review changes

* Review changes

diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
index 288c085d8cd7d05822d2c82b02fc72461db5411e..acfbb64a3837a56365f70c6eb3db6517746c2ad5 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml
@@ -30,10 +30,10 @@
         - id: Dropper
         # It would be cool to have special "syndicate" chemical analysis goggles
         - id: ClothingEyesGlassesChemical
+        - id: SyringeStimulants
         - id: VestineChemistryVial
           amount: 2
         - id: BaseChemistryEmptyVial
-        - id: SyringeStimulants
 
 - type: entity
   parent: [BoxCardboard, BaseSyndicateContraband]

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 7c926a2931f8a8f317c4322dbcf4e5619b09b01e..3a3882eae0a12409d9da651c71cc80623cef8586 100644 (file)
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -666,9 +666,9 @@
   productEntity: ChemicalSynthesisKit
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 2
   cost:
-    Telecrystal: 4
+    Telecrystal: 3
   categories:
   - UplinkChemicals
 
@@ -699,9 +699,9 @@
   productEntity: ChemistryBottleNocturine
   discountCategory: usualDiscounts
   discountDownTo:
-    Telecrystal: 3
+    Telecrystal: 2
   cost:
-    Telecrystal: 6
+    Telecrystal: 4
   categories:
   - UplinkChemicals
 

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
index d934d65778fd6794d3bdfb9671e79d5432cc817f..876518d61e52679204bf2d528103befba9124d96 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
@@ -659,7 +659,7 @@
         maxVol: 10
   - type: RefillableSolution
     solution: hypospray
-    refillTime: 1.25
+    refillTime: 0.75
     maxRefill: 5
   - type: ExaminableSolution
     solution: hypospray
@@ -667,7 +667,7 @@
     exactVolume: true
   - type: Hypospray
     onlyAffectsMobs: false
-    drawTime: 1.25
+    drawTime: 0.75
   - type: UseDelay
     delay: 0.5
   - type: StaticPrice # A new shitcurity meta

diff --git a/Resources/Prototypes/Hydroponics/randomChemicals.yml b/Resources/Prototypes/Hydroponics/randomChemicals.yml
index 7b2fdf3a2c5fd689a25930be8a376563b0d76a75..bdafb60087aa3d7c9d6a7a6bb1bb0942c5a894f3 100644 (file)
--- a/Resources/Prototypes/Hydroponics/randomChemicals.yml
+++ b/Resources/Prototypes/Hydroponics/randomChemicals.yml
@@ -5,11 +5,11 @@
     weight: 0.5
     reagents:
     - Omnizine
-    - Nocturine
-    - Lexorin
+    - Impedrezene
+    - Fresium
+    - HeartbreakerToxin
     - Honk
     - BuzzochloricBees
-    - Stimulants
   - quantity: 5
     weight: 1
     reagents:
@@ -31,6 +31,9 @@
     - ChangelingSting
     - CogChamp
     - JuiceThatMakesYouWeh
+    - TearGas
+    - Lipolicide
+    - Benzene
   - quantity: 5
     weight: 2
     reagents:
@@ -57,6 +60,8 @@
     - Cola
     - Diphenhydramine
     - Iron
+    - Bleach
+    - Mannitol
   - quantity: 10
     weight: 3
     reagents:
@@ -78,7 +83,7 @@
     - Ash
     - SodiumCarbonate
     - SpaceDrugs
-    - MuteToxin
+    - SpaceGlue
     - JuiceBerryPoison
     - Pilk
     - Posca
@@ -91,6 +96,9 @@
     - Potassium
     - Fluorine
     - Aluminium
+    - Wine
+    - Coffee
+    - Beer
   - quantity: 10
     weight: 3.5
     reagents: