diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 10df27f193a..8f2c3b0f568 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -137,6 +137,7 @@ name = "full steel tile" desc = "A full steel floor tile." icon_base = "steel_full" + has_damage_range = FALSE build_type = /obj/item/stack/tile/floor/full /decl/flooring/tiling/asteroid @@ -225,7 +226,7 @@ name = "plasteel tiles" desc = "A set of plasteel floor tiles." icon_base = "dark" - has_damage_range = null + has_damage_range = FALSE flags = TURF_REMOVE_CROWBAR build_type = /obj/item/stack/tile/floor_dark diff --git a/code/modules/mob/living/silicon/robot/items/gripper.dm b/code/modules/mob/living/silicon/robot/items/gripper.dm index 8d1604c390d..e9a09dd3293 100644 --- a/code/modules/mob/living/silicon/robot/items/gripper.dm +++ b/code/modules/mob/living/silicon/robot/items/gripper.dm @@ -229,7 +229,7 @@ /obj/item/photo ) -/obj/item/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc +/obj/item/gripper/research // A general usage gripper, used for toxins/robotics/xenobio/etc name = "scientific gripper" icon_state = "gripper-sci" desc = "A simple grasping tool suited to assist in a wide array of research applications." @@ -243,18 +243,20 @@ /obj/item/mecha_equipment, /obj/item/device/radio/exosuit, /obj/item/borg/upgrade, - /obj/item/device/flash, //to build borgs, - /obj/item/organ/internal/brain, //to insert into MMIs, - /obj/item/stack/cable_coil, //again, for borg building, + /obj/item/device/flash, // to build borgs, + /obj/item/organ/internal/brain, // to insert into MMIs, + /obj/item/stack/cable_coil, // again, for borg building, /obj/item/circuitboard, /obj/item/slime_extract, /obj/item/reagent_containers/glass, /obj/item/reagent_containers/food/snacks/monkeycube, - /obj/item/device/assembly,//For building bots and similar complex R&D devices - /obj/item/device/healthanalyzer,//For building medibots + /obj/item/seeds, // To be able to plant things for Xenobotany + /obj/item/grown, // To be able to plant things for Xenobotany + /obj/item/device/assembly, // For building bots and similar complex R&D devices + /obj/item/device/healthanalyzer,// For building medibots /obj/item/disk, /obj/item/device/analyzer/plant_analyzer,//For farmbot construction - /obj/item/material/minihoe,//Farmbots and xenoflora + /obj/item/material/minihoe, // Farmbots and xenoflora /obj/item/computer_hardware, /obj/item/slimesteroid, /obj/item/extract_enhancer, diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 9136bd3f131..d10dafbdfa1 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -788,6 +788,7 @@ var/global/list/robot_modules = list( . = ..() modules += new /obj/item/portable_destructive_analyzer(src) modules += new /obj/item/gripper/research(src) + modules += new /obj/item/robot_harvester(src) modules += new /obj/item/gripper/no_use/loader(src) modules += new /obj/item/device/robotanalyzer(src) modules += new /obj/item/card/robot(src) @@ -1042,6 +1043,7 @@ var/global/list/robot_modules = list( /obj/item/robot_module/mining_drone name = "mining drone module" no_slip = TRUE + channels = list(CHANNEL_SUPPLY = TRUE) networks = list(NETWORK_MINE) /obj/item/robot_module/mining_drone/Initialize(mapload, mob/living/silicon/robot/R) diff --git a/html/changelogs/Sindorman-fix-batch-bugs.yml b/html/changelogs/Sindorman-fix-batch-bugs.yml new file mode 100644 index 00000000000..caecfd1b110 --- /dev/null +++ b/html/changelogs/Sindorman-fix-batch-bugs.yml @@ -0,0 +1,44 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: PoZe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed robotic storage unit turning invisible when occupied." + - bugfix: "Added broken state sprites for full steel and plasteel tiles." + - tweak: "Research Cyborg's scientific gripper can now interact with seeds and grown products. Added robot auto-harvester tool for collecting grown things." + - tweak: "Mining drone now has access to service channels." diff --git a/icons/obj/robot_storage.dmi b/icons/obj/robot_storage.dmi index 693c7c80e30..2706785b0a7 100644 Binary files a/icons/obj/robot_storage.dmi and b/icons/obj/robot_storage.dmi differ diff --git a/icons/turf/flooring/tiles.dmi b/icons/turf/flooring/tiles.dmi index e9a7a942cd4..a7faa2c5200 100644 Binary files a/icons/turf/flooring/tiles.dmi and b/icons/turf/flooring/tiles.dmi differ