Skip to content

[COMMISSION] [PORT] ports yogs improvised engineering tools #12226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mantlecrawler wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[COMMISSION] [PORT] ports yogs improvised engineering tools #12226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
975123b
Oh for just one time i would take the northwest passage
Mantlecrawler Jul 21, 2026
f9eb43d
Chasing one warm line through a land so wide and savage
Mantlecrawler Jul 21, 2026
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
48 changes: 48 additions & 0 deletions code/datums/components/crafting/makeshift.dm
View file
Open in desktop

@CheffieGithub CheffieGithub Jul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Costs are weird, showing with rod costs
crowbar 3 rods
wrench 4 rods
wire cutters 6 rods
multi tool 4 rods

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/datum/crafting_recipe/makeshiftcrowbar
name = "Makeshift Crowbar"
reqs = list(/obj/item/stack/rods = 3) //just bang them together
result = /obj/item/crowbar/makeshift
time = 6 SECONDS
category = CAT_TOOLS

/datum/crafting_recipe/makeshiftwrench
name = "Makeshift Wrench"
reqs = list(/obj/item/stack/sheet/iron = 2)
result = /obj/item/wrench/makeshift
time = 6 SECONDS
category = CAT_TOOLS

/datum/crafting_recipe/makeshiftwirecutters
name = "Makeshift Wirecutters"
reqs = list(/obj/item/stack/sheet/iron = 2,
/obj/item/stack/rods = 2)
Comment on lines +17 to +18

@CheffieGithub CheffieGithub Jul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reqs = list(/obj/item/stack/sheet/iron = 2,
/obj/item/stack/rods = 2)
reqs = list(
/obj/item/stack/sheet/iron = 2,
/obj/item/stack/rods = 2,
)

result = /obj/item/wirecutters/makeshift
time = 8 SECONDS
category = CAT_TOOLS

/datum/crafting_recipe/makeshiftweldingtool
name = "Makeshift Welding Tool"
reqs = list(/obj/item/tank/internals/emergency_oxygen = 1,
/obj/item/assembly/igniter = 1)
Comment on lines +25 to +26

@CheffieGithub CheffieGithub Jul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reqs = list(/obj/item/tank/internals/emergency_oxygen = 1,
/obj/item/assembly/igniter = 1)
reqs = list(
/obj/item/tank/internals/emergency_oxygen = 1,
/obj/item/assembly/igniter = 1,
)

tool_behaviors = list(TOOL_SCREWDRIVER)
result = /obj/item/weldingtool/makeshift
time = 8 SECONDS
category = CAT_TOOLS

/datum/crafting_recipe/makeshiftmultitool
name = "Makeshift Multitool"
reqs = list(/obj/item/assembly/igniter = 1,
/obj/item/assembly/signaler = 1,
/obj/item/stack/sheet/iron = 2,
/obj/item/stack/cable_coil = 10)
Comment on lines +34 to +37

@CheffieGithub CheffieGithub Jul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
reqs = list(/obj/item/assembly/igniter = 1,
/obj/item/assembly/signaler = 1,
/obj/item/stack/sheet/iron = 2,
/obj/item/stack/cable_coil = 10)
reqs = list(
/obj/item/assembly/igniter = 1,
/obj/item/assembly/signaler = 1,
/obj/item/stack/sheet/iron = 2,
/obj/item/stack/cable_coil = 10,
)

tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
result = /obj/item/multitool/makeshift
time = 8 SECONDS
category = CAT_TOOLS

/datum/crafting_recipe/makeshiftscrewdriver
name = "Makeshift Screwdriver"
reqs = list(/obj/item/stack/rods = 3)
result = /obj/item/screwdriver/makeshift
time = 6 SECONDS
category = CAT_TOOLS
7 changes: 7 additions & 0 deletions code/game/objects/items/devices/multitool.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,13 @@
icon_state = "toolkit_engiborg_multitool"
toolspeed = 0.5

/obj/item/multitool/makeshift
name = "makeshift multitool"
desc = "As crappy as it is, its still mostly the same as a standard issue Nanotrasen one."
icon = 'icons/obj/improvised.dmi'

@CheffieGithub CheffieGithub Jul 24, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use tools.dmi

icon_state = "multitool_makeshift"
toolspeed = 2

//Tricorder
//The tricorder is a child of a multitool, atmosanalyzer and health scaner

Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/tools/crowbar.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,12 @@
worn_icon_state = "jawsofdeath"
toolspeed = 0.5
force_opens = TRUE

/obj/item/crowbar/makeshift
name = "makeshift crowbar"
desc = "A crude, self-wrought crowbar. Heavy."
icon = 'icons/obj/improvised.dmi'
icon_state = "crowbar_makeshift"
force = 12 //same as large crowbar, but bulkier and slower
w_class = WEIGHT_CLASS_BULKY
toolspeed = 2
8 changes: 8 additions & 0 deletions code/game/objects/items/tools/screwdriver.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,3 +162,11 @@
/obj/item/screwdriver/red/Initialize(mapload)
. = ..()
set_greyscale(colors=list(screwdriver_colors["red"]))

/obj/item/screwdriver/makeshift
name = "makeshift screwdriver"
desc = "Crude driver of screws. A primitive way to screw things up."
icon = 'icons/obj/improvised.dmi'
icon_state = "screwdriver_makeshift"
toolspeed = 2
random_color = FALSE
10 changes: 10 additions & 0 deletions code/game/objects/items/tools/weldingtool.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,3 +391,13 @@
if(get_fuel() < max_fuel && nextrefueltick < world.time)
nextrefueltick = world.time + 10
reagents.add_reagent(/datum/reagent/fuel, 1)

/obj/item/weldingtool/makeshift
name = "makeshift welding tool"
desc = "A MacGyver-style welder."
icon = 'icons/obj/improvised.dmi'
icon_state = "welder_makeshift"
change_icons = FALSE
toolspeed = 2
max_fuel = 10
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5)
8 changes: 8 additions & 0 deletions code/game/objects/items/tools/wirecutters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,11 @@
worn_icon_state = "cutters"
toolspeed = 0.5
random_color = FALSE

/obj/item/wirecutters/makeshift
name = "makeshift wirecutters"
desc = "Mind your fingers."
icon = 'icons/obj/improvised.dmi'
icon_state = "cutters_makeshift"
toolspeed = 2
random_color = FALSE
7 changes: 7 additions & 0 deletions code/game/objects/items/tools/wrench.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,10 @@
icon_state = "bolter_wrench"
inhand_icon_state = "bolter_wrench"
w_class = WEIGHT_CLASS_NORMAL

/obj/item/wrench/makeshift
name = "makeshift wrench"
desc = "A crude, self-wrought wrench with common uses. Can be found in your hand."
icon = 'icons/obj/improvised.dmi'
icon_state = "wrench_makeshift"
toolspeed = 2
Binary file added icons/obj/improvised.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,6 +1411,7 @@
#include "code\datums\components\crafting\equipment.dm"
#include "code\datums\components\crafting\furniture.dm"
#include "code\datums\components\crafting\guncrafting.dm"
#include "code\datums\components\crafting\makeshift.dm"
#include "code\datums\components\crafting\makeshift_mechs.dm"
#include "code\datums\components\crafting\melee_weapon.dm"
#include "code\datums\components\crafting\misc.dm"
Expand Down
Loading