diff --git a/Resources/Locale/en-US/_DV/research/technologies.ftl b/Resources/Locale/en-US/_DV/research/technologies.ftl index 13f90cf1306..2fd012e8c46 100644 --- a/Resources/Locale/en-US/_DV/research/technologies.ftl +++ b/Resources/Locale/en-US/_DV/research/technologies.ftl @@ -5,6 +5,7 @@ research-technology-aerial-extraction = Aerial Extraction research-technology-matter-energy-conversion = Matter-Energy Conversion research-technology-atmos-eva = EVA Atmospherics Suits research-technology-engineering-eva = EVA PPE Suits +research-technology-advanced-construction = Advanced Construction # Experimental research-technology-cloning = Cloning diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml index 3c8f40273e8..3e36adc0520 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml @@ -93,7 +93,8 @@ - UpgradeKits - UpgradeKits_Goob - EngineeringHardsuits - - LightingEquipment # DeltaV + - AdvancedConstruction + - LightingEquipment - type: Machine board: EngineeringTechFabCircuitboard - type: StealTarget @@ -134,7 +135,7 @@ - Mining - SalvageWeapons - SalvageHardsuits - - LightingEquipment # DeltaV + - LightingEquipment - type: Machine board: LogisticsTechFabCircuitboard - type: StealTarget diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml index 35141935f66..82fa6043824 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml @@ -5,6 +5,7 @@ recipes: - HolotapeProjector - SheetPlasteel1Engineering + - ConstructionBag - NaniteApplicator - AccessConfigurator @@ -41,3 +42,8 @@ - ClothingOuterSuitAtmosFire - ClothingHeadHelmetAtmosFire - ClothingOuterVoidsuitEngineering + +- type: latheRecipePack + id: AdvancedConstruction + recipes: + - ConstructionBagOfHolding diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml index 48ff2a41b61..09a8aa1b97c 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/devices.yml @@ -47,3 +47,13 @@ Steel: 500 Glass: 400 Uranium: 100 + +- type: latheRecipe + id: ConstructionBagOfHolding + result: ConstructionBagOfHolding + completetime: 5 + materials: + Steel: 1000 + Silver: 750 + Plasma: 500 + Bluespace: 100 diff --git a/Resources/Prototypes/_DV/Research/industrial.yml b/Resources/Prototypes/_DV/Research/industrial.yml index a093141b447..80b0f12c95b 100644 --- a/Resources/Prototypes/_DV/Research/industrial.yml +++ b/Resources/Prototypes/_DV/Research/industrial.yml @@ -28,6 +28,18 @@ - ClothingOuterHardsuitEngineering - ClothingOuterVoidsuitEngineering +- type: technology + id: AdvancedConstruction + name: research-technology-advanced-construction + icon: + sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi + state: icon + discipline: Industrial + tier: 2 + cost: 7500 + recipeUnlocks: + - ConstructionBagOfHolding + # Tier 3 - type: technology diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml new file mode 100644 index 00000000000..5b5cad7908f --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml @@ -0,0 +1,94 @@ +- type: entity + parent: BaseStorageItem + id: ConstructionBag + name: construction bag + description: A robust bag for construction specialists and engineers alike to carry large amounts of construction materials. Magnetises any nearby construction materials when attached to a belt. + components: +# - type: MagnetPickup # DeltaV - Gives you a reason to get the bluespace version. + - type: Sprite + sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi + state: icon + - type: Clothing + sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi + quickEquip: false + slots: + - belt + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Normal + grid: + - 0,0,9,3 + quickInsert: true + areaInsert: true + whitelist: + tags: + - Ingot +# - RodMetal1 # DeltaV - Not a tag. + - Sheet + # Begin DeltaV Changes + # - CableCoil - Cable module is already a default. + - ConstructionMaterial + # components: + # - ConstructionMaterials # Was not ported due to tag. + #blacklist: + # tags: + # - PrizeTicket + # End DeltaV Changes + - type: Dumpable + - type: StaticPrice + price: 55.5 + +- type: entity + parent: ConstructionBag + id: ConstructionBagOfHolding + name: construction bag of holding + description: A robust bag of holding for rich construction specialists and engineers alike to carry large amounts of construction materials. Magnetises any nearby construction materials when attached to a belt. + components: + - type: MagnetPickup + range: 2 + - type: Sprite + sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi + layers: + - state: icon + - state: icon-bluespace-overlay + - state: icon-bluespace-overlay-unshaded + shader: unshaded + - type: Item + size: Ginormous + inhandVisuals: + left: + - state: inhand-left + - state: inhand-left-bluespace-overlay + - state: inhand-left-bluespace-overlay-unshaded + shader: unshaded + right: + - state: inhand-right + - state: inhand-right-bluespace-overlay + - state: inhand-right-bluespace-overlay-unshaded + shader: unshaded + - type: Clothing + sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi + quickEquip: false + slots: + - belt + clothingVisuals: + belt: + - state: equipped-BELT + - state: equipped-BELT-bluespace-overlay + - state: equipped-BELT-bluespace-overlay-unshaded + shader: unshaded + - type: Storage + grid: + - 0,0,19,9 + # Begin DeltaV Additions - On/Off Toggle + - type: ItemToggle + soundActivate: &soundActivate + collection: sparks + params: + variation: 0.25 + soundDeactivate: *soundActivate + - type: ItemToggleExamine + on: magnet-pickup-component-magnet-on + off: magnet-pickup-component-magnet-off + # End DeltaV Additions - On/Off Toggle diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml index 22e1f9605f7..3f2cfd5d6fd 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml @@ -12,4 +12,13 @@ completetime: 1 materials: Glass: 100 - Plastic: 100 \ No newline at end of file + Plastic: 100 + +- type: latheRecipe + id: ConstructionBag + result: ConstructionBag + completetime: 1 +# category: Tools + materials: + Steel: 500 + Cloth: 500 diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png new file mode 100644 index 00000000000..274a620764d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png new file mode 100644 index 00000000000..bac8518f8df Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png new file mode 100644 index 00000000000..ae3c124a8a9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png new file mode 100644 index 00000000000..851d5bcf738 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png new file mode 100644 index 00000000000..b290761994c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png new file mode 100644 index 00000000000..e2d31f7d082 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png new file mode 100644 index 00000000000..7390fb51e03 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png new file mode 100644 index 00000000000..0f6c8d587a8 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png new file mode 100644 index 00000000000..df52a31b25c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png new file mode 100644 index 00000000000..6ea24d325f5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png new file mode 100644 index 00000000000..e25118fd992 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png new file mode 100644 index 00000000000..45becea22e5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json new file mode 100644 index 00000000000..736438b2b27 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/meta.json @@ -0,0 +1,106 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Original ore bag sprites homegrown by @ninruB#7795, inhand sprites by лазік#7305; resprited in engineering department colors by erhardsteinhauer (discord/github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon-bluespace-overlay", + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "icon-bluespace-overlay-unshaded", + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "equipped-BELT-bluespace-overlay", + "directions": 4, + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "equipped-BELT-bluespace-overlay-unshaded", + "directions": 4, + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "inhand-left-bluespace-overlay", + "directions": 4, + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "inhand-left-bluespace-overlay-unshaded", + "directions": 4, + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "inhand-right-bluespace-overlay", + "directions": 4, + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + }, + { + "name": "inhand-right-bluespace-overlay-unshaded", + "directions": 4, + "delays": + [ + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] + ] + } + ] +}