diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml index 78b368d6d3..2ad28399a6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml @@ -21,3 +21,5 @@ whitelist: tags: - Book + - Document + - type: Dumpable diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 1ac61972ce..a4e2af4d45 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseBorgModule parent: BaseItem name: borg module @@ -369,6 +369,7 @@ - type: ItemBorgModule items: - Pen + - BooksBag - type: entity id: BorgModuleMusique @@ -396,9 +397,23 @@ items: - HydroponicsToolMiniHoe - HydroponicsToolSpade - - HydroponicsToolScythe - HydroponicsToolClippers + - Bucket + +- type: entity + id: BorgModuleHarvesting + parent: [ BaseBorgModuleService, BaseProviderBorgModule ] + name: harvesting cyborg module + components: + - type: Sprite + layers: + - state: service + - state: icon-harvesting + - type: ItemBorgModule + items: + - HydroponicsToolScythe - HydroponicsToolHatchet + - PlantBag - type: entity id: BorgModuleClowning diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 977f98ed0f..c243a897be 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -443,6 +443,7 @@ - BorgModuleArtifact - BorgModuleAnomaly - BorgModuleGardening + - BorgModuleHarvesting - BorgModuleMusique - BorgModuleLiteracy - BorgModuleClowning diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index 90a794a265..6e56988ea5 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -539,6 +539,16 @@ Plastic: 250 Gold: 50 +- type: latheRecipe + id: BorgModuleHarvesting + result: BorgModuleHarvesting + completetime: 3 + materials: + Steel: 500 + Glass: 750 + Plastic: 250 + Gold: 50 + - type: latheRecipe id: BorgModuleClowning result: BorgModuleClowning diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index b46b023b99..b0de5d319b 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -1,4 +1,4 @@ -# Tier 1 +# Tier 1 - type: technology id: JanitorialEquipment @@ -39,6 +39,7 @@ cost: 5000 recipeUnlocks: - BorgModuleGardening + - BorgModuleHarvesting - SeedExtractorMachineCircuitboard - HydroponicsTrayMachineCircuitboard diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-harvesting.png b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-harvesting.png new file mode 100644 index 0000000000..43cbc45f00 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/icon-harvesting.png differ diff --git a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 780803d815..681e84a96e 100644 --- a/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -55,6 +55,9 @@ { "name": "icon-grappling-gun" }, + { + "name": "icon-harvesting" + }, { "name": "icon-light-replacer" },