diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 6906b95ffb4..a18ca787989 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -577,7 +577,8 @@ "crowbar", "screwdriver", "wrench", - "wirecutters" + "wirecutters", + "multitool" ) var/current_tool = 1 @@ -604,6 +605,9 @@ /obj/item/combitool/iscrowbar() return tools[current_tool] == "crowbar" +/obj/item/combitool/ismultitool() + return tools[current_tool] == "multitool" + /obj/item/combitool/proc/update_tool() icon_state = "[initial(icon_state)]-[tools[current_tool]]" diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index de3017b2cd5..22c754f197c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -706,3 +706,33 @@ /obj/structure/closet/crate/extinguisher_catridges/fill() for(var/a = 1 to 12) new /obj/item/weapon/reagent_containers/extinguisher_refill(src) + +/obj/structure/closet/crate/autakh + name = "aut'akh crate" + desc = "Contains a number of limbs and augmentations created by the Aut'akh Commune." + icon = 'icons/obj/storage.dmi' + icon_state = "autakh_crate" + icon_opened = "autakh_crateopen" + icon_closed = "autakh_crate" + +/obj/structure/closet/crate/autakh/fill() + new /obj/item/organ/external/arm/right/autakh(src) + new /obj/item/organ/external/arm/right/autakh(src) + new /obj/item/organ/external/arm/autakh(src) + new /obj/item/organ/external/arm/autakh(src) + new /obj/item/organ/external/hand/autakh(src) + new /obj/item/organ/external/hand/autakh(src) + new /obj/item/organ/external/hand/right/autakh(src) + new /obj/item/organ/external/hand/right/autakh(src) + new /obj/item/organ/external/leg/autakh(src) + new /obj/item/organ/external/leg/autakh(src) + new /obj/item/organ/external/leg/right/autakh(src) + new /obj/item/organ/external/leg/right/autakh(src) + new /obj/item/organ/external/foot/autakh(src) + new /obj/item/organ/external/foot/autakh(src) + new /obj/item/organ/external/foot/right/autakh(src) + new /obj/item/organ/external/foot/right/autakh(src) + new /obj/item/organ/external/hand/right/autakh/tool(src) + new /obj/item/organ/external/hand/right/autakh/tool/mining(src) + new /obj/item/organ/external/hand/right/autakh/medical(src) + new /obj/item/organ/external/hand/right/autakh/security(src) diff --git a/code/modules/organs/subtypes/autakh.dm b/code/modules/organs/subtypes/autakh.dm index 4f2771f631e..2e4ee549ed4 100644 --- a/code/modules/organs/subtypes/autakh.dm +++ b/code/modules/organs/subtypes/autakh.dm @@ -344,7 +344,7 @@ qdel(src) /obj/item/organ/external/hand/right/autakh/tool/mining - name = "engineering grasper" + name = "mining grasper" action_button_name = "Deploy Mounted Drill" augment_type = /obj/item/weapon/pickaxe/drill/integrated @@ -357,6 +357,8 @@ /obj/item/weapon/pickaxe/drill/integrated name = "integrated mining drill" + icon_state = "integrateddrill" + item_state = "integrateddrill" /obj/item/weapon/pickaxe/drill/integrated/throw_at() usr.drop_from_inventory(src) diff --git a/html/changelogs/paradoxspace-returnofmechagodzilla.yml b/html/changelogs/paradoxspace-returnofmechagodzilla.yml new file mode 100644 index 00000000000..b31a55f765a --- /dev/null +++ b/html/changelogs/paradoxspace-returnofmechagodzilla.yml @@ -0,0 +1,41 @@ +################################ +# 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: ParadoxSpace +# 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: + - rscadd: "Adds a crate full of Aut'akh limbs to robotics." + - rscadd: "Adds a multitool to the engineering grasper, and new sprites to the mining grasper." diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 3caf47b521a..d1b52e461b3 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index cfd96b6a4fa..89a153050aa 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi index 8087dcea9bf..69c4a224b85 100644 Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ diff --git a/icons/obj/combitool.dmi b/icons/obj/combitool.dmi index 596187628d3..cff45f35dff 100644 Binary files a/icons/obj/combitool.dmi and b/icons/obj/combitool.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 657241ef2ac..7d7e95e7d71 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 7342d655da8..2b2e03df2da 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 51ec16ea782..fe604ab4d59 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -65545,6 +65545,10 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, /area/maintenance/medbay) +"hPs" = ( +/obj/structure/closet/crate/autakh, +/turf/simulated/floor/tiled/dark, +/area/assembly/robotics) "hRJ" = ( /obj/machinery/alarm{ dir = 8; @@ -92779,7 +92783,7 @@ baE bfX baE biD -bkO +hPs biD bmr bnP