mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-01-28 01:42:50 +00:00
Merge pull request #12685 from FartMaster69420/exosuit-fix
What's that material??? & Techdisk Bluescreen fix
This commit is contained in:
@@ -11,7 +11,7 @@ const MATERIAL_KEYS = {
|
||||
"steel": "sheet-metal_3",
|
||||
"glass": "sheet-glass_3",
|
||||
"silver": "sheet-silver_3",
|
||||
"graphite": "sheet-silver_3",
|
||||
"graphite": "sheet-puck_3",
|
||||
"plasteel": "sheet-plasteel_3",
|
||||
"durasteel": "sheet-durasteel_3",
|
||||
"verdantium": "sheet-wavy_3",
|
||||
@@ -25,6 +25,7 @@ const MATERIAL_KEYS = {
|
||||
"uranium": "sheet-uranium_3",
|
||||
"titanium": "sheet-titanium_3",
|
||||
"lead": "sheet-adamantine_3",
|
||||
"platinum": "sheet-adamantine_3",
|
||||
"plastic": "sheet-plastic_3",
|
||||
};
|
||||
|
||||
@@ -382,17 +383,15 @@ const MaterialAmount = (props, context) => {
|
||||
direction="column"
|
||||
align="center">
|
||||
<Flex.Item>
|
||||
<Box
|
||||
className={classes([
|
||||
'sheetmaterials32x32',
|
||||
MATERIAL_KEYS[name],
|
||||
])}
|
||||
position="relative"
|
||||
style={style}>
|
||||
<Tooltip
|
||||
position="bottom"
|
||||
content={toTitleCase(name)} />
|
||||
</Box>
|
||||
<Tooltip position="bottom" content={toTitleCase(name)}>
|
||||
<Box
|
||||
className={classes([
|
||||
'sheetmaterials32x32',
|
||||
MATERIAL_KEYS[name],
|
||||
])}
|
||||
position="relative"
|
||||
style={style} />
|
||||
</Tooltip>
|
||||
</Flex.Item>
|
||||
<Flex.Item>
|
||||
<Box
|
||||
|
||||
@@ -118,7 +118,7 @@ const TechDisk = (props, context) => {
|
||||
|
||||
const {
|
||||
tech,
|
||||
} = data.info;
|
||||
} = data;
|
||||
|
||||
const {
|
||||
disk,
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1239,7 +1239,6 @@
|
||||
#include "code\game\objects\items\stacks\nanopaste_vr.dm"
|
||||
#include "code\game\objects\items\stacks\sandbags.dm"
|
||||
#include "code\game\objects\items\stacks\stack.dm"
|
||||
#include "code\game\objects\items\stacks\stack_vr.dm"
|
||||
#include "code\game\objects\items\stacks\telecrystal.dm"
|
||||
#include "code\game\objects\items\stacks\tickets.dm"
|
||||
#include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"
|
||||
|
||||
Reference in New Issue
Block a user