diff --git a/Resources/Audio/Corvax/Misc/attributions.yml b/Resources/Audio/Corvax/Misc/attributions.yml index 58716886e0..0601273cdf 100644 --- a/Resources/Audio/Corvax/Misc/attributions.yml +++ b/Resources/Audio/Corvax/Misc/attributions.yml @@ -4,5 +4,6 @@ source: "https://github.com/ParadiseSS13/Paradise/commit/a62233000443a5f57acfae6847748aabad5cdbdb" - files: ["blue.ogg", "delta.ogg", "green_down.ogg", "red.ogg"] - license: "" - copyright: "Made by Basia" + license: "CC-BY-SA-3.0" + copyright: "Made by Basia (discord- basiandia)" + source: "https://github.com/BasiaBelov" diff --git a/Resources/Maps/Corvax/corvax_silly.yml b/Resources/Maps/Corvax/corvax_silly.yml index 30e1a1a726..1370305569 100644 --- a/Resources/Maps/Corvax/corvax_silly.yml +++ b/Resources/Maps/Corvax/corvax_silly.yml @@ -138,7 +138,7 @@ entities: - 0 - 0 - type: Parallax - parallax: IceWater + parallax: Water - type: MapLight ambientLightColor: '#E0A0C0FF' - type: LightCycle diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/ipc.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/ipc.yml index ee7322df4b..ebc4206d1e 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Species/ipc.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Species/ipc.yml @@ -33,7 +33,9 @@ - type: Damageable damageContainer: SiliconIpc damageModifierSet: Ipc - - type: ToggleableLightVisuals + - type: ItemTogglePointLight + - type: ToggleableVisuals + spriteLayer: light - type: PointLight enabled: false mask: /Textures/Effects/LightMasks/cone.png diff --git a/Resources/Prototypes/Corvax/Parallax/other.yml b/Resources/Prototypes/Corvax/Parallax/other.yml index a66889add3..155a46e341 100644 --- a/Resources/Prototypes/Corvax/Parallax/other.yml +++ b/Resources/Prototypes/Corvax/Parallax/other.yml @@ -3,14 +3,14 @@ layers: - texture: !type:ImageParallaxTextureSource - path: "/Textures/Tiles/Planet/water.rsi/shoreline_water.png" + path: "/Textures/Corvax/Parallax/shoreline_water.png" slowness: 0.5 scrolling: "0.1, 0" tiled: true shader: "" - texture: !type:ImageParallaxTextureSource - path: "/Textures/Tiles/Planet/water.rsi/shoreline_water.png" + path: "/Textures/Corvax/Parallax/shoreline_water.png" slowness: 0 scrolling: "-0.1, 0" tiled: true @@ -18,7 +18,7 @@ layersLQ: - texture: !type:ImageParallaxTextureSource - path: "/Textures/Tiles/Planet/water.rsi/shoreline_water.png" + path: "/Textures/Corvax/Parallax/shoreline_water.png" slowness: 0 scrolling: "-0.1, 0" tiled: true @@ -30,14 +30,14 @@ layers: - texture: !type:ImageParallaxTextureSource - path: "/Textures/Tiles/Planet/water.rsi/shoreline_water.png" + path: "/Textures/Corvax/Parallax/shoreline_water.png" slowness: 0.5 scrolling: "0.1, 0" tiled: true shader: "" - texture: !type:ImageParallaxTextureSource - path: "/Textures/Tiles/Planet/water.rsi/shoreline_water.png" + path: "/Textures/Corvax/Parallax/shoreline_water.png" slowness: 0 scrolling: "-0.1, 0" tiled: true @@ -90,7 +90,7 @@ tiled: true shader: "" layersLQUseHQ: true - + - type: parallax id: LavaLight layers: diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 719d18caa3..2b092ba3f7 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -133,7 +133,7 @@ components: - type: Action icon: { sprite: Corvax/Interface/adminactions.rsi, state: solar } # Corvax-Resprite - iconOn: Corvax/Interface/adminactions.rsi/solar.png # Corvax- + iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: solar } - type: InstantAction event: !type:ToggleIntrinsicUIEvent { key: enum.SolarControlConsoleUiKey.Key } @@ -144,8 +144,8 @@ description: View a Communications Interface. components: - type: Action - icon: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console } - iconOn: { sprite: Interface/Actions/actions_ai.rsi, state: comms_console } + icon: { sprite: Corvax/Interface/adminactions.rsi, state: comms_console } # Corvax-Resprite + iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: comms_console } keywords: [ "AI", "console", "interface" ] priority: -4 - type: InstantAction @@ -158,8 +158,8 @@ description: View a Mass Scanner Interface. components: - type: Action - icon: { sprite: Interface/Actions/actions_ai.rsi, state: mass_scanner } - iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: comms_console } + icon: { sprite: Corvax/Interface/adminactions.rsi, state: mass_scanner } # Corvax-Resprite + iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: mass_scanner } keywords: [ "AI", "console", "interface" ] priority: -6 - type: InstantAction @@ -173,7 +173,7 @@ components: - type: Action icon: { sprite: Corvax/Interface/adminactions.rsi, state: cargo } # Corvax-Resprite - iconOn: Corvax/Interface/adminactions.rsi/cargo.png # Corvax-Resprite + iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: cargo } # Corvax-Resprite - type: InstantAction event: !type:ToggleIntrinsicUIEvent { key: enum.CargoConsoleUiKey.Orders } @@ -184,7 +184,7 @@ description: View a Crew Monitoring Interface. components: - type: Action - icon: { sprite: Interface/Actions/actions_ai.rsi, state: crew_monitor } + icon: { sprite: Corvax/Interface/adminactions.rsi, state: crew_monitor } # Corvax-Resprite iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: crew_monitor } keywords: [ "AI", "console", "interface" ] priority: -8 @@ -198,7 +198,7 @@ description: View a Station Records Interface. components: - type: Action - icon: { sprite: Interface/Actions/actions_ai.rsi, state: station_records } + icon: { sprite: Corvax/Interface/adminactions.rsi, state: station_records } # Corvax-Resprite iconOn: { sprite: Corvax/Interface/adminactions.rsi, state: station_records } keywords: [ "AI", "console", "interface" ] priority: -7 diff --git a/Resources/Textures/Corvax/Parallax/AvriteParallaxBG.png.yml b/Resources/Textures/Corvax/Parallax/AvriteParallaxBG.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/AvriteParallaxBG.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/AvriteParallaxNeb.png.yml b/Resources/Textures/Corvax/Parallax/AvriteParallaxNeb.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/AvriteParallaxNeb.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/DeltaParallaxBG.png.yml b/Resources/Textures/Corvax/Parallax/DeltaParallaxBG.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/DeltaParallaxBG.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/DeltaParallaxNeb.png.yml b/Resources/Textures/Corvax/Parallax/DeltaParallaxNeb.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/DeltaParallaxNeb.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/GlacierParallaxCloud.png.yml b/Resources/Textures/Corvax/Parallax/GlacierParallaxCloud.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/GlacierParallaxCloud.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/GlacierParallaxCloud2.png.yml b/Resources/Textures/Corvax/Parallax/GlacierParallaxCloud2.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/GlacierParallaxCloud2.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/GlacierParallaxLand.png.yml b/Resources/Textures/Corvax/Parallax/GlacierParallaxLand.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/GlacierParallaxLand.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/GlacierParallaxPlasma.png.yml b/Resources/Textures/Corvax/Parallax/GlacierParallaxPlasma.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/GlacierParallaxPlasma.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/GlacierParallaxShadow.yml b/Resources/Textures/Corvax/Parallax/GlacierParallaxShadow.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/GlacierParallaxShadow.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/IceParallax.png.yml b/Resources/Textures/Corvax/Parallax/IceParallax.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/IceParallax.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/LavaLightParallax.png.yml b/Resources/Textures/Corvax/Parallax/LavaLightParallax.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/LavaLightParallax.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/LavaParallax.png.yml b/Resources/Textures/Corvax/Parallax/LavaParallax.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/LavaParallax.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/SillyIceParallax.png.yml b/Resources/Textures/Corvax/Parallax/SillyIceParallax.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/SillyIceParallax.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/SillyOcean.png.yml b/Resources/Textures/Corvax/Parallax/SillyOcean.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/SillyOcean.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/SillyOcean_Overlay.png.yml b/Resources/Textures/Corvax/Parallax/SillyOcean_Overlay.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/SillyOcean_Overlay.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/SillyOcean_Overlay2.png.yml b/Resources/Textures/Corvax/Parallax/SillyOcean_Overlay2.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/SillyOcean_Overlay2.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/acid.png.yml b/Resources/Textures/Corvax/Parallax/acid.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/acid.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/shoreline_water.png b/Resources/Textures/Corvax/Parallax/shoreline_water.png new file mode 100644 index 0000000000..fd065f6221 Binary files /dev/null and b/Resources/Textures/Corvax/Parallax/shoreline_water.png differ diff --git a/Resources/Textures/Corvax/Parallax/shoreline_water.png.yml b/Resources/Textures/Corvax/Parallax/shoreline_water.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/shoreline_water.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/Textures/Corvax/Parallax/venusland.png.yml b/Resources/Textures/Corvax/Parallax/venusland.png.yml new file mode 100644 index 0000000000..a2cfb0a1fe --- /dev/null +++ b/Resources/Textures/Corvax/Parallax/venusland.png.yml @@ -0,0 +1 @@ +preload: false diff --git a/Resources/toolshedEngineCommandPerms.yml b/Resources/toolshedEngineCommandPerms.yml index ae02339c1a..476676ac54 100644 --- a/Resources/toolshedEngineCommandPerms.yml +++ b/Resources/toolshedEngineCommandPerms.yml @@ -155,6 +155,7 @@ - atanpi - pick - tee + - lsobjectives #Corvax MGM issue - Flags: HOST Commands: