Merge pull request #118 from ss14Starlight/hohohonkers

HohohonkersVend
ss14Starlight · Dec 5, 2024 · 64e635a · 64e635a
2 parents d9aed25 + d306b39
commit 64e635a
Show file tree

Hide file tree

Showing 23 changed files with 100,190 additions and 99,914 deletions.
diff --git a/Resources/Locale/en-US/_Starlight/store/categories.ftl b/Resources/Locale/en-US/_Starlight/store/categories.ftl
@@ -4,4 +4,5 @@ store-category-plushie-species = Species
 store-category-medical-chemistry = Chemistry
 store-category-medical-medical = Medical
 store-category-medical-surgery = Surgery
-store-category-medical-enginery = Enginery
+store-category-enginery-main = Enginery
+store-category-service-clown = Clown
diff --git a/Resources/Locale/en-US/_Starlight/store/vendors.ftl b/Resources/Locale/en-US/_Starlight/store/vendors.ftl
@@ -1,2 +1,4 @@
 vendor-hug-dispenser = hug dispenser
 vendor-medical-dispenser = medical dispenser
+vendor-engineering-dispenser = Engineering dispenser
+vendor-clown-dispenser = HohohonkersVend
diff --git a/Resources/Maps/_Starlight/Stations/Bagel.yml b/Resources/Maps/_Starlight/Stations/Bagel.yml
@@ -147468,6 +147468,13 @@ entities:
     - type: Transform
       pos: 3.5,-9.5
       parent: 60
+- proto: VendingMachineClown
+  entities:
+  - uid: 18848
+    components:
+    - type: Transform
+      pos: 21.5,-13.5
+      parent: 60
 - proto: VendingMachineCoffee
   entities:
   - uid: 6139

diff --git a/Resources/Maps/_Starlight/Stations/Box.yml b/Resources/Maps/_Starlight/Stations/Box.yml
@@ -11638,7 +11638,7 @@ entities:
       pos: 24.5,16.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -27198.496
+      secondsUntilStateChange: -27245.85
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -70445,11 +70445,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-3.5
       parent: 8364
-  - uid: 6994
-    components:
-    - type: Transform
-      pos: 22.5,3.5
-      parent: 8364
   - uid: 8077
     components:
     - type: Transform
@@ -85164,7 +85159,7 @@ entities:
       pos: -34.5,-14.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -21387.033
+      secondsUntilStateChange: -21434.387
       state: Closing
   - uid: 15010
     components:
@@ -85657,7 +85652,7 @@ entities:
       pos: -4.5,-71.5
       parent: 8364
     - type: Door
-      secondsUntilStateChange: -13134.764
+      secondsUntilStateChange: -13182.116
       state: Closing
 - proto: Fireplace
   entities:
@@ -160712,6 +160707,13 @@ entities:
     - type: Transform
       pos: -39.5,-4.5
       parent: 8364
+- proto: VendingMachineClown
+  entities:
+  - uid: 6994
+    components:
+    - type: Transform
+      pos: 22.5,3.5
+      parent: 8364
 - proto: VendingMachineCoffee
   entities:
   - uid: 5232

diff --git a/Resources/Maps/_Starlight/Stations/Cog.yml b/Resources/Maps/_Starlight/Stations/Cog.yml
@@ -346,7 +346,7 @@ entities:
           version: 6
         0,3:
           ind: 0,3
