diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index c9e3ea2302b..3846df50814 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -593,6 +593,7 @@ - SalvageExpeditionsComputerCircuitboard - ComputerMassMediaCircuitboard - AlertsComputerCircuitboard + - AdvancedMicrowaveMachineCircuitBoard # End DeltaV additions - type: EmagLatheRecipes emagDynamicRecipes: diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index bb65b890c42..3ca9ecbf42a 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -97,6 +97,7 @@ - FatExtractorMachineCircuitboard - BiofabricatorMachineCircuitboard - BiomassReclaimerMachineCircuitboard + - AdvancedMicrowaveMachineCircuitBoard # DeltaV # Tier 2 diff --git a/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml new file mode 100644 index 00000000000..65b6c6f7d10 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Devices/CircuitBoards/Machine/production.yml @@ -0,0 +1,11 @@ +- type: entity + parent: MicrowaveMachineCircuitboard + id: AdvancedMicrowaveMachineCircuitBoard + name: advanced microwave machine board + components: + - type: MachineBoard + prototype: AdvancedMicrowave + stackRequirements: + Capacitor: 2 + Glass: 4 + Cable: 5 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml new file mode 100644 index 00000000000..c6c638fc0bb --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/advanced_microwave.yml @@ -0,0 +1,21 @@ +- type: entity + id: AdvancedMicrowave + parent: KitchenMicrowave + name: Advanced Microwave + description: Don't stand too close to this thing, definitely dont put anything metal in. + components: + - type: Microwave + cookTimeMultiplier: 0.25 # director requested due to addition of rads + capacity: 30 + canMicrowaveIdsSafely: false # No AA farm + - type: Sprite + sprite: _DV/Structures/Machines/advanced_microwave.rsi + - type: Machine + board: AdvancedMicrowaveMachineCircuitBoard + - type: Explosive + explosionType: Radioactive + maxIntensity: 60 + totalIntensity: 50 + intensitySlope: 10 + canCreateVacuum: false + deleteAfterExplosion: false diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml index f303be29f16..23cdd7e4f81 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/electronics.yml @@ -12,3 +12,8 @@ parent: BaseCircuitboardRecipe id: AlertsComputerCircuitboard result: AlertsComputerCircuitboard + +- type: latheRecipe + parent: BaseGoldCircuitboardRecipe + id: AdvancedMicrowaveMachineCircuitBoard + result: AdvancedMicrowaveMachineCircuitBoard diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json new file mode 100644 index 00000000000..31681f88444 --- /dev/null +++ b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from /tg/station at commit 9065b811726ae52be5d1889f436c01a24efbf47a, edited by github user @Flareguy for Space Station 14, edited by github user Stop-Signs for DeltaV", + "states": [ + { + "name": "mw" + }, + { + "name": "mw_unlit" + }, + { + "name": "mw0" + }, + { + "name": "mw_running_unlit" + }, + { + "name": "mwb" + }, + { + "name": "mwbloody" + }, + { + "name": "mwbloody0" + }, + { + "name": "mwbloody1" + }, + { + "name": "mwbloodyo" + }, + { + "name": "mwo" + } + ] + } diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw.png new file mode 100644 index 00000000000..3c677eb0311 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw0.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw0.png new file mode 100644 index 00000000000..345e6c430c3 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw0.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_running_unlit.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_running_unlit.png new file mode 100644 index 00000000000..8b6fa76e0a1 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_running_unlit.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_unlit.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_unlit.png new file mode 100644 index 00000000000..11e691d0317 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mw_unlit.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwb.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwb.png new file mode 100644 index 00000000000..221a7a5df3d Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwb.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody.png new file mode 100644 index 00000000000..8e5661e6e28 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody0.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody0.png new file mode 100644 index 00000000000..a51302a2537 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody0.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody1.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody1.png new file mode 100644 index 00000000000..8cfdf34281a Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloody1.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloodyo.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloodyo.png new file mode 100644 index 00000000000..c2af885979f Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwbloodyo.png differ diff --git a/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwo.png b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwo.png new file mode 100644 index 00000000000..33bd1517360 Binary files /dev/null and b/Resources/Textures/_DV/Structures/Machines/advanced_microwave.rsi/mwo.png differ