Wizard shuttle preperation (#34932)

FIREBALL MOTHERF-

diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl
index a757f9e0d10a842a479192fc5b722c5eb963dabf..209be1adeb07c8a74e1c0ede3ad709d6d073c645 100644 (file)
--- a/Resources/Locale/en-US/communications/communications-console-component.ftl
+++ b/Resources/Locale/en-US/communications/communications-console-component.ftl
@@ -25,3 +25,4 @@ comms-console-announcement-title-station = Communications Console
 comms-console-announcement-title-centcom = Central Command
 comms-console-announcement-title-nukie = Syndicate Nuclear Operative
 comms-console-announcement-title-station-ai = Station AI
+comms-console-announcement-title-wizard = Wizard

diff --git a/Resources/Maps/Shuttles/wizard.yml b/Resources/Maps/Shuttles/wizard.yml
index 7bdb8ca83d8ab309ff180da17e8260d88d0bfb58..fee421124e2d79d4ae12cc4d1a558fb7d052bc00 100644 (file)
--- a/Resources/Maps/Shuttles/wizard.yml
+++ b/Resources/Maps/Shuttles/wizard.yml
@@ -33,11 +33,11 @@ entities:
       chunks:
         -1,-1:
           ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAZAAAAAADZAAAAAADWQAAAAABeQAAAAAAdgAAAAACdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAZAAAAAAAZAAAAAACWQAAAAACeQAAAAAAdgAAAAADdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAeQAAAAAAdgAAAAADdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAIAAAAAABJQAAAAABIAAAAAAAJQAAAAACIAAAAAABJQAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAIAAAAAADJAAAAAADeQAAAAAAJAAAAAADeQAAAAAAJAAAAAACeQAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAJQAAAAACIAAAAAAAJQAAAAACIAAAAAABJQAAAAABIAAAAAABJQAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAIgAAAAAAeQAAAAAAHQAAAAABHQAAAAAAeQAAAAAAMAAAAAABMAAAAAAAMAAAAAABMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAADIgAAAAACIgAAAAADHQAAAAACHQAAAAADeQAAAAAAMAAAAAABHgAAAAACHgAAAAACHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAMAAAAAAAHgAAAAACHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAACHQAAAAAAHQAAAAADeQAAAAAAMAAAAAABHgAAAAADHgAAAAABHgAAAAAC
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAZAAAAAADZAAAAAADWQAAAAABeQAAAAAAdgAAAAACdgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAZAAAAAAAZAAAAAACWQAAAAACeQAAAAAAdgAAAAADdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAWQAAAAADWQAAAAADWQAAAAAAeQAAAAAAdgAAAAADdgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAIAAAAAABJQAAAAABIAAAAAAAJQAAAAACIAAAAAABJQAAAAADIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeQAAAAAAIAAAAAADJAAAAAADIAAAAAAAJAAAAAADIAAAAAAAJAAAAAACIAAAAAAAIAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAJQAAAAACIAAAAAAAJQAAAAACIAAAAAABJQAAAAABIAAAAAABJQAAAAABIAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAADeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAIgAAAAAAIgAAAAAAeQAAAAAAHQAAAAABHQAAAAAAeQAAAAAAMAAAAAABMAAAAAAAMAAAAAABMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAADIgAAAAACIgAAAAADHQAAAAACHQAAAAADeQAAAAAAMAAAAAABHgAAAAACHgAAAAACHgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAWQAAAAABWQAAAAADeQAAAAAAHQAAAAAAHQAAAAADeQAAAAAAMAAAAAAAHgAAAAACHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAIgAAAAABIgAAAAAAIgAAAAACHQAAAAAAHQAAAAADeQAAAAAAMAAAAAABHgAAAAADHgAAAAABHgAAAAAC
           version: 6
         0,-1:
           ind: 0,-1
-          tiles: aAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAeQAAAAAAbAAAAAACbAAAAAACbAAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACeQAAAAAAbAAAAAADcAAAAAACbAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACeQAAAAAAbAAAAAACbAAAAAAAbAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACIAAAAAADJQAAAAACIAAAAAABJQAAAAADIAAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAJAAAAAAAeQAAAAAAJAAAAAABeQAAAAAAJAAAAAABIAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABIAAAAAABJQAAAAACIAAAAAACJQAAAAACIAAAAAACJQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAACMAAAAAADMAAAAAAAeQAAAAAAFwAAAAAEFwAAAAAGFwAAAAAHFwAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADMAAAAAACeQAAAAAAFwAAAAADFwAAAAADFwAAAAAGFwAAAAAEFwAAAAACIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACMAAAAAADeQAAAAAAFwAAAAAHFwAAAAAEFwAAAAADFwAAAAADFwAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACMAAAAAADeQAAAAAAFwAAAAAHFwAAAAACFwAAAAABFwAAAAAEFwAAAAABIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+          tiles: aAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAAAeQAAAAAAbAAAAAACbAAAAAACbAAAAAACeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACeQAAAAAAbAAAAAADcAAAAAACbAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdgAAAAACeQAAAAAAbAAAAAACbAAAAAAAbAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAIgAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAACIAAAAAADJQAAAAACIAAAAAABJQAAAAADIAAAAAADeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAJAAAAAAAIAAAAAAAJAAAAAABIAAAAAAAJAAAAAABIAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJQAAAAABIAAAAAABJQAAAAACIAAAAAACJQAAAAACIAAAAAACJQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAACMAAAAAADMAAAAAAAeQAAAAAAFwAAAAAEFwAAAAAGFwAAAAAHFwAAAAACeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAABHgAAAAADMAAAAAACeQAAAAAAFwAAAAADFwAAAAADFwAAAAAGFwAAAAAEFwAAAAACIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAACMAAAAAADeQAAAAAAFwAAAAAHFwAAAAAEFwAAAAADFwAAAAADFwAAAAABeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAACMAAAAAADeQAAAAAAFwAAAAAHFwAAAAACFwAAAAABFwAAAAAEFwAAAAAAIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
           version: 6
         -1,0:
           ind: -1,0
@@ -342,7 +342,6 @@ entities:
             50: 1,-14
             74: -9,-3
             75: -9,-1
-            76: 8,-1
         - node:
             color: '#FFFFFFFF'
             id: WarnLineN
@@ -578,18 +577,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -10.5,-2.5
       parent: 768
-  - uid: 671
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-0.5
-      parent: 768
-  - uid: 672
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-2.5
-      parent: 768
 - proto: APCBasic
   entities:
   - uid: 436
@@ -605,24 +592,12 @@ entities:
       parent: 768
 - proto: AtmosDeviceFanDirectional
   entities:
-  - uid: 338
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-0.5
-      parent: 768
   - uid: 339
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -10.5,-2.5
       parent: 768
-  - uid: 340
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 9.5,-2.5
-      parent: 768
   - uid: 341
     components:
     - type: Transform
@@ -1907,6 +1882,18 @@ entities:
       parent: 768
 - proto: ChairWood
   entities:
+  - uid: 143
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 3.5,-5.5
+      parent: 768
+  - uid: 145
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-5.5
+      parent: 768
   - uid: 222
     components:
     - type: Transform
@@ -2079,6 +2066,28 @@ entities:
     - type: Transform
       pos: 0.5,-11.5
       parent: 768
+- proto: DrinkAleBottleFull
+  entities:
+  - uid: 773
+    components:
+    - type: MetaData
+      desc: Made fresh on the mountain by me... And my army of little owls.
+      name: wizard ale
+    - type: Transform
+      pos: 1.9282424,-5.2112255
+      parent: 768
+- proto: DrinkGlass
+  entities:
+  - uid: 771
+    components:
+    - type: Transform
+      pos: 2.6212802,-5.185618
+      parent: 768
+  - uid: 772
+    components:
+    - type: Transform
+      pos: 2.3556552,-5.388743
+      parent: 768
 - proto: FaxMachineSyndie
   entities:
   - uid: 619
@@ -2141,15 +2150,13 @@ entities:
       parent: 768
     - type: Fixtures
       fixtures: {}
-- proto: FloraRockSolid01
+- proto: FloraRockSolid
   entities:
   - uid: 594
     components:
     - type: Transform
       pos: 6.5734406,0.1678339
       parent: 768
-- proto: FloraRockSolid02
-  entities:
   - uid: 595
     components:
     - type: Transform
@@ -2968,6 +2975,18 @@ entities:
     - type: Transform
       pos: -10.5,0.5
       parent: 768
+  - uid: 775
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-2.5
+      parent: 768
+  - uid: 776
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-0.5
+      parent: 768
 - proto: Gyroscope
   entities:
   - uid: 636
@@ -3179,6 +3198,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-14.5
       parent: 768
+  - uid: 671
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-0.5
+      parent: 768
+  - uid: 672
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-2.5
+      parent: 768
   - uid: 689
     components:
     - type: Transform
@@ -3395,12 +3426,24 @@ entities:
     - type: Transform
       pos: 6.5,-3.5
       parent: 768
-- proto: PonderingOrb
+- proto: PonderingOrbWizard
   entities:
-  - uid: 675
+  - uid: 141
     components:
     - type: Transform
-      pos: 1.5413198,-1.6515679
+      pos: 1.5532424,-1.6617236
+      parent: 768
+- proto: PottedPlantRandom
+  entities:
+  - uid: 769
+    components:
+    - type: Transform
+      pos: -6.5,-7.5
+      parent: 768
+  - uid: 770
+    components:
+    - type: Transform
+      pos: 5.5,-7.5
       parent: 768
 - proto: PowerCellRecharger
   entities:
@@ -3632,6 +3675,21 @@ entities:
       parent: 768
     - type: ApcPowerReceiver
       powerLoad: 0
+  - uid: 774
+    components:
+    - type: Transform
+      pos: -2.5,-13.5
+      parent: 768
+  - uid: 777
+    components:
+    - type: Transform
+      pos: -7.5,3.5
+      parent: 768
+  - uid: 778
+    components:
+    - type: Transform
+      pos: 6.5,3.5
+      parent: 768
 - proto: Rack
   entities:
   - uid: 351
@@ -3644,6 +3702,23 @@ entities:
     - type: Transform
       pos: -4.5,-13.5
       parent: 768
+- proto: RandomSpawner
+  entities:
+  - uid: 779
+    components:
+    - type: Transform
+      pos: 0.5,-14.5
+      parent: 768
+  - uid: 780
+    components:
+    - type: Transform
+      pos: -6.5,-0.5
+      parent: 768
+  - uid: 781
+    components:
+    - type: Transform
+      pos: 6.5,2.5
+      parent: 768
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 5
@@ -3872,6 +3947,18 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-0.5
       parent: 768
+  - uid: 338
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-2.5
+      parent: 768
+  - uid: 340
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 9.5,-0.5
+      parent: 768
   - uid: 346
     components:
     - type: Transform
@@ -3982,13 +4069,6 @@ entities:
     - type: Transform
       pos: -0.5,-11.5
       parent: 768
-- proto: SyndicateComputerComms
-  entities:
-  - uid: 207
-    components:
-    - type: Transform
-      pos: 0.5,10.5
-      parent: 768
 - proto: TableCarpet
   entities:
   - uid: 624
@@ -4006,6 +4086,28 @@ entities:
     - type: Transform
       pos: 4.5,4.5
       parent: 768
+- proto: TableFancyBlack
+  entities:
+  - uid: 144
+    components:
+    - type: Transform
+      pos: -2.5,-5.5
+      parent: 768
+  - uid: 146
+    components:
+    - type: Transform
+      pos: -3.5,-5.5
+      parent: 768
+  - uid: 207
+    components:
+    - type: Transform
+      pos: 2.5,-5.5
+      parent: 768
+  - uid: 675
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 768
 - proto: TableStone
   entities:
   - uid: 171
@@ -4200,38 +4302,6 @@ entities:
     - type: Transform
       pos: -8.5,-3.5
       parent: 768
-- proto: WallDiamond
-  entities:
-  - uid: 141
-    components:
-    - type: Transform
-      pos: -5.5,-6.5
-      parent: 768
-  - uid: 142
-    components:
-    - type: Transform
-      pos: -3.5,-6.5
-      parent: 768
-  - uid: 143
-    components:
-    - type: Transform
-      pos: -1.5,-6.5
-      parent: 768
-  - uid: 144
-    components:
-    - type: Transform
-      pos: 0.5,-6.5
-      parent: 768
-  - uid: 145
-    components:
-    - type: Transform
-      pos: 2.5,-6.5
-      parent: 768
-  - uid: 146
-    components:
-    - type: Transform
-      pos: 4.5,-6.5
-      parent: 768
 - proto: WallUranium
   entities:
   - uid: 3
@@ -4831,6 +4901,13 @@ entities:
     - type: Transform
       pos: -2.5,9.5
       parent: 768
+- proto: WizardComputerComms
+  entities:
+  - uid: 142
+    components:
+    - type: Transform
+      pos: 0.5,10.5
+      parent: 768
 - proto: WoodblockInstrument
   entities:
   - uid: 676

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index 08968c9b6cfbdaad8821c3bed42f4b9048c2d0d4..be4a1054299a52466f4f93e9d76b2fd900a42cea 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -287,6 +287,17 @@
   - type: ComputerBoard
     prototype: SyndicateComputerComms
 
+- type: entity
+  parent: [ BaseComputerCircuitboard, BaseSyndicateContraband ]
+  id: WizardCommsComputerCircuitboard
+  name: wizard communications computer board
+  description: A computer printed circuit board for a wizard communications console.
+  components:
+  - type: Sprite
+    state: cpu_wizard
+  - type: ComputerBoard
+    prototype: WizardComputerComms
+
 - type: entity
   parent: BaseComputerCircuitboard
   id: RadarConsoleCircuitboard

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 9a9db4237b911f45c323a404b32eb9602f43d547..caa67f8b8997b04a7ddd1795546b3ce80746da3b 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1349,6 +1349,28 @@
   - type: TileFrictionModifier
     modifier: 0.001
 
+- type: entity
+  parent: PonderingOrb
+  id: PonderingOrbWizard
+  name: pondering orb
+  description: Ponderous, man... Really ponderous. Magically shows the station's camera network.
+  suffix: Wizard
+  components:
+  - type: ActivatableUI
+    requireActiveHand: false
+    inHandsOnly: true
+    key: enum.SurveillanceCameraMonitorUiKey.Key
+  - type: UserInterface
+    interfaces:
+      enum.SurveillanceCameraMonitorUiKey.Key:
+        type: SurveillanceCameraMonitorBoundUserInterface
+  - type: DeviceNetwork
+    deviceNetId: Wired
+    receiveFrequencyId: SurveillanceCamera
+    transmitFrequencyId: SurveillanceCamera
+  - type: WiredNetworkConnection
+  - type: SurveillanceCameraMonitor
+
 - type: entity
   parent: BaseItem
   id: ToySword

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 2e58679e7cad9fedb5af6f0eeec7e505e7b01a25..3537288a9d9638b4271d4d04621e5956fb04107e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -719,6 +719,39 @@
     energy: 1.6
     color: "#f71713"
 
+- type: entity
+  parent: ComputerComms
+  id: WizardComputerComms
+  name: wizard communications computer
+  description: A computer capable of magically projecting your speech to the station. Using this to make an announcement will alert the station to your presence.
+  components:
+  - type: Sprite
+    layers:
+    - map: ["computerLayerBody"]
+      state: computer
+    - map: ["computerLayerKeyboard"]
+      state: generic_keyboard
+    - map: ["computerLayerScreen"]
+      state: comm_wizard
+    - map: ["computerLayerKeys"]
+      state: wizard_key
+    - map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
+      state: generic_panel_open
+  - type: AccessReader
+    access: [[ "Wizard" ]]
+  - type: CommunicationsConsole
+    title: comms-console-announcement-title-wizard
+    color: "#ff00ff"
+    canShuttle: false
+    global: true #announce to everyone they're about to fuck shit up
+    sound: /Audio/Announcements/war.ogg
+  - type: Computer
+    board: WizardCommsComputerCircuitboard
+  - type: PointLight
+    radius: 1.5
+    energy: 1.6
+    color: "#F317F3"
+
 - type: entity
   parent: BaseComputerAiAccess
   id: ComputerSolarControl

diff --git a/Resources/Textures/Objects/Misc/module.rsi/cpu_wizard.png b/Resources/Textures/Objects/Misc/module.rsi/cpu_wizard.png
new file mode 100644 (file)
index 0000000..8feeb98
Binary files /dev/null and b/Resources/Textures/Objects/Misc/module.rsi/cpu_wizard.png differ

diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json
index b36674173805ea50b60d0baa7e81acd229449a18..b6f6c6d819d9b466d53e210c827c43de0116ee09 100644 (file)
--- a/Resources/Textures/Objects/Misc/module.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/module.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104",
+  "copyright": "Taken from https://github.com/tgstation/tgstation at 0d9c9a8233dfc3fc55edc538955a761a6328bee0, generic, service, command, science, security, medical, supply, and engineering taken from shiptest at https://github.com/shiptest-ss13/Shiptest/pull/1473, additional sprites created by EmoGarbage404, cpu_syndicate sprite derived from previous examples and created by Alpaccalypse at https://github.com/space-wizards/space-station-14/pull/34104, cpu_wizard by ScarKy0",
   "size": {
     "x": 32,
     "y": 32
@@ -136,6 +136,9 @@
     {
       "name": "cpu_syndicate"
     },
+    {
+      "name": "cpu_wizard"
+    },
     {
       "name": "cpuboard"
     },
@@ -317,9 +320,9 @@
       "name": "selfrepair_on",
       "delays": [
         [
-          0.1, 
-          0.1, 
-          0.1, 
+          0.1,
+          0.1,
+          0.1,
           0.1
         ]
       ]

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/comm_wizard.png b/Resources/Textures/Structures/Machines/computers.rsi/comm_wizard.png
new file mode 100644 (file)
index 0000000..0d07839
Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/comm_wizard.png differ

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
index 5355f379ab121afade72e908557b1cfe748286d7..e0127936dd1cf752072de98d1084e419df1f6a20 100644 (file)
--- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273.",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bd6873fd4dd6a61d7e46f1d75cd4d90f64c40894. comm_syndie made by Veritius, based on comm. generic_panel_open made by Errant, commit https://github.com/space-wizards/space-station-14/pull/32273, comms_wizard and wizard_key by ScarKy0",
   "size": {
     "x": 32,
     "y": 32
@@ -407,6 +407,28 @@
                 ]
             ]
         },
+        {
+            "name": "comm_wizard",
+            "directions": 4,
+            "delays": [
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
         {
             "name": "command",
             "directions": 4,
@@ -1692,6 +1714,10 @@
         {
             "name": "service_keys",
             "directions": 4
+        },
+        {
+            "name": "wizard_key",
+            "directions": 4
         }
     ]
 }

diff --git a/Resources/Textures/Structures/Machines/computers.rsi/wizard_key.png b/Resources/Textures/Structures/Machines/computers.rsi/wizard_key.png
new file mode 100644 (file)
index 0000000..f41e728
Binary files /dev/null and b/Resources/Textures/Structures/Machines/computers.rsi/wizard_key.png differ