-          tiles: EQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAACfQAAAAADfQAAAAADFwAAAAAAFwAAAAADFwAAAAADFwAAAAABFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAACfQAAAAADFwAAAAACFwAAAAAAFwAAAAABFwAAAAACFwAAAAABEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAABfQAAAAABfQAAAAABfQAAAAAAFwAAAAAAFwAAAAADFwAAAAADFwAAAAAAFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABfQAAAAADFwAAAAAAFwAAAAAAFwAAAAACFwAAAAADFwAAAAADEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAADfQAAAAACfQAAAAABfQAAAAACfQAAAAADfQAAAAAAfQAAAAABfQAAAAAAfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAABfQAAAAADfQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABfQAAAAACcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAADfQAAAAAAfQAAAAAAfQAAAAABfQAAAAAAfQAAAAABfQAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGgAAAAAAgQAAAAAAfQAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAfQAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAGgAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAACfQAAAAABfQAAAAAAfQAAAAAAfQAAAAACfQAAAAABfQAAAAACcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAADCwAAAAAAgQAAAAAAcAAAAAAADQAAAAADcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
+          tiles: EQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAACfQAAAAADfQAAAAADFwAAAAAAFwAAAAADFwAAAAADFwAAAAABFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAADfQAAAAABfQAAAAACfQAAAAADFwAAAAACFwAAAAAAFwAAAAABFwAAAAACFwAAAAABEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAABfQAAAAABfQAAAAABfQAAAAAAFwAAAAAAFwAAAAADFwAAAAADFwAAAAAAFwAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABfQAAAAADFwAAAAAAFwAAAAAAFwAAAAACFwAAAAADFwAAAAADEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAADfQAAAAACfQAAAAABfQAAAAACfQAAAAADfQAAAAAAfQAAAAABfQAAAAAAfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAgQAAAAAAfQAAAAACfQAAAAABfQAAAAADfQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAABfQAAAAACcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAACfQAAAAAAfQAAAAADfQAAAAAAfQAAAAAAfQAAAAABfQAAAAAAfQAAAAABfQAAAAABcAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGgAAAAAAgQAAAAAAfQAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAABcAAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAAAYAAAAAACYAAAAAACYAAAAAADYAAAAAADYAAAAAADYAAAAAACYAAAAAACYAAAAAAAgQAAAAAAgQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAABYAAAAAADYAAAAAABYAAAAAACYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAGQAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAfQAAAAADYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAABYAAAAAACYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAGgAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAgQAAAAAAfQAAAAAAfQAAAAACfQAAAAACfQAAAAABfQAAAAAAfQAAAAAAfQAAAAACfQAAAAABfQAAAAACcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADQAAAAADCwAAAAAAgQAAAAAAcAAAAAAADQAAAAADcAAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAcAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA
           version: 6
         -1,3:
           ind: -1,3
@@ -11967,6 +11967,13 @@ entities:
       parent: 12064
     - type: InstantAction
       container: 12064
+  - uid: 16906
+    components:
+    - type: Transform
+      parent: 22720
+    - type: InstantAction
+      originalIconColor: '#FFFFFFFF'
+      container: 22720
   - uid: 18678
     components:
     - type: Transform
@@ -20826,7 +20833,7 @@ entities:
   - uid: 22811
     components:
     - type: Transform
-      pos: 4.7162275,59.451504
+      pos: 2.7015524,56.67428
       parent: 12
 - proto: BannerBlue
   entities:
@@ -95477,7 +95484,7 @@ entities:
   - uid: 22691
     components:
     - type: Transform
-      pos: 3.3723278,57.41803
+      pos: 2.5167634,57.465836
       parent: 12
 - proto: DrinkCoffeeJug
   entities:
@@ -102618,7 +102625,7 @@ entities:
   - uid: 22707
     components:
     - type: Transform
-      pos: 3.7616825,57.618866
+      pos: 2.8071458,57.465836
       parent: 12
 - proto: FoodBurgerMothRoach
   entities:
@@ -102742,7 +102749,7 @@ entities:
   - uid: 22696
     components:
     - type: Transform
-      pos: 3.284409,57.86991
+      pos: 2.7147512,57.782455
       parent: 12
 - proto: FoodFrozenSnowconeTrash
   entities:
@@ -151379,18 +151386,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,54.5
       parent: 12
-  - uid: 16927
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,56.5
-      parent: 12
-  - uid: 16928
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,55.5
-      parent: 12
   - uid: 17107
     components:
     - type: Transform
@@ -156170,8 +156165,24 @@ entities:
   - uid: 22720
     components:
     - type: Transform
-      pos: 4.51527,59.777863
+      pos: 2.5431619,56.700665
       parent: 12
+    - type: HandheldLight
+      toggleActionEntity: 16906
+    - type: ContainerContainer
+      containers:
+        cell_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+        actions: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 16906
+    - type: Physics
+      canCollide: True
+    - type: ActionsContainer
 - proto: LampGold
   entities:
   - uid: 13138
