From f6c0e6d3d2b197c9d18508a00730bcb2ae22a7b0 Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Sat, 8 Feb 2025 16:37:46 +0100 Subject: [PATCH] Wizard shuttle preperation (#34932) FIREBALL MOTHERF- --- .../communications-console-component.ftl | 1 + Resources/Maps/Shuttles/wizard.yml | 221 ++++++++++++------ .../Devices/Circuitboards/computer.yml | 11 + .../Prototypes/Entities/Objects/Fun/toys.yml | 22 ++ .../Machines/Computers/computers.yml | 33 +++ .../Objects/Misc/module.rsi/cpu_wizard.png | Bin 0 -> 6918 bytes .../Objects/Misc/module.rsi/meta.json | 11 +- .../Machines/computers.rsi/comm_wizard.png | Bin 0 -> 1016 bytes .../Machines/computers.rsi/meta.json | 28 ++- .../Machines/computers.rsi/wizard_key.png | Bin 0 -> 6958 bytes 10 files changed, 250 insertions(+), 77 deletions(-) create mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpu_wizard.png create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/comm_wizard.png create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/wizard_key.png diff --git a/Resources/Locale/en-US/communications/communications-console-component.ftl b/Resources/Locale/en-US/communications/communications-console-component.ftl index a757f9e0d1..209be1adeb 100644 --- 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 7bdb8ca83d..fee421124e 100644 --- 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 08968c9b6c..be4a105429 100644 --- 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 9a9db4237b..caa67f8b89 100644 --- 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 2e58679e7c..3537288a9d 100644 --- 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 index 0000000000000000000000000000000000000000..8feeb986a5507bb19dafaeb7dafed60c929310da GIT binary patch literal 6918 zcmdT}Yitx%6rL(AWo%1B305Fw6)|Xt&fYt7X9fjJTT&XK0n(WAh<5fdv5Ik}MIM5| zDr<;}QA|+85X4_35(1dW4`G$4RTM=eVq!!zAtZXQ1opWzCvukHJ)|aZIRYg%s8)nqa#WO@#aS`rqD^{GtV_0Iwyf#I-u7a)tW#gtw zMJYJkKE1hpuCp|hSp10Fx+orMU!I7E;>%iHMWwqMqJxE*svD*yY#}rpx~<#HLBpaq z9Msmdu%^qqd|~n~-vj+>w}D{-#{jx;Skg7T`2At8AEV?EcF;1=OuwsEG;N3k4K|^` z!7TKXbKg-qG7qDN+UfbKoo;Z73`01L$Vt-^wq<5hi=@X>5P8rzTq@o4^dvuOuXhvb z#SFyZjKw)(;m+iV9&T`lYbqLea6yAG#F1vYQ#hgnF#^1p(b|qCQF#g=L_MkPKH9QIjfF=0Z+D`rz6{=5kKeZ4_%53&=2N5utd5 zMe|gSlF1p%_G9%g6w(jBlmXPP2Qqu2VTd^DN0vzLfIdQ179o3Z>|sL-boLfAK-N9d|vdO0Cv-#=_uA5s5sWJYBn8Yr2J6KZ8S3K|Cb zc10W!mn-6EFi`8Am^`M|n@q4k@`_qtWb%sIz{m`4YMPT*brck{=UdOjhm;;UAR88tSGsHLr=b zR2FV+8Tnkti)EFMHZ<*+_4n{MW*r@y`iJi;OMTO&?3`RaX2|3x;>UMCQ@Gjb9Cg#K zJtOvMiH05Fm5-l!_Qpt+xo~CG`0>fASH^cPPA&T7HtpY^kBmv4J-jRR)9_n{S5946 z#8$s^a`#=$GaH>d>h{-OU$W|8{npN@ZFdP5B}Pf zT97PCPAMs^t`D7R`|zPD1w%jmv#oeSl~s@=A;W%QC7<+W()+{&TJ+8N3HAFSQ|^36Lw yYdL-4!r{vQ*4I`z9Hh$HxuLur`aShu~VrQ?5G{@$7Z literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/module.rsi/meta.json b/Resources/Textures/Objects/Misc/module.rsi/meta.json index b366741738..b6f6c6d819 100644 --- 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 index 0000000000000000000000000000000000000000..0d078397d83541745254c19915006db742dec1f0 GIT binary patch literal 1016 zcmVL_|dYo0@Im<=vyvP|wkzK@00|)swH2*1WRi7pcd#5R*T$&AtNa z(WYwDx|)w4uH94DdT#|ElyrWPtObDKbBERH+&A^+=WDgUyT7>%liyU!YBW-6vUYIm z-`@W+*7CbI_l&hH!}F}9^NW&LfOgEugKdI&PFgxYq|^n#)|ceL+MTV(*L!boJ=c%% z(^rxCI0w0nvOU{5D6s(Zv+tWfvHP2o?^6B04*?%rw!-)X&F8KwUpoK%&Py$YHDAjt zus#oAOcdN*Z%Q(-Lt-m>9ch(3}1>!j9h3p8Idt&sV8iLx|0KEM1LbM1W@+(~cK=*>=;m9|?@&y3&-$)i={PbPt{EjGqv@6dqI{z*U zAgs~_kiG{XM835(QMxxXD>TU_wSO1ECqJ=09sTh`Cl9q8-}2~>4*@-yCvtoBeDf1; z(gU=1+gh+g_Q(5Zch^i2LgcqS2k0#wKjV+%H({8v^vAnu^b8l0lXrgGJ7n~hp5~Sx z-5+0+`ue;Y*l|iVHWo$pgi!gZ?vR19^~d98hmi{-k(wK9u7sJOuU`KA()d(gjTZK; zL{eA6zWGk~375%%Mqf?xV+iT|(vV&W()mP0L_|bHL_|bHM0u0`EL=L@hxa#PlI`JT z$oJ*dSAof+M_!6_ehAJ5z;2)Rzjn-nbbcsK1;FId^(F=R=*jN{mFB%pX$`+tg zco(1(dh{hZ7a+vn1n?o9ABuAUI-xbZ47@JH^h&4)8A|o?L-0Napc@*!@=~PpeR&lC zlOO0FZ1&1akj@Xmxd3|dxc$iXhY9i~oga#G0rce2o*i;PRml&3v3ic7`|G9GK8Q8n<{D=5U3h-Z)SIPR|27WNRODNf+1~*+I#F_#cF{XC?!a$ z)|L*Oy|!F!3v=1odHvu2 z{g3&RZkOceO&&t-ARdorh(Fgi74M1SxoIH!jU}^B;Wel%w{WhoyHwV2K%; z7;BnW(`7FwVknzeT_t4UWMCMb6Dt(m2&x-)R0FlJ zF2G|zQAJEJqF9g06FWL!LNhkJ(Sw1gdEBc~xOdSuCBSDaX8W5SKQ$ZR&XbYZDM4G-WY4Lb6E+^G8zqHIl z&`BNCvJApPEMmfy+{+mca>LZA#wj7Efzq|LXd}rGLFm=a~|T3$;2KJ8o< z3mz=sZnPbjOyV$r2uePTHCjUXRv@xw@@Pz1R_Y1mbOH#6Z&QzzVOS~M&S z68kQX_DnznzJ=!~w@nSE*>HjbW>Kba3x!GpjD*by2@G+6?a2c~mIdiat37+E+KGFY zzyvsqhiN1xB#eY2)GFa5k${GekB3W zZKSLh*T^u$RYD38Zb@;Dq)Z}U*fEXWDJ01?CKERd?jV6++N5pQY%%ga* z&_!)BW1DV{#djfSGly9$gh~;+v~o=gL=#eoT%CXm-tj!?OhZhdz4k=DaxZE=?i#kc zv0nj8TA!Fh+=3dn*)6HUOH#Z;(O3N!_D;yax%x*B8R zAY#-Bkb3B9X1x!Tx-lxx-e;uZr!sSGxt3e6kiFuJDzMP->d^*n`i_WLslH4gQ_-hToU-#QfFgPHdl&o|9Sq{k&1@R%Qps z463>DhNZp{gclvJNUvIUW=KI{AqH7hX7S7qmSttvX?NdJmBC9M+r0MmaT`WFpZCs_ zruQ`4vOM_b%sl^Pe}>OjS7|>!FDrX!Yx5|3Yxu+IwaYIVrwWFxDgE-2zp?qjH=lhV z-x)q`-{3Jrt2chSvSH2Q^*>LYR{9$`nR8^*_)pFa*i?V?rON3I7q+MS&^})=v*E?v z^&cHSwCSz7qMdv9?y_<#)-@hzJ^Whbss$ypMwY(!gPn%yhH&G~BNIN;501WX?C*;g zOg{4H$(m@(UH|c}^b^A~i$dkNu72wD>?u3ud@=Irg)2hU7yLJW zHK2KwJ~zC-c1-5qcQsA8cwp>L1?SIPeEHYnSMx{juHW%v#*C(-V`)cQuGHLCoj=9@S)A#(dVeOLo!>94j5RZRSp0EDl;;R1u D7K{bh literal 0 HcmV?d00001 -- 2.51.2