diff --git a/Content.Server/ADT/Misc/SecShuttleComponent.cs b/Content.Server/ADT/Misc/SecShuttleComponent.cs index 45bf6434d22..8bf9c2eca11 100644 --- a/Content.Server/ADT/Misc/SecShuttleComponent.cs +++ b/Content.Server/ADT/Misc/SecShuttleComponent.cs @@ -1,6 +1,6 @@ namespace Content.Server.ADT.Shuttle; /// -/// Added to salvage shuttle. Used for drone control. +/// Added to security shuttle. Used for drone control. /// [RegisterComponent] public sealed partial class SecShuttleComponent : Component diff --git a/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs b/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs index 3d097cd7c79..90e6c2bc9c3 100644 --- a/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs +++ b/Content.Server/GameTicking/Rules/Components/NukeOpsShuttleComponent.cs @@ -7,5 +7,5 @@ public sealed partial class NukeOpsShuttleComponent : Component { [DataField] - public EntityUid AssociatedRule; + public EntityUid? AssociatedRule; } diff --git a/Resources/Locale/ru-RU/ADT/Objects/Specific/handheldshuttleconsole.ftl b/Resources/Locale/ru-RU/ADT/Objects/Specific/handheldshuttleconsole.ftl new file mode 100644 index 00000000000..c38a0761afd --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/Objects/Specific/handheldshuttleconsole.ftl @@ -0,0 +1,9 @@ +ent-ADTHandheldShuttleConsoleDefault = портативный пульт управления шаттлом + .desc = Используется для дистанционного управления шаттлом. Работает на батарейках. + .suffix = НЕ МАППИТЬ +ent-ADTHandheldShuttleConsoleSyndicate = портативный пульт управления шаттлом Синдиката + .desc = Используется для дистанционного управления шаттлом. Работает на батарейках. +ent-ADTHandheldShuttleConsoleSalvage = портативный пульт управления шаттлом утилизаторов + .desc = Используется для дистанционного управления шаттлом. Работает на батарейках. +ent-ADTHandheldShuttleConsoleSecurity = портативный пульт управления шаттлом СБ + .desc = Используется для дистанционного управления шаттлом. Работает на батарейках. diff --git a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl index 468d8bed47e..77539f6c1e2 100644 --- a/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/Preferences/loadout-groups.ftl @@ -21,7 +21,7 @@ loadout-group-atmospheric-technician-neck = Атмосферный техник, loadout-group-atmospheric-technician-gasmask = Атмосферный техник, противогаз loadout-group-atmospheric-technician-head = Атмосферный техник, голова loadout-group-senior-engineer-head = Бригадир, голова -loadout-group-senior-engineer-jumpsuit = Бригадир, Комбинезон +loadout-group-senior-engineer-jumpsuit = Бригадир, комбинезон # Science loadout-group-roboticist-head = Робототехник, голова loadout-group-roboticist-jumpsuit = Робототехник, комбинезон @@ -32,6 +32,9 @@ loadout-group-senior-researcher-jumpsuit = Доцент, комбинезон loadout-group-senior-researcher-gloves = Доцент, перчатки loadout-group-senior-researcher-outerclothing = Доцент, верхняя одежда # Security +loadout-group-senior-officer-jumpsuit = Офицер-инструктор, комбинезон +loadout-group-senior-officer-backpack = Офицер-инструктор, рюкзак +loadout-group-senior-officer-outerclothing = Офицер-инструктор, верхняя одежда loadout-warden-neck-adt = Смотритель, шея loadout-security-officer-neck-adt = Офицер СБ, шея loadout-security-cadet-neck-adt = Кадет СБ, шея diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Lighting/base_shuttle_lighting.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Lighting/base_shuttle_lighting.ftl new file mode 100644 index 00000000000..8077d8c6ae0 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Lighting/base_shuttle_lighting.ftl @@ -0,0 +1,59 @@ +ent-ADTAlwaysPoweredShuttleLight = фара шаттла + .desc = Всегда работающая фара шаттла. + .suffix = Всегда запитанный +ent-ADTPoweredShuttleLightEmpty = фара шаттла + .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампой-трубкой. + .suffix = Пустой +ent-ADTPoweredShuttleLight = { ent-ADTPoweredShuttleLightEmpty } + .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампой-трубкой. + +ent-ADTAlwaysPoweredShuttleLightLED = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, LED, Светодиод + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightLED = { ent-ADTPoweredShuttleLight } + .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампой-трубкой. + .suffix = LED, Светодиод + +ent-ADTAlwaysPoweredShuttleLightSodium = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Натриевый + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightSodium = { ent-ADTPoweredShuttleLight } + .desc = Осветительный прибор. Потребляет энергию и излучает свет, если оснащён лампой-трубкой. + .suffix = Натриевый + +ent-ADTPoweredShuttleLightCyan = { ent-ADTPoweredShuttleLight } + .suffix = Голубой + .desc = { ent-ADTPoweredShuttleLight.desc } +ent-AlwaysADTPoweredShuttleLightCyan = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Голубой + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightBlue = { ent-ADTPoweredShuttleLight } + .suffix = Синий + .desc = { ent-ADTPoweredShuttleLight.desc } +ent-AlwaysADTPoweredShuttleLightBlue = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Синий + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightPink = { ent-ADTPoweredShuttleLight } + .suffix = Розовый + .desc = { ent-ADTPoweredShuttleLight.desc } +ent-AlwaysADTPoweredShuttleLightPink = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Розовый + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightOrange = { ent-ADTPoweredShuttleLight } + .suffix = Оранжевый + .desc = { ent-ADTPoweredShuttleLight.desc } +ent-AlwaysADTPoweredShuttleLightOrange = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Оранжевый + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightRed = { ent-ADTPoweredShuttleLight } + .suffix = Красный + .desc = { ent-ADTPoweredShuttleLight.desc } +ent-AlwaysADTPoweredShuttleLightRed = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Красный + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } +ent-ADTPoweredShuttleLightGreen = { ent-ADTPoweredShuttleLight } + .suffix = Зелёный + .desc = { ent-ADTPoweredShuttleLight.desc } +ent-AlwaysADTPoweredShuttleLightGreen = { ent-ADTAlwaysPoweredShuttleLight } + .suffix = Всегда запитанный, Зелёный + .desc = { ent-ADTAlwaysPoweredShuttleLight.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl index db0490017de..d1d7e66a83a 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Objectives/steal-target-groups.ftl @@ -3,3 +3,6 @@ steal-target-groups-adt-mobile-defibrillator = мобильный дефибри steal-target-groups-command-id = ID карта члена командования steal-target-groups-smile-extract = экстракт Смайла steal-target-groups-adt-pistol-x01 = X-01 М.Э.П. +steal-target-groups-adt-handheld-shuttle-console-security = портативный пульт управления шаттлом СБ +steal-target-groups-adt-handheld-shuttle-console-salvage = портативный пульт управления шаттлом утилизаторов + diff --git a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl index 42cbc265645..c2624f9634d 100644 --- a/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/ghost/roles/ghost-role-component.ftl @@ -19,7 +19,7 @@ ghost-role-information-antagonist-rules = Вам разрешено помнить знания об игре в целом, например, как готовить, как использовать предметы и т. д. Вам [color=red]НЕ[/color] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа. ghost-role-information-rules-team-antagonist = - Вы являетесь [color=red][bold]Членом команды антагоностов[/bold][/color]. Ваши намерения ясны и наносят вред станции и ее экипажу. + Вы являетесь [color=red][bold]Членом команды антагонистов[/bold][/color]. Ваши намерения ясны и наносят вред станции и ее экипажу. Вы должны [bold]работать со своей командой[/bold] или следовать разумным указаниям руководителей вашей команды. Вам разрешается помнить знания об игре в целом, такие как приготовление пищи, использование предметов и т.д. Вам [color=red]НЕ[/color] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа. diff --git a/Resources/Maps/Shuttles/infiltrator.yml b/Resources/Maps/Shuttles/infiltrator.yml index b9834aa6988..6d9d2acea6d 100644 --- a/Resources/Maps/Shuttles/infiltrator.yml +++ b/Resources/Maps/Shuttles/infiltrator.yml @@ -241,6 +241,7 @@ entities: - 0 - 0 chunkSize: 4 + - type: NukeOpsShuttle # ADT-drone-console-tweak - type: DecalGrid chunkCollection: version: 2 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/handheldshuttleconsole.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/handheldshuttleconsole.yml new file mode 100644 index 00000000000..f80d202c553 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/handheldshuttleconsole.yml @@ -0,0 +1,127 @@ +- type: entity + parent: [BaseItem, BaseHandheldComputer] + id: ADTHandheldShuttleConsoleDefault + name: default handheld shuttle console + description: A gadget which can control the shuttle remotely. + abstract: true + components: + - type: Sprite + sprite: ADT/Objects/Specific/handheldshuttleconsole.rsi + state: default + - type: Item + storedRotation: -90 + - type: ShuttleConsole + isHandheldConsole: true + - type: ActivatableUI + key: enum.ShuttleConsoleUiKey.Key + - type: UserInterface + interfaces: + enum.ShuttleConsoleUiKey.Key: + type: ShuttleConsoleBoundUserInterface + enum.WiresUiKey.Key: + type: WiresBoundUserInterface + - type: RadarConsole + - type: WorldLoader + radius: 500 + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#43ccb5" + - type: ContainerContainer + containers: + board: !type:Container {} + disk_slot: !type:ContainerSlot {} + cell_slot: !type:ContainerSlot {} + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + autoConnect: true + - type: WirelessNetworkConnection + range: 1000 + - type: StaticPrice + price: 500 + - type: Tag + tags: + - HighRiskItem + - type: EmitSoundOnUIOpen + sound: + collection: Keyboard + params: + volume: -1 + variation: 0.10 + pitch: 1.10 # low pitch keyboard sounds feel kinda weird + blacklist: + tags: + - NoConsoleSound + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellSmall + - type: Appearance + +- type: entity + parent: ADTHandheldShuttleConsoleDefault + id: ADTHandheldShuttleConsoleSyndicate + name: handheld syndicate shuttle console + description: Used to pilot a syndicate shuttle. + components: + - type: Sprite + sprite: ADT/Objects/Specific/handheldshuttleconsole.rsi + state: syndicate + - type: Tag + tags: + - Syndicate + - type: RadarConsole + maxRange: 1000 + - type: WorldLoader + radius: 1536 + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#c94242" + - type: DroneConsole + components: + - type: NukeOpsShuttle + +- type: entity + parent: ADTHandheldShuttleConsoleDefault + id: ADTHandheldShuttleConsoleSalvage + name: handheld salvage shuttle console + description: Used to pilot a salvage shuttle. + components: + - type: Sprite + sprite: ADT/Objects/Specific/handheldshuttleconsole.rsi + state: salvage + - type: RadarConsole + maxRange: 1000 + - type: WorldLoader + radius: 1536 + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#43ccb5" + - type: DroneConsole + components: + - type: SalvageShuttle + +- type: entity + parent: ADTHandheldShuttleConsoleDefault + id: ADTHandheldShuttleConsoleSecurity + name: handheld security shuttle console + description: Used to pilot a security shuttle. + components: + - type: Sprite + sprite: ADT/Objects/Specific/handheldshuttleconsole.rsi + state: security + - type: RadarConsole + maxRange: 1000 + - type: WorldLoader + radius: 1536 + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#43ccb5" + - type: DroneConsole + components: + - type: SecShuttle diff --git a/Resources/Prototypes/ADT/Entities/Structures/Lighting/base_shuttle_lighting.yml b/Resources/Prototypes/ADT/Entities/Structures/Lighting/base_shuttle_lighting.yml new file mode 100644 index 00000000000..b26c12dde51 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Lighting/base_shuttle_lighting.yml @@ -0,0 +1,409 @@ +#==Suffix Guide== + +#Always Powered - light doesn't need power to give off life +#Empty - on map init, light spawns without bulb +#Blue/Sodium/etc. - the color of the light + + +# ALWAYS POWERED (BASE) + + +- type: entity + id: ADTAlwaysPoweredShuttleLight + name: shuttle light + description: "An always powered shuttle light." + suffix: "Always powered" + components: + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmash + - type: Transform + anchored: true + - type: Clickable + - type: InteractionOutline + - type: Construction + graph: LightFixture + node: tubeLight + - type: Sprite + sprite: ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi + drawdepth: WallMountedItems + layers: + - map: ["enum.PoweredLightLayers.Base"] + state: base + - map: ["enum.PoweredLightLayers.Glow"] + state: glow + shader: unshaded + state: base + - type: PointLight + color: "#FAFFFF" # 5000K color temp + mask: /Textures/Effects/LightMasks/cone.png + # rotation: 45 + autoRot: true + energy: 4 + radius: 9 + softness: 2.1 + offset: "0, -0.9" + - type: HandheldLight + addPrefix: false + - type: Appearance + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: RCDDeconstructable + cost: 4 + delay: 2 + fx: EffectRCDDeconstruct2 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: #excess damage, don't spawn entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 2 + max: 2 + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + placement: + mode: SnapgridCenter + snap: + - Wallmount + + +# EMPTY + + +- type: entity + name: shuttle light + description: "A light fixture. Draws power and produces light when equipped with a light tube." + id: ADTPoweredShuttleLightEmpty + suffix: Empty + parent: ADTAlwaysPoweredShuttleLight + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi + state: empty + - type: PointLight + enabled: false + - type: PoweredLight + bulb: Tube + - type: ContainerContainer + containers: + light_bulb: !type:ContainerSlot + - type: ApcPowerReceiver + - type: ExtensionCableReceiver + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: SmartLight + - type: WirelessNetworkConnection + range: 200 + - type: DeviceLinkSink + ports: + - On + - Off + - Toggle + - type: Appearance + - type: PoweredLightVisuals + blinkingSound: + path: "/Audio/Machines/light_tube_on.ogg" + spriteStateMap: + empty: empty + off: base + on: base + broken: broken + burned: burned + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + + +# BASIC POWERED + + +- type: entity + id: ADTPoweredShuttleLight + description: "A light fixture. Draws power and produces light when equipped with a light tube." + suffix: "" + parent: ADTPoweredShuttleLightEmpty + components: + - type: Sprite + state: base + - type: PointLight + enabled: true + - type: PoweredLight + hasLampOnSpawn: LightTube + - type: AmbientOnPowered + - type: AmbientSound + volume: -15 + range: 2 + sound: + path: /Audio/Ambience/Objects/light_hum.ogg + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + + +# LED + + +- type: entity + parent: ADTAlwaysPoweredShuttleLight + id: ADTAlwaysPoweredShuttleLightLED + suffix: Always Powered, LED + components: + - type: PointLight + radius: 15 + energy: 4.5 + softness: 0.9 + color: "#EEEEFF" + +- type: entity + id: ADTPoweredShuttleLightLED + description: "A light fixture. Draws power and produces light when equipped with a light tube." + suffix: LED + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LedLightTube + - type: PointLight + radius: 12 + energy: 6 + softness: 0.9 + color: "#EEEEFF" + - type: DamageOnInteract + damage: + types: + Heat: 1 # LEDs don't get as hot + popupText: powered-light-component-burn-hand + + +# SODIUM (НАТРИЕВЫЕ) + + +- type: entity + parent: ADTAlwaysPoweredShuttleLight + id: ADTAlwaysPoweredShuttleLightSodium + suffix: Always Powered, Sodium + components: + - type: PointLight + radius: 13 + energy: 6.5 + softness: 0.5 + color: "#FFAF38" + +- type: entity + id: ADTPoweredShuttleLightSodium + description: "A light fixture. Draws power and produces light when equipped with a light tube." + suffix: Sodium + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: SodiumLightTube + - type: PointLight + radius: 12 + energy: 4.5 + softness: 0.9 + color: "#FFAF38" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + + +# COLORED + + +- type: entity + id: ADTPoweredShuttleLightCyan + suffix: Cyan + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalCyan + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#47f8ff" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: ADTAlwaysPoweredShuttleLightCyan + suffix: Always Powered, Cyan + parent: ADTAlwaysPoweredShuttleLight + components: + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#47f8ff" + +- type: entity + id: ADTPoweredShuttleLightBlue + suffix: Blue + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalBlue + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#39a1ff" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: ADTAlwaysPoweredShuttleLightBlue + suffix: Always Powered, Blue + parent: ADTAlwaysPoweredShuttleLight + components: + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#39a1ff" + +- type: entity + id: ADTPoweredShuttleLightPink + suffix: Pink + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalPink + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#ff66cc" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: ADTAlwaysPoweredShuttleLightPink + suffix: Always Powered, Pink + parent: ADTAlwaysPoweredShuttleLight + components: + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#ff66cc" + +- type: entity + id: ADTPoweredShuttleLightOrange + suffix: Orange + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalOrange + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#ff8227" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: ADTAlwaysPoweredShuttleLightOrange + suffix: Always Powered, Orange + parent: ADTAlwaysPoweredShuttleLight + components: + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#ff8227" + +- type: entity + id: ADTPoweredShuttleLightRed + suffix: Red + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalRed + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#fb4747" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: ADTAlwaysPoweredShuttleLightRed + suffix: Always Powered, Red + parent: ADTAlwaysPoweredShuttleLight + components: + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#fb4747" + +- type: entity + id: ADTPoweredShuttleLightGreen + suffix: Green + parent: ADTPoweredShuttleLight + components: + - type: PoweredLight + hasLampOnSpawn: LightTubeCrystalGreen + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#52ff39" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand + +- type: entity + id: ADTAlwaysPoweredShuttleLightGreen + suffix: Always Powered, Green + parent: ADTAlwaysPoweredShuttleLight + components: + - type: PointLight + radius: 10 + energy: 4.5 + softness: 0.5 + color: "#52ff39" diff --git a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/senior_officer.yml b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/senior_officer.yml index 0dec6c21937..8c847640033 100644 --- a/Resources/Prototypes/ADT/Loadouts/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/ADT/Loadouts/Jobs/Security/senior_officer.yml @@ -1,4 +1,17 @@ -# Рюкзаки начало +# Jumpsuit + +- type: loadout + id: SeniorOfficerJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitSeniorOfficer + +- type: loadout + id: SeniorOfficerJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtSeniorOfficer + +# Back + - type: loadout id: ADTSeniorOfficerBackpack equipment: @@ -13,11 +26,17 @@ id: ADTSeniorOfficerDuffel equipment: back: ADTClothingBackpackDuffelSeniorSecurityFilled -# Рюкзаки конец -# Пуленепробиваемый бронежилет начало +# outerClothing + - type: loadout id: ADTSeniorOfficerArmor equipment: outerClothing: ClothingOuterArmorBulletproof -# Пуленепробиваемый конец + +# ID + +- type: loadout + id: SeniorOfficerPDA + equipment: + id: SeniorOfficerPDA diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 396902869cf..f4d6489121d 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -4,6 +4,7 @@ id: MagistratJumpsuit name: loadout-group-lawyer-jumpsuit minLimit: 1 + maxLimit: 1 loadouts: - MagistratJumpsuit - LawyerJumpsuit @@ -37,6 +38,7 @@ id: PathologJumpsuit name: loadout-group-patholog-jumpsuit minLimit: 1 + maxLimit: 1 loadouts: - PathologJumpsuit - PathologJumpskirt @@ -47,6 +49,7 @@ id: PathologBackpack name: loadout-group-patholog-backpack minLimit: 1 + maxLimit: 1 loadouts: - PathologBackpack - PathologSatchel @@ -56,6 +59,7 @@ id: PathologWindbreaker name: loadout-group-patholog-outerclothing minLimit: 0 + maxLimit: 1 loadouts: - PathologWindbreaker - PathologWintercoat @@ -64,6 +68,8 @@ - type: loadoutGroup id: PathologShoes name: loadout-group-patholog-shoes + minLimit: 1 + maxLimit: 1 loadouts: - BlueShoes - MedicalWinterBoots @@ -72,6 +78,7 @@ id: ADTMedicalBelt name: loadout-group-medical-belt-adt minLimit: 1 + maxLimit: 1 loadouts: - ADTMedicalBelt - ADTMedicalBeltBag @@ -82,6 +89,7 @@ id: ADTParamedicBelt name: loadout-group-paramedic-belt-adt minLimit: 1 + maxLimit: 1 loadouts: - ADTParamedicBeltEMT - ADTParamedicBeltEMTBag @@ -90,17 +98,51 @@ id: ADTParamedicBackpack name: loadout-group-paramedic-backpack-adt minLimit: 1 + maxLimit: 1 loadouts: - ADTParamedicBackpack - ADTParamedicSatchel - ADTParamedicDuffel +# SENIOR OFFICER + +- type: loadoutGroup + id: SeniorOfficerJumpsuit + name: loadout-group-senior-officer-jumpsuit + minLimit: 1 + maxLimit: 1 + loadouts: + - SeniorOfficerJumpsuit + - SeniorOfficerJumpskirt + +- type: loadoutGroup + id: ADTSeniorOfficerBackpack + name: loadout-group-senior-officer-backpack + minLimit: 1 + maxLimit: 1 + loadouts: + - ADTSeniorOfficerBackpack + - ADTSeniorOfficerSatchel + - ADTSeniorOfficerDuffel + +- type: loadoutGroup + id: ADTSeniorOfficerOuterClothing + name: loadout-group-senior-officer-outerclothing + minLimit: 1 + maxLimit: 1 + loadouts: + - ArmorVest + - ArmorVestSlim + - SecurityOfficerWintercoat + - ADTSeniorOfficerArmor + # SENIOR PHYSICIAN - type: loadoutGroup id: SeniorPhysicianHead name: loadout-group-senior-physician-head minLimit: 0 + maxLimit: 1 loadouts: - SeniorPhysicianBeret - MedicalHeadMirror @@ -108,6 +150,8 @@ - type: loadoutGroup id: SeniorPhysicianJumpsuit name: loadout-group-senior-physician-jumpsuit + minLimit: 1 + maxLimit: 1 loadouts: - SeniorPhysicianJumpsuit - SeniorPhysicianJumpskirt @@ -124,7 +168,7 @@ - type: loadoutGroup id: RoboticistHead name: loadout-group-roboticist-head - minLimit: 1 + minLimit: 0 loadouts: - RoboticistCap @@ -158,12 +202,15 @@ - type: loadoutGroup id: SeniorEngineerHead name: loadout-group-senior-engineer-head + minLimit: 0 loadouts: - SeniorEngineerBeret - type: loadoutGroup id: ADTSeniorEngineerJumpsuit name: loadout-group-senior-engineer-jumpsuit + minLimit: 1 + maxLimit: 1 loadouts: - SeniorEngineerJumpsuit - SeniorEngineerJumpskirt @@ -180,6 +227,8 @@ - type: loadoutGroup id: ADTSeniorResearcherJumpsuit name: loadout-group-senior-researcher-jumpsuit + minLimit: 1 + maxLimit: 1 loadouts: - SeniorResearcherJumpsuit - SeniorResearcherJumpskirt @@ -265,23 +314,6 @@ - ADTSecurityOfficerNeckBadgeSilver - ADTSecurityOfficerNeckBadgeGold -- type: loadoutGroup - id: ADTSeniorSecurityBackpack - name: loadout-group-security-backpack - loadouts: - - ADTSeniorOfficerBackpack - - ADTSeniorOfficerSatchel - - ADTSeniorOfficerDuffel - -- type: loadoutGroup - id: ADTSeniorSecurityOuterClothing - name: loadout-group-security-outerclothing - loadouts: - - ArmorVest - - ArmorVestSlim - - SecurityOfficerWintercoat - - ADTSeniorOfficerArmor - # CADET - type: loadoutGroup diff --git a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml index d6c06a47fc5..8ee1f81df5e 100644 --- a/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/ADT/Loadouts/role_loadouts.yml @@ -146,10 +146,10 @@ - GroupTankHarness - SecurityHead - SecurityOfficerNeckADT # ADT-Loadouts - - SecurityJumpsuit - - ADTSeniorSecurityOuterClothing + - SeniorOfficerJumpsuit # ADT-Tweak-senior + - ADTSeniorOfficerOuterClothing # ADT-Tweak-senior - SecurityBelt - - ADTSeniorSecurityBackpack + - ADTSeniorOfficerBackpack # ADT-Tweak-senior - SecurityShoes - SurvivalSecurity - Trinkets @@ -194,7 +194,7 @@ - ADTGuardOfficerHead - SecurityOfficerNeckADT # ADT-Loadouts - ADTGuardOfficerJumpsuit - - ADTSeniorSecurityOuterClothing + - ADTSeniorOfficerOuterClothing - SecurityBelt - SecurityBackpack - SecurityShoes diff --git a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml index 979105a325c..9efb1caf617 100644 --- a/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/ADT/Objectives/stealTargetGroups.yml @@ -27,6 +27,20 @@ sprite: ADT/Clothing/Mask/gasCE.rsi state: icon +- type: stealTargetGroup + id: ADTHandheldShuttleConsoleSecurity + name: steal-target-groups-adt-handheld-shuttle-console-security + sprite: + sprite: ADT/Objects/Specific/handheldshuttleconsole.rsi + state: security + +- type: stealTargetGroup + id: ADTHandheldShuttleConsoleSalvage + name: steal-target-groups-adt-handheld-shuttle-console-salvage + sprite: + sprite: ADT/Objects/Specific/handheldshuttleconsole.rsi + state: salvage + # changeling - type: stealTargetGroup diff --git a/Resources/Prototypes/ADT/Objectives/traitor.yml b/Resources/Prototypes/ADT/Objectives/traitor.yml index 352b6bae9cf..bb24eddb283 100644 --- a/Resources/Prototypes/ADT/Objectives/traitor.yml +++ b/Resources/Prototypes/ADT/Objectives/traitor.yml @@ -21,3 +21,29 @@ - type: StealCondition stealGroup: ADTWeaponPistolX01 owner: job-name-hos + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseTraitorStealObjective + id: ADTHandheldShuttleConsoleSecurityStealObjective + components: + - type: Objective + difficulty: 3 + - type: NotJobRequirement + job: HeadOfSecurity + - type: StealCondition + stealGroup: ADTHandheldShuttleConsoleSecurity + owner: job-name-hos + +- type: entity + categories: [ HideSpawnMenu ] + parent: BaseTraitorStealObjective + id: ADTHandheldShuttleConsoleSalvageStealObjective + components: + - type: Objective + difficulty: 2 + - type: NotJobRequirement + job: Quartermaster + - type: StealCondition + stealGroup: ADTHandheldShuttleConsoleSalvage + owner: job-name-qm diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 345b589c9b7..d5ffbcdad1f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -14,6 +14,7 @@ prob: 0.50 - id: ClothingHeadsetAltCargo - id: DoorRemoteCargo + - id: ADTHandheldShuttleConsoleSalvage # ADT-handheld-shuttle-console - id: RubberStampApproved - id: RubberStampDenied - id: RubberStampQm @@ -378,6 +379,7 @@ - id: ClothingOuterCoatHoSTrench - id: ClothingShoesBootsJack - id: DoorRemoteSecurity + - id: ADTHandheldShuttleConsoleSecurity # ADT-handheld-shuttle-console - id: HoloprojectorSecurity - id: RubberStampHos - id: SecurityTechFabCircuitboard diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 22060b5c115..8e20f7f8afc 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -80,7 +80,7 @@ parent: MarkerBase components: - type: GhostRole - rules: ghost-role-information-rules-default-team-antagonist + rules: ghost-role-information-rules-team-antagonist # ADT-Fix raffle: settings: default - type: GhostRoleMobSpawner @@ -121,7 +121,7 @@ - type: GhostRole name: roles-antag-nuclear-operative-commander-name description: roles-antag-nuclear-operative-commander-objective - rules: ghost-role-information-rules-default-team-antagonist + rules: ghost-role-information-rules-team-antagonist # ADT-Fix - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -131,7 +131,7 @@ - type: GhostRole name: roles-antag-nuclear-operative-agent-name description: roles-antag-nuclear-operative-agent-objective - rules: ghost-role-information-rules-default-team-antagonist + rules: ghost-role-information-rules-team-antagonist # ADT-Fix - type: entity categories: [ HideSpawnMenu, Spawner ] @@ -141,7 +141,7 @@ - type: GhostRole name: roles-antag-nuclear-operative-name description: roles-antag-nuclear-operative-objective - rules: ghost-role-information-rules-default-team-antagonist + rules: ghost-role-information-rules-team-antagonist # ADT-Fix - type: entity categories: [ HideSpawnMenu, Spawner ] diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index bb4b102ba7a..a71adfc57cf 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -99,7 +99,7 @@ makeSentient: true name: ghost-role-information-xeno-name description: ghost-role-information-xeno-description - rules: ghost-role-information-rules-default-team-antagonist + rules: ghost-role-information-rules-team-antagonist # ADT-Fix raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 40036a66db8..24a9f9116b0 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -1,17 +1,19 @@ -# Senior Time -- type: loadoutEffectGroup - id: SeniorOfficer - effects: - - !type:JobRequirementLoadoutEffect - requirement: - !type:RoleTimeRequirement - role: JobWarden - time: 72000 #20 hrs # Corvax-RoleTime - - !type:JobRequirementLoadoutEffect - requirement: - !type:DepartmentTimeRequirement - department: Security - time: 216000 # 60 hrs +# ADT-Tweak-senior +# # Senior Time +# - type: loadoutEffectGroup +# id: SeniorOfficer +# effects: +# - !type:JobRequirementLoadoutEffect +# requirement: +# !type:RoleTimeRequirement +# role: JobWarden +# time: 72000 #20 hrs # Corvax-RoleTime +# - !type:JobRequirementLoadoutEffect +# requirement: +# !type:DepartmentTimeRequirement +# department: Security +# time: 216000 # 60 hrs +# ADT-Tweak-senior #Security Star - type: loadoutEffectGroup @@ -70,22 +72,6 @@ equipment: jumpsuit: ClothingUniformSecurityTrooper -- type: loadout - id: SeniorOfficerJumpsuit - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - equipment: - jumpsuit: ClothingUniformJumpsuitSeniorOfficer - -- type: loadout - id: SeniorOfficerJumpskirt - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - equipment: - jumpsuit: ClothingUniformJumpskirtSeniorOfficer - # Back - type: loadout id: SecurityBackpack @@ -150,23 +136,6 @@ id: SecurityPDA equipment: id: SecurityPDA -# ADT Start Tweak -# - type: loadout -# id: SeniorOfficerPDA -# effects: -# - !type:GroupLoadoutEffect -# proto: SeniorOfficer -# equipment: -# id: SeniorOfficerPDA -# ADT End Tweak - -- type: loadout - id: SeniorOfficerPDA - effects: - - !type:GroupLoadoutEffect - proto: SeniorOfficer - equipment: - id: SeniorOfficerPDA # Misc - type: loadout diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index ef5003a6eca..f45f9220e31 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -961,6 +961,7 @@ minLimit: 0 loadouts: - ScienceLabCoat + - RegularLabCoat - ScienceWintercoat - type: loadoutGroup @@ -1076,8 +1077,6 @@ - SecurityJumpskirt - SecurityJumpsuitGrey - SecurityJumpskirtGrey - - SeniorOfficerJumpsuit - - SeniorOfficerJumpskirt - TrooperUniform # ADT-Loadouts-Start - ADTSecurityOfficerMogesBrown diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 4c19fc26de0..5ead0ad8c78 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -81,6 +81,14 @@ outerClothing: ClothingOuterHardsuitSyndieCommander inhand: - NukeOpsDeclarationOfWar +# ADT-NukieCommanderGear-tweak-start (если вписать тупо последнее, то остальное не заспавнится) + storage: + back: + - WeaponPistolViper + - PinpointerSyndicateNuclear + - DeathAcidifierImplanter + - ADTHandheldShuttleConsoleSyndicate +# ADT-NukieCommanderGear-tweak-end #Nuclear Operative Medic Gear - type: startingGear diff --git a/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/default.png b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/default.png new file mode 100644 index 00000000000..65b7d076116 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/default.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/meta.json index d566f9f497b..41048a78d14 100644 --- a/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/meta.json @@ -5,10 +5,19 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Made by not_so_big_chungus", + "copyright": "Made by discord: not_so_big_chungus", "states": [ { "name": "salvage" + }, + { + "name": "security" + }, + { + "name": "syndicate" + }, + { + "name": "default" } ] } diff --git a/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/security.png b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/security.png new file mode 100644 index 00000000000..5147f233e28 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/security.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/syndicate.png b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/syndicate.png new file mode 100644 index 00000000000..7d14f1e28ce Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/handheldshuttleconsole.rsi/syndicate.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/base.png b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/base.png new file mode 100644 index 00000000000..04a47ecc430 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/base.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/broken.png b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/broken.png new file mode 100644 index 00000000000..268a7c18206 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/broken.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/burned.png b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/burned.png new file mode 100644 index 00000000000..073bc2f81b5 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/burned.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/empty.png b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/empty.png new file mode 100644 index 00000000000..1882290e902 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/empty.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/glow.png b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/glow.png new file mode 100644 index 00000000000..c42d4c1714f Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/glow.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/meta.json b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/meta.json new file mode 100644 index 00000000000..4ad8e207bce --- /dev/null +++ b/Resources/Textures/ADT/Structures/Wallmounts/Lighting/shuttle_light.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by discord: prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken", + "directions": 4 + }, + { + "name": "burned", + "directions": 4 + }, + { + "name": "base", + "directions": 4 + }, + { + "name": "empty", + "directions": 4 + }, + { + "name": "glow", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png new file mode 100644 index 00000000000..0554e45967d Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png new file mode 100644 index 00000000000..891a96eaf49 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json index 9efc29f5850..11292a30f5a 100644 --- a/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json +++ b/Resources/Textures/Objects/Weapons/Throwable/bola.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6", + "copyright": "Inhand sprites by discord: hixi. Original taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6", "size": { "x": 32, "y": 32 @@ -9,6 +9,14 @@ "states": [ { "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png index cdee551f6fc..9ba95bd6f2a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png and b/Resources/Textures/Structures/Wallmounts/locked_switch.rsi/base.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png index 38303ee1277..d473d272360 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png and b/Resources/Textures/Structures/Wallmounts/switch.rsi/dead.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch.rsi/off.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/off.png index 6538d8d6124..fd68af2563d 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch.rsi/off.png and b/Resources/Textures/Structures/Wallmounts/switch.rsi/off.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch.rsi/on.png b/Resources/Textures/Structures/Wallmounts/switch.rsi/on.png index 634f3385924..eb74ec5ecea 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch.rsi/on.png and b/Resources/Textures/Structures/Wallmounts/switch.rsi/on.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png index 32d2db61320..ca26c9eba5a 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png index 0bb6653770d..9b8bf092f9f 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/caution_security.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png index 5fa40f8bd34..d8c74268e10 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/exit.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png index 9e1c8f4ba1d..fc2db527223 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/grey.png differ diff --git a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png index c8bedd97aee..c294d18f2dc 100644 Binary files a/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png and b/Resources/Textures/Structures/Wallmounts/switch_frame.rsi/janitor.png differ