diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index fac5e9fb70..8391c90434 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -72,12 +72,12 @@ /obj/item/weapon/storage/toolbox/syndicate/New() ..() new /obj/item/clothing/gloves/yellow(src) - new /obj/item/weapon/screwdriver(src) - new /obj/item/weapon/wrench(src) + new /obj/item/weapon/screwdriver/power(src) + new /obj/item/stack/cable_coil/random(src,30) new /obj/item/weapon/weldingtool/experimental(src) - new /obj/item/weapon/crowbar(src) - new /obj/item/weapon/wirecutters(src) + new /obj/item/weapon/crowbar/power(src) new /obj/item/device/multitool(src) + new /obj/item/device/analyzer(src) /obj/item/weapon/storage/toolbox/lunchbox max_storage_space = ITEMSIZE_COST_SMALL * 4 //slightly smaller than a toolbox diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 2e7fc52cad..df50214e94 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -53,7 +53,7 @@ icon_state = "drill_bolt" item_state = "drill" usesound = 'sound/items/drill_use.ogg' - matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50, MAT_TITANIUM = 25) + matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50) origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) force = 8 w_class = ITEMSIZE_SMALL @@ -155,7 +155,7 @@ desc = "A simple powered hand drill. It's fitted with a screw bit." icon_state = "drill_screw" item_state = "drill" - matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50, MAT_TITANIUM = 25) + matter = list(DEFAULT_WALL_MATERIAL = 150, MAT_SILVER = 50) origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) force = 8 @@ -240,7 +240,7 @@ icon_state = "jaws_cutter" item_state = "jawsoflife" origin_tech = list(TECH_MATERIAL = 2, TECH_ENGINEERING = 2) - matter = list(MAT_METAL=150, MAT_SILVER=50, MAT_TITANIUM=25) + matter = list(MAT_METAL=150, MAT_SILVER=50) usesound = 'sound/items/jaws_cut.ogg' force = 15 toolspeed = 0.25 @@ -844,7 +844,7 @@ desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." icon_state = "jaws_pry" item_state = "jawsoflife" - matter = list(MAT_METAL=150, MAT_SILVER=50, MAT_TITANIUM=25) + matter = list(MAT_METAL=150, MAT_SILVER=50) origin_tech = list(TECH_MATERIALS = 2, TECH_ENGINEERING = 2) usesound = 'sound/items/jaws_pry.ogg' force = 15 diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 2588da8454..5af7cdad1d 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -733,13 +733,31 @@ other types of metals and chemistry for reagents). sort_string = "VASBA" /datum/design/item/experimental_welder - name = "Expiermental Welding Tool" + name = "Experimental welding tool" desc = "A welding tool that generate fuel for itself." id = "expwelder" req_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3, TECH_MATERIAL = 4) materials = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120, "phoron" = 100) build_path = /obj/item/weapon/weldingtool/experimental sort_string = "VASCA" + +/datum/design/item/hand_drill + name = "Hand drill" + desc = "A simple powered hand drill." + id = "handdrill" + req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) + materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100) + build_path = /obj/item/weapon/screwdriver/power + sort_string = "VASDA" + +/datum/design/item/jaws_life + name = "Jaws of life" + desc = "A set of jaws of life, compressed through the magic of science." + id = "jawslife" + req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2) + materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100) + build_path = /obj/item/weapon/crowbar/power + sort_string = "VASEA" /* CIRCUITS BELOW */ diff --git a/html/changelogs/Nalarac - Power Tools.yml b/html/changelogs/Nalarac - Power Tools.yml new file mode 100644 index 0000000000..197c6b0910 --- /dev/null +++ b/html/changelogs/Nalarac - Power Tools.yml @@ -0,0 +1,37 @@ +################################ +# 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 +################################# + +# Your name. +author: Nalarac + +# 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: "Added the hand drill and jaws of life to the protolathe" + - tweak: "Syndicate toolbox now comes with power tools" \ No newline at end of file