Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Power tools now start in their usual modes again + cleanup #8455

Merged
SomeguyManperson merged 6 commits into from
May 17, 2020
Merged

Power tools now start in their usual modes again + cleanup #8455

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2ead1b7
Power tools now start in their usual modes again + cleanup
Hopekz May 10, 2020
4aedf3e
Makes turdis happy even if this isn't a "real" error
Hopekz May 10, 2020
3552365
Super pretty
Hopekz May 10, 2020
a63a2bd
MCHSL saves my life
Hopekz May 10, 2020
27b1ba0
Orginized in a less stupid way
Hopekz May 10, 2020
d2ba817
ugly
Hopekz May 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 69 additions & 60 deletions yogstation/code/game/objects/items/tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,32 @@
//the new and improved jaws
/obj/item/jawsoflife
name = "jaws of life"

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)
desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting 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 changing jaw code
/obj/item/jawsoflife/attack_self(mob/user)
if (tool_behaviour == TOOL_CROWBAR)
transform_cutters(user)
else
transform_crowbar(user)

//jaws of life suicide code
/obj/item/jawsoflife/suicide_act(mob/user)
switch(tool_behaviour)
if(TOOL_CROWBAR)
user.visible_message("<span class='suicide'>[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1)
return (BRUTELOSS)
if(TOOL_WIRECUTTER)
user.visible_message("<span class='suicide'>[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!</span>")
playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1)
Expand All @@ -33,36 +37,8 @@
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)
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,"<span class='notice'>Your servos whirr as the prying head reconfigures into a cutting head.</span>")
else
to_chat(user, "<span class='notice'>You attach the cutting jaws to [src].</span>")
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,"<span class='notice'>Your servos whirr as the cutting head reconfigures into a prying head.</span>")
else
to_chat(user, "<span class='notice'>You attach the pry jaws to [src].</span>")
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()

/obj/item/jawsoflife/attack(mob/living/carbon/C, mob/user)
if (tool_behaviour == TOOL_WIRECUTTER)
if(istype(C) && C.handcuffed)
Expand All @@ -73,14 +49,41 @@
..()
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,"<span class='notice'>Your servos whirr as the cutting head reconfigures into a prying head.</span>")
else
to_chat(user, "<span class='notice'>You attach the pry jaws to [src].</span>")
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,"<span class='notice'>Your servos whirr as the prying head reconfigures into a cutting head.</span>")
else
to_chat(user, "<span class='notice'>You attach the cutting jaws to [src].</span>")
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'
Expand All @@ -94,31 +97,37 @@
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/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("<span class='suicide'>[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!</span>")
return(BRUTELOSS)

/obj/item/handdrill/attack_self(mob/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 (tool_behaviour == TOOL_SCREWDRIVER)
if (iscyborg(user))
to_chat(user,"<span class='notice'>Your servos whirr as the drill reconfigures into bolt mode.</span>")
else
to_chat(user, "<span class='notice'>You attach the bolt driver bit to [src].</span>")
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,"<span class='notice'>Your servos whirr as the drill reconfigures into screw mode.</span>")
else
to_chat(user, "<span class='notice'>You attach the screw driver bit to [src].</span>")
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()
if (iscyborg(user))
to_chat(user,"<span class='notice'>Your servos whirr as the drill reconfigures into bolt mode.</span>")
else
to_chat(user, "<span class='notice'>You attach the bolt driver bit to [src].</span>")
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,"<span class='notice'>Your servos whirr as the drill reconfigures into screw mode.</span>")
else
to_chat(user, "<span class='notice'>You attach the screw driver bit to [src].</span>")
update_icon()