diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Clothing/med_solution_hud.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Clothing/med_solution_hud.yml new file mode 100644 index 00000000000..3e0194699b1 --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Clothing/med_solution_hud.yml @@ -0,0 +1,21 @@ +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudMedSol + suffix: Андромеда + name: медицинский хим визор + description: Окуляр с индикатором на стекле, который сканирует гуманоидов в поле зрения и предоставляет точные данные о состоянии их здоровья. Со встроеным химическим анализатором. + components: + - type: Sprite + sprite: Andromeda/Evrozor/Clothing/medsol.rsi + - type: Clothing + sprite: Andromeda/Evrozor/Clothing/medsol.rsi + - type: SolutionScanner + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + - type: Construction + graph: HudMedSol + node: medsolHud \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Recipes/recipes.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Recipes/recipes.yml new file mode 100644 index 00000000000..709b20f46dd --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/Recipes/recipes.yml @@ -0,0 +1,73 @@ +- type: constructionGraph + id: HudMedSol + start: start + graph: + - node: start + edges: + - to: medsolHud + steps: + - tag: HudMedical + name: medical hud + icon: + sprite: Clothing/Eyes/Hud/med.rsi + state: icon + doAfter: 5 + - tag: HudChemical + name: chemical analysis goggles + icon: + sprite: Clothing/Eyes/Glasses/science.rsi + state: icon + doAfter: 5 + - material: Cable + amount: 5 + doAfter: 5 + - tag: Radio + name: radio + icon: + sprite: Objects/Devices/communication.rsi + state: walkietalkie + doAfter: 5 + - tag: CapacitorStockPart + name: capacitor + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 5 + - tag: CapacitorStockPart + name: capacitor + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 5 + - node: medsolHud + entity: ClothingEyesHudMedSol + +- type: construction + name: медицинский хим визор + id: ClothingEyesHudMedSol + graph: HudMedSol + startNode: start + targetNode: medsolHud + category: construction-category-clothing + description: Два визора, соединенные руками. + icon: { sprite: Andromeda/Evrozor/Clothing/medsol.rsi, state: icon } + objectType: Item + + +- type: latheRecipe + id: ClothingEyesHudMedical + result: ClothingEyesHudMedical + completetime: 2 + materials: + Steel: 150 + Plastic: 200 + Glass: 300 + +- type: latheRecipe + id: RadioHandheld + result: RadioHandheld + completetime: 2 + materials: + Steel: 100 + Plastic: 200 + Glass: 100 \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Evrozor's Prototypes/research.yml b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/research.yml new file mode 100644 index 00000000000..1aecb9e6402 --- /dev/null +++ b/Resources/Prototypes/Andromeda/Evrozor's Prototypes/research.yml @@ -0,0 +1,13 @@ +- type: technology + id: Huds + name: Окулярная технология + icon: + sprite: Clothing/Eyes/Hud/med.rsi + state: icon + discipline: CivilianServices + tier: 1 + cost: 5000 + recipeUnlocks: + - ClothingEyesHudMedical + - ClothingEyesHudSecurity + - ClothingEyesGlassesChemical \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 20a42ed1ce7..611707f28bd 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -217,6 +217,11 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/science.rsi - type: SolutionScanner +#A-13 HudChemical start + - type: Tag + tags: + - HudChemical +#A-13 HudChemical end - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 74c2865d07d..8d175ef149c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -20,6 +20,10 @@ - type: Item sprite: Objects/Devices/communication.rsi heldPrefix: walkietalkie +#A-13 Added price for walkie-talkie start + - type: StaticPrice + price: 40 +#A-13 Added price for walkie-talkie end - type: Tag tags: - Radio diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index cb370cb0374..28ca87a9b7e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -162,6 +162,7 @@ - WeaponCapacitorRechargerCircuitboard - HandheldStationMap - ClothingHeadHatWelding + - RadioHandheld #A-13 MedSolHud craft - type: EmagLatheRecipes emagStaticRecipes: - CartridgePistol @@ -262,7 +263,7 @@ staticRecipes: - LargeBeaker - Dropper - - ClothingEyesGlassesChemical + # - ClothingEyesGlassesChemical A-13 MedSolHud craft dynamicRecipes: - PowerDrill - MiningDrill @@ -325,6 +326,7 @@ - FauxTileAstroSnow - OreBagOfHolding - DeviceQuantumSpinInverter + - ClothingEyesGlassesChemical #A-13 MedSolHud craft - type: EmagLatheRecipes emagDynamicRecipes: - ExplosivePayload @@ -654,7 +656,7 @@ idleState: icon runningState: icon staticRecipes: - - ClothingEyesHudSecurity + # - ClothingEyesHudSecurity A-13 MedSolHud craft - Flash - Handcuffs - Zipties @@ -739,6 +741,7 @@ - ShuttleGunPerforatorCircuitboard - ShuttleGunFriendshipCircuitboard - ShuttleGunDusterCircuitboard + - ClothingEyesHudSecurity #A-13 MedSolHud craft - type: MaterialStorage whitelist: tags: @@ -849,13 +852,15 @@ - Drill - Saw - Hemostat - - ClothingEyesGlassesChemical + # - ClothingEyesGlassesChemical A-13 MedSolHud craft dynamicRecipes: - ChemicalPayload - CryostasisBeaker - BluespaceBeaker - SyringeBluespace - SyringeCryostasis + - ClothingEyesGlassesChemical #A-13 MedSolHud craft + - ClothingEyesHudMedical #A-13 MedSolHud craft - type: Machine board: MedicalTechFabCircuitboard - type: StealTarget diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index a02c7b46190..bd18fff7c53 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1318,3 +1318,8 @@ - type: Tag id: WriteIgnoreStamps + +#A-13 HudChemical craft start +- type: Tag + id: HudChemical +#A-13 HudChemical craft end diff --git a/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/equipped-EYES.png b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/equipped-EYES.png new file mode 100644 index 00000000000..9d763a8ff62 Binary files /dev/null and b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/icon.png b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/icon.png new file mode 100644 index 00000000000..e4a988652fd Binary files /dev/null and b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/icon.png differ diff --git a/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/inhand-left.png b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/inhand-left.png new file mode 100644 index 00000000000..b8ba3af551b Binary files /dev/null and b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/inhand-left.png differ diff --git a/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/inhand-right.png b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/inhand-right.png new file mode 100644 index 00000000000..0b94780ca1e Binary files /dev/null and b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/inhand-right.png differ diff --git a/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/meta.json b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/meta.json new file mode 100644 index 00000000000..82ed5395e10 --- /dev/null +++ b/Resources/Textures/Andromeda/Evrozor/Clothing/medsol.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by s6766, code by Evrozor for Andromeda-13", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}