diff --git a/Content.Client/SS220/SupaKitchen/UI/CookingMachineWindow.xaml b/Content.Client/SS220/SupaKitchen/UI/CookingMachineWindow.xaml index 78caa97a0e7a..18c666c80696 100644 --- a/Content.Client/SS220/SupaKitchen/UI/CookingMachineWindow.xaml +++ b/Content.Client/SS220/SupaKitchen/UI/CookingMachineWindow.xaml @@ -1,4 +1,4 @@ - + (OnHandUnequipped); SubscribeLocalEvent(OnUIClose); SubscribeLocalEvent>(GetActivationVerb); + SubscribeLocalEvent>(GetAlternativeVerb); // SS220 Alternative-open-verb SubscribeLocalEvent>(GetVerb); SubscribeLocalEvent(OnActionPerform); @@ -87,7 +88,7 @@ private void GetActivationVerb(EntityUid uid, ActivatableUIComponent component, return; // SS220 Alternative-open-verb - if (component.AltentativeOnly) + if (component.AltentativeVerbOnly) return; args.Verbs.Add(new ActivationVerb @@ -105,7 +106,7 @@ private void GetVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEv return; // SS220 Alternative-open-verb - if (component.AltentativeOnly) + if (component.AltentativeVerbOnly) return; args.Verbs.Add(new Verb @@ -120,10 +121,10 @@ private void GetVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEv // SS220 Alternative-open-verb begin private void GetAlternativeVerb(EntityUid uid, ActivatableUIComponent component, GetVerbsEvent args) { - if (!component.VerbOnly || !ShouldAddVerb(uid, component, args)) + if (component.VerbOnly || !ShouldAddVerb(uid, component, args)) return; - if (!component.AltentativeOnly) + if (!component.AltentativeVerbOnly) return; args.Verbs.Add(new AlternativeVerb @@ -181,7 +182,8 @@ private void OnActivate(EntityUid uid, ActivatableUIComponent component, Activat if (args.Handled || !args.Complex) return; - if (component.VerbOnly) + if (component.VerbOnly || + component.AltentativeVerbOnly) // SS220 Alternative-open-verb return; if (component.RequiredItems != null) @@ -195,7 +197,8 @@ private void OnInteractUsing(EntityUid uid, ActivatableUIComponent component, In if (args.Handled) return; - if (component.VerbOnly) + if (component.VerbOnly || + component.AltentativeVerbOnly) // SS220 Alternative-open-verb return; if (component.RequiredItems == null) diff --git a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml index 752f6243d388..aa409839c080 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/microwave.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/microwave.yml @@ -156,3 +156,113 @@ # - RecipeBaguetteSword # - RecipeThrowingCroissant #SS220 remove default microwave end + +- type: entity + id: KitchenMicrowaveOld + parent: [ BaseMachinePowered, SmallConstructibleMachine ] + name: microwave + description: It's magic. + components: + - type: Microwave #SS220 remove default microwave + capacity: 10 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.MicrowaveVisualState.Bloody: + bloody: + True: { visible: true } + False: { visible: false } + bloodyunshaded: + True: { visible: true } + False: { visible: false } + enum.PowerDeviceVisuals.VisualState: + enum.CookingMachineVisualizerLayers.Base: + Idle: { state: "mw" } + Broken: { state: "mwb" } + Cooking: { state: "mw" } + enum.CookingMachineVisualizerLayers.BaseUnlit: + Idle: { state: "mw_unlit" } + Broken: { state: "mw_unlit" } + Cooking: { state: "mw_running_unlit" } + bloodyunshaded: + Idle: { visible: false } + Broken: { visible: false } + enum.PowerDeviceVisuals.Powered: + enum.CookingMachineVisualizerLayers.BaseUnlit: + True: { visible: true } + False: { visible: false } + - type: ActivatableUI + key: enum.MicrowaveUiKey.Key + - type: DeviceLinkSink + ports: + - On + - type: DeviceNetwork + deviceNetId: Wireless + receiveFrequencyId: BasicDevice + - type: WirelessNetworkConnection + range: 200 + - type: UserInterface + interfaces: + enum.MicrowaveUiKey.Key: + type: MicrowaveBoundUserInterface + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.16,0.3,0.16" + density: 190 + mask: + - TabletopMachineMask + layer: + - TabletopMachineLayer + - type: Sprite + sprite: Structures/Machines/microwave.rsi + drawdepth: SmallObjects + snapCardinals: true + layers: + - state: mw0 + map: ["enum.CookingMachineVisualizerLayers.Base"] + - state: mw_unlit + shader: unshaded + map: ["enum.CookingMachineVisualizerLayers.BaseUnlit"] + - state: mwbloody0 + map: ["bloody"] + visible: false + - state: mwbloody1 + shader: unshaded + map: ["bloodyunshaded"] + visible: false + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Breakage"] + - type: Explosive + explosionType: Default + maxIntensity: 10 + totalIntensity: 5 + intensitySlope: 5 + canCreateVacuum: false + deleteAfterExplosion: false + - type: ApcPowerReceiver + powerLoad: 400 + - type: Machine + board: MicrowaveMachineCircuitboard + - type: ContainerContainer + containers: + # microwave_entity_container: !type:Container + cooking_machine_entity_container: !type:Container #SS220 supa kitchen + machine_board: !type:Container + machine_parts: !type:Container + - type: EmptyOnMachineDeconstruct + containers: + - microwave_entity_container + - type: GuideHelp + guides: + - Chef + - FoodRecipes diff --git a/Resources/Prototypes/SS220/SupaKitchen/Machines/grill.yml b/Resources/Prototypes/SS220/SupaKitchen/Machines/grill.yml index 7cc455566f87..ce233da12afe 100644 --- a/Resources/Prototypes/SS220/SupaKitchen/Machines/grill.yml +++ b/Resources/Prototypes/SS220/SupaKitchen/Machines/grill.yml @@ -31,12 +31,12 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.3,-0.16,0.3,0.16" + bounds: "-0.4,-0.4,0.4,0.4" density: 190 mask: - - TabletopMachineMask + - MachineMask layer: - - TabletopMachineLayer + - MachineLayer - type: Sprite sprite: SS220/Structures/Machines/grill.rsi snapCardinals: true diff --git a/Resources/Prototypes/SS220/SupaKitchen/Machines/oven.yml b/Resources/Prototypes/SS220/SupaKitchen/Machines/oven.yml index 3e1029c55797..ead934ec0394 100644 --- a/Resources/Prototypes/SS220/SupaKitchen/Machines/oven.yml +++ b/Resources/Prototypes/SS220/SupaKitchen/Machines/oven.yml @@ -6,7 +6,6 @@ components: - type: Transform noRot: true - # Make it behave like a closet - type: EntityStorage - type: EntityStorageVisuals @@ -16,7 +15,6 @@ - type: PlaceableSurface placeCentered: true isPlaceable: false - - type: CookingInstrument instrumentType: oven - type: CookingMachine @@ -26,7 +24,7 @@ useEntityStorage: true - type: ActivatableUI key: enum.CookingMachineUiKey.Key - altentativeOnly: true + altentativeVerbOnly: true - type: UserInterface interfaces: enum.CookingMachineUiKey.Key: @@ -57,12 +55,12 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.3,-0.16,0.3,0.16" + bounds: "-0.4,-0.4,0.4,0.4" density: 190 mask: - - TabletopMachineMask + - MachineMask layer: - - TabletopMachineLayer + - MachineLayer - type: Sprite sprite: SS220/Structures/Machines/oven.rsi offset: 0,-0.5 @@ -75,6 +73,7 @@ - state: oven_off map: ["oven_toggle"] - state: oven_on_unshaded + visible: false map: ["oven_toggle_unshaded"] shader: unshaded - type: Destructible