diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 63b0bf6ee24..a0264872db6 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -32287,6 +32287,7 @@ /obj/item/storage/toolbox/mechanical{ pixel_y = -3 }, +/obj/item/multitool/command, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 1de6ee25000..debf467492d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -24464,12 +24464,12 @@ pixel_y = -3 }, /obj/item/wrench, -/obj/item/multitool, /obj/machinery/newscaster{ dir = 1; name = "south bump"; pixel_y = -28 }, +/obj/item/multitool/command, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index 9e51207803b..ded20ee8da6 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -26111,6 +26111,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/item/multitool/command, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index d5267f0fdc5..6eed361de97 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -26270,7 +26270,7 @@ /obj/structure/table/reinforced, /obj/item/book/manual/wiki/sop_command, /obj/item/aicard, -/obj/item/multitool, +/obj/item/multitool/command, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "blue" diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm index c1a897d87df..311627ada62 100644 --- a/code/game/objects/items/tools/multitool.dm +++ b/code/game/objects/items/tools/multitool.dm @@ -106,6 +106,32 @@ toolspeed = 0.95 // dangerously fast... not like multitools use speed anyways origin_tech = "magnets=1;engineering=2;syndicate=1" +/obj/item/multitool/command + name = "command multitool" + desc = "Used for pulsing wires to test which to cut. Not recommended by the Captain." + icon_state = "multitool_command" + belt_icon = "multitool_command" + toolspeed = 0.95 //command those wires / that fireaxe cabinet! + +/obj/item/multitool/command/suicide_act(mob/living/user) + user.visible_message("[user] is attempting to command the command multitool! It looks like [user.p_theyre()] trying to commit suicide!") + //basically just cleaned up and copied from the medical wrench code + if(!user) + return + + user.Stun(10 SECONDS) + playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -1) + sleep(20) + + add_fingerprint(user) + desc += " Its screen displays the text \"[user.name]: executed for mutiny.\"" + + for(var/obj/item/W in user) + user.unEquip(W) + + user.dust() + return OBLITERATION + /obj/item/multitool/ai_detect/admin desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item? track_delay = 5 diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi index a0475553dff..5d94c9ff114 100644 Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index 099f0a8862d..0bf7820f3f5 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