@@ -161022,13 +161033,6 @@ entities:
     - type: Transform
       pos: -5.5,59.5
       parent: 12
-- proto: PosterLegitMime
-  entities:
-  - uid: 22722
-    components:
-    - type: Transform
-      pos: 2.5,57.5
-      parent: 12
 - proto: PosterLegitNTTGC
   entities:
   - uid: 30227
@@ -164660,11 +164664,11 @@ entities:
     - type: Transform
       pos: 4.5,59.5
       parent: 12
-  - uid: 16913
+  - uid: 16927
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 3.5,56.5
+      pos: 2.5,57.5
       parent: 12
   - uid: 17774
     components:
@@ -164835,6 +164839,12 @@ entities:
       rot: 3.141592653589793 rad
       pos: 36.5,-32.5
       parent: 12
+  - uid: 22694
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,57.5
+      parent: 12
   - uid: 22709
     components:
     - type: Transform
@@ -184160,6 +184170,11 @@ entities:
     - type: Transform
       pos: 61.5,-18.5
       parent: 12
+  - uid: 16913
+    components:
+    - type: Transform
+      pos: 2.5,57.5
+      parent: 12
   - uid: 17383
     components:
     - type: Transform
@@ -184553,12 +184568,6 @@ entities:
     - type: Transform
       pos: 2.5,41.5
       parent: 12
-  - uid: 22694
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 4.5,59.5
-      parent: 12
   - uid: 22732
     components:
     - type: Transform
@@ -184597,7 +184606,7 @@ entities:
   - uid: 22892
     components:
     - type: Transform
-      pos: 3.5,57.5
+      pos: 2.5,56.5
       parent: 12
   - uid: 23092
     components:
@@ -187748,7 +187757,7 @@ entities:
   - uid: 22690
     components:
     - type: Transform
-      pos: 4.289193,59.401295
+      pos: 2.2395792,56.33127
       parent: 12
   - uid: 31502
     components:
@@ -188586,6 +188595,13 @@ entities:
     - type: Transform
       pos: -14.5,56.5
       parent: 12
+- proto: VendingMachineClown
+  entities:
+  - uid: 16928
+    components:
+    - type: Transform
+      pos: 4.5,59.5
+      parent: 12
 - proto: VendingMachineCoffee
   entities:
   - uid: 3802
@@ -204448,8 +204464,7 @@ entities:
   - uid: 16903
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,57.5
+      pos: 1.5,55.5
       parent: 12
   - uid: 16904
     components:
@@ -204463,12 +204478,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 1.5,57.5
       parent: 12
-  - uid: 16906
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 2.5,56.5
-      parent: 12
   - uid: 16907
     components:
     - type: Transform
@@ -205891,6 +205900,11 @@ entities:
     - type: Transform
       pos: 0.5,-57.5
       parent: 12
+  - uid: 22722
+    components:
+    - type: Transform
+      pos: 1.5,56.5
+      parent: 12
   - uid: 22849
     components:
     - type: Transform

diff --git a/Resources/Maps/_Starlight/Stations/Fland.yml b/Resources/Maps/_Starlight/Stations/Fland.yml
@@ -200128,12 +200128,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,20.5
       parent: 13329
-  - uid: 1115
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -13.5,10.5
-      parent: 13329
   - uid: 1142
     components:
     - type: Transform
@@ -207435,11 +207429,6 @@ entities:
     - type: Transform
       pos: -12.5,8.5
       parent: 13329
-  - uid: 1116
-    components:
-    - type: Transform
-      pos: -14.5,10.5
-      parent: 13329
   - uid: 1130
     components:
     - type: Transform
@@ -209989,6 +209978,13 @@ entities:
     - type: Transform
       pos: -1.5,71.5
       parent: 13329
+- proto: VendingMachineClown
+  entities:
+  - uid: 1115
+    components:
+    - type: Transform
+      pos: -14.5,10.5
+      parent: 13329
 - proto: VendingMachineCoffee
   entities:
   - uid: 2556