From 2ead1b7d7872de86077378fa902d66aa12d92fc3 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 May 2020 03:48:35 -0500 Subject: [PATCH 1/6] Power tools now start in their usual modes again + cleanup --- yogstation/code/game/objects/items/tools.dm | 145 +++++++++++--------- 1 file changed, 78 insertions(+), 67 deletions(-) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 0280748018d3..756c64662d7f 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -4,65 +4,42 @@ name = "jaws of life" materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." icon = 'icons/obj/tools.dmi' - icon_state = "jaws_cutter" + icon_state = "jaws_pry" item_state = "jawsoflife" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_SMALL - usesound = 'sound/items/jaws_cut.ogg' + usesound = 'sound/items/jaws_pry.ogg' force = 15 toolspeed = 0.7 - tool_behaviour = TOOL_WIRECUTTER + tool_behaviour = TOOL_CROWBAR //jaws of life suicide code /obj/item/jawsoflife/suicide_act(mob/user) - switch(tool_behaviour) - if(TOOL_CROWBAR) - user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) - return (BRUTELOSS) - if(TOOL_WIRECUTTER) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(iscarbon(user)) - var/mob/living/carbon/C = user - var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) - if(BP) - BP.drop_limb() - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) - return (BRUTELOSS) + if(TOOL_CROWBAR) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + if(TOOL_WIRECUTTER) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + return (BRUTELOSS) //jaws of life changing jaw code /obj/item/jawsoflife/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) if (tool_behaviour == TOOL_CROWBAR) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") - else - to_chat(user, "You attach the cutting jaws to [src].") - attack_verb = list("pinched", "nipped") - icon_state = "jaws_cutter" - hitsound = 'sound/items/jaws_cut.ogg' - usesound = 'sound/items/jaws_cut.ogg' - tool_behaviour = TOOL_WIRECUTTER - update_icon() - else if (tool_behaviour == TOOL_WIRECUTTER) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") - else - to_chat(user, "You attach the pry jaws to [src].") - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - usesound = 'sound/items/jaws_pry.ogg' - hitsound = 'sound/items/jaws_pry.ogg' - tool_behaviour = TOOL_CROWBAR - icon_state = "jaws_pry" - update_icon() - + transform_cutters(user) + else + transform_crowbar(user) + /obj/item/jawsoflife/attack(mob/living/carbon/C, mob/user) if (tool_behaviour == TOOL_WIRECUTTER) if(istype(C) && C.handcuffed) @@ -74,13 +51,42 @@ else ..() +/obj/item/jawsoflife/proc/transform_crowbar(mob/user) + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + usesound = 'sound/items/jaws_pry.ogg' + hitsound = 'sound/items/jaws_pry.ogg' + tool_behaviour = TOOL_CROWBAR + icon_state = "jaws_pry" + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") + else + to_chat(user, "You attach the pry jaws to [src].") + update_icon() + + +/obj/item/jawsoflife/proc/transform_cutters(mob/user) + attack_verb = list("pinched", "nipped") + icon_state = "jaws_cutter" + hitsound = 'sound/items/jaws_cut.ogg' + usesound = 'sound/items/jaws_cut.ogg' + tool_behaviour = TOOL_WIRECUTTER + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") + else + to_chat(user, "You attach the cutting jaws to [src].") + update_icon() + //better handdrill /obj/item/handdrill name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a bolt bit." + desc = "A simple powered hand drill. It's fitted with a screw bit." icon = 'icons/obj/tools.dmi' - icon_state = "drill_bolt" + icon_state = "drill_screw" item_state = "drill" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' @@ -94,31 +100,36 @@ hitsound = 'sound/items/drill_hit.ogg' usesound = 'sound/items/drill_use.ogg' toolspeed = 0.7 - tool_behaviour = TOOL_WRENCH + tool_behaviour = TOOL_SCREWDRIVER /obj/item/handdrill/suicide_act(mob/user) user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") return(BRUTELOSS) /obj/item/handdrill/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) if (tool_behaviour == TOOL_SCREWDRIVER) - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the drill reconfigures into bolt mode.") - else - to_chat(user, "You attach the bolt driver bit to [src].") - desc = "A simple powered hand drill. It's fitted with a bolt bit." - icon_state = "drill_bolt" - item_state = "drill" - tool_behaviour = TOOL_WRENCH - update_icon() - else if (tool_behaviour == TOOL_WRENCH) - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the drill reconfigures into screw mode.") - else - to_chat(user, "You attach the screw driver bit to [src].") - desc = "A simple powered hand drill. It's fitted with a screw bit." - icon_state = "drill_screw" - item_state = "drill" - tool_behaviour = TOOL_SCREWDRIVER - update_icon() + transform_wrench(user) + else + transform_screwdriver(user) + +/obj/item/handdrill/proc/transform_wrench(mob/user) + desc = "A simple powered hand drill. It's fitted with a bolt bit." + icon_state = "drill_bolt" + tool_behaviour = TOOL_WRENCH + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the drill reconfigures into bolt mode.") + else + to_chat(user, "You attach the bolt driver bit to [src].") + update_icon() + +/obj/item/handdrill/proc/transform_screwdriver(mob/user) + desc = "A simple powered hand drill. It's fitted with a screw bit." + icon_state = "drill_screw" + tool_behaviour = TOOL_SCREWDRIVER + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the drill reconfigures into screw mode.") + else + to_chat(user, "You attach the screw driver bit to [src].") + update_icon() From 4aedf3e78616638ecdac3183c69e344116cc0aea Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 May 2020 10:28:53 -0500 Subject: [PATCH 2/6] Makes turdis happy even if this isn't a "real" error --- yogstation/code/game/objects/items/tools.dm | 78 ++++++++++----------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 756c64662d7f..12d9d5a0747e 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -17,6 +17,35 @@ toolspeed = 0.7 tool_behaviour = TOOL_CROWBAR +/obj/item/jawsoflife/proc/transform_crowbar(mob/user) + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + usesound = 'sound/items/jaws_pry.ogg' + hitsound = 'sound/items/jaws_pry.ogg' + tool_behaviour = TOOL_CROWBAR + icon_state = "jaws_pry" + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") + else + to_chat(user, "You attach the pry jaws to [src].") + update_icon() + + +/obj/item/jawsoflife/proc/transform_cutters(mob/user) + attack_verb = list("pinched", "nipped") + icon_state = "jaws_cutter" + hitsound = 'sound/items/jaws_cut.ogg' + usesound = 'sound/items/jaws_cut.ogg' + tool_behaviour = TOOL_WIRECUTTER + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") + else + to_chat(user, "You attach the cutting jaws to [src].") + update_icon() + //jaws of life suicide code /obj/item/jawsoflife/suicide_act(mob/user) if(TOOL_CROWBAR) @@ -51,36 +80,6 @@ else ..() -/obj/item/jawsoflife/proc/transform_crowbar(mob/user) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - usesound = 'sound/items/jaws_pry.ogg' - hitsound = 'sound/items/jaws_pry.ogg' - tool_behaviour = TOOL_CROWBAR - icon_state = "jaws_pry" - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") - else - to_chat(user, "You attach the pry jaws to [src].") - update_icon() - - -/obj/item/jawsoflife/proc/transform_cutters(mob/user) - attack_verb = list("pinched", "nipped") - icon_state = "jaws_cutter" - hitsound = 'sound/items/jaws_cut.ogg' - usesound = 'sound/items/jaws_cut.ogg' - tool_behaviour = TOOL_WIRECUTTER - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") - else - to_chat(user, "You attach the cutting jaws to [src].") - update_icon() - - //better handdrill /obj/item/handdrill name = "hand drill" @@ -102,15 +101,6 @@ toolspeed = 0.7 tool_behaviour = TOOL_SCREWDRIVER -/obj/item/handdrill/suicide_act(mob/user) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/handdrill/attack_self(mob/user) - if (tool_behaviour == TOOL_SCREWDRIVER) - transform_wrench(user) - else - transform_screwdriver(user) /obj/item/handdrill/proc/transform_wrench(mob/user) desc = "A simple powered hand drill. It's fitted with a bolt bit." @@ -133,3 +123,13 @@ else to_chat(user, "You attach the screw driver bit to [src].") update_icon() + +/obj/item/handdrill/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/handdrill/attack_self(mob/user) + if (tool_behaviour == TOOL_SCREWDRIVER) + transform_wrench(user) + else + transform_screwdriver(user) From 3552365e9691bda92f60fddff8fcceb2a04a6f35 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 May 2020 10:38:37 -0500 Subject: [PATCH 3/6] Super pretty --- yogstation/code/game/objects/items/tools.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 12d9d5a0747e..98d838df9ce9 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -2,16 +2,14 @@ //the new and improved jaws /obj/item/jawsoflife name = "jaws of life" - - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) icon = 'icons/obj/tools.dmi' icon_state = "jaws_pry" item_state = "jawsoflife" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_SMALL - usesound = 'sound/items/jaws_pry.ogg' force = 15 toolspeed = 0.7 @@ -31,7 +29,6 @@ to_chat(user, "You attach the pry jaws to [src].") update_icon() - /obj/item/jawsoflife/proc/transform_cutters(mob/user) attack_verb = list("pinched", "nipped") icon_state = "jaws_cutter" @@ -101,7 +98,6 @@ toolspeed = 0.7 tool_behaviour = TOOL_SCREWDRIVER - /obj/item/handdrill/proc/transform_wrench(mob/user) desc = "A simple powered hand drill. It's fitted with a bolt bit." icon_state = "drill_bolt" From a63a2bdc7534370f02a6361f0c19cd268fb21040 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 May 2020 10:54:33 -0500 Subject: [PATCH 4/6] MCHSL saves my life --- yogstation/code/game/objects/items/tools.dm | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 98d838df9ce9..5a7f8ea32fb3 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -45,18 +45,19 @@ //jaws of life suicide code /obj/item/jawsoflife/suicide_act(mob/user) - if(TOOL_CROWBAR) - user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) - if(TOOL_WIRECUTTER) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(iscarbon(user)) - var/mob/living/carbon/C = user - var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) - if(BP) - BP.drop_limb() - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + switch(tool_behaviour) + if(TOOL_CROWBAR) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + if(TOOL_WIRECUTTER) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD) + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) return (BRUTELOSS) //jaws of life changing jaw code From 27b1ba0f8a0c5d9e86d4bbcfcaa57e439a2119f8 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 May 2020 10:59:22 -0500 Subject: [PATCH 5/6] Orginized in a less stupid way --- yogstation/code/game/objects/items/tools.dm | 84 +++++++++++---------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 5a7f8ea32fb3..5f736a20e77f 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -15,33 +15,13 @@ toolspeed = 0.7 tool_behaviour = TOOL_CROWBAR -/obj/item/jawsoflife/proc/transform_crowbar(mob/user) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - usesound = 'sound/items/jaws_pry.ogg' - hitsound = 'sound/items/jaws_pry.ogg' - tool_behaviour = TOOL_CROWBAR - icon_state = "jaws_pry" - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") - else - to_chat(user, "You attach the pry jaws to [src].") - update_icon() -/obj/item/jawsoflife/proc/transform_cutters(mob/user) - attack_verb = list("pinched", "nipped") - icon_state = "jaws_cutter" - hitsound = 'sound/items/jaws_cut.ogg' - usesound = 'sound/items/jaws_cut.ogg' - tool_behaviour = TOOL_WIRECUTTER - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - if (iscyborg(user)) - to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") +//jaws of life changing jaw code +/obj/item/jawsoflife/attack_self(mob/user) + if (tool_behaviour == TOOL_CROWBAR) + transform_cutters(user) else - to_chat(user, "You attach the cutting jaws to [src].") - update_icon() + transform_crowbar(user) //jaws of life suicide code /obj/item/jawsoflife/suicide_act(mob/user) @@ -60,13 +40,6 @@ playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) return (BRUTELOSS) -//jaws of life changing jaw code -/obj/item/jawsoflife/attack_self(mob/user) - if (tool_behaviour == TOOL_CROWBAR) - transform_cutters(user) - else - transform_crowbar(user) - /obj/item/jawsoflife/attack(mob/living/carbon/C, mob/user) if (tool_behaviour == TOOL_WIRECUTTER) if(istype(C) && C.handcuffed) @@ -77,6 +50,34 @@ ..() else ..() + +/obj/item/jawsoflife/proc/transform_crowbar(mob/user) + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + usesound = 'sound/items/jaws_pry.ogg' + hitsound = 'sound/items/jaws_pry.ogg' + tool_behaviour = TOOL_CROWBAR + icon_state = "jaws_pry" + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the cutting head reconfigures into a prying head.") + else + to_chat(user, "You attach the pry jaws to [src].") + update_icon() + +/obj/item/jawsoflife/proc/transform_cutters(mob/user) + attack_verb = list("pinched", "nipped") + icon_state = "jaws_cutter" + hitsound = 'sound/items/jaws_cut.ogg' + usesound = 'sound/items/jaws_cut.ogg' + tool_behaviour = TOOL_WIRECUTTER + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + if (iscyborg(user)) + to_chat(user,"Your servos whirr as the prying head reconfigures into a cutting head.") + else + to_chat(user, "You attach the cutting jaws to [src].") + update_icon() //better handdrill /obj/item/handdrill @@ -99,6 +100,16 @@ toolspeed = 0.7 tool_behaviour = TOOL_SCREWDRIVER +/obj/item/handdrill/attack_self(mob/user) + if (tool_behaviour == TOOL_SCREWDRIVER) + transform_wrench(user) + else + transform_screwdriver(user) + +/obj/item/handdrill/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + /obj/item/handdrill/proc/transform_wrench(mob/user) desc = "A simple powered hand drill. It's fitted with a bolt bit." icon_state = "drill_bolt" @@ -121,12 +132,3 @@ to_chat(user, "You attach the screw driver bit to [src].") update_icon() -/obj/item/handdrill/suicide_act(mob/user) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/handdrill/attack_self(mob/user) - if (tool_behaviour == TOOL_SCREWDRIVER) - transform_wrench(user) - else - transform_screwdriver(user) From d2ba81773f505686ef3d2f745d07fa8efd69c611 Mon Sep 17 00:00:00 2001 From: Hopek Date: Sun, 10 May 2020 11:00:41 -0500 Subject: [PATCH 6/6] ugly --- yogstation/code/game/objects/items/tools.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 5f736a20e77f..fbd20061cdce 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -15,7 +15,6 @@ toolspeed = 0.7 tool_behaviour = TOOL_CROWBAR - //jaws of life changing jaw code /obj/item/jawsoflife/attack_self(mob/user) if (tool_behaviour == TOOL_CROWBAR)