diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index e62ac35ea84..6cbf762151e 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -1,7 +1,10 @@ +/* + * Toolboxes + */ /obj/item/weapon/storage/toolbox name = "toolbox" desc = "Danger. Very robust." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage_vr.dmi' icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") center_of_mass = list("x" = 16,"y" = 11) @@ -18,8 +21,10 @@ drop_sound = 'sound/items/drop/toolbox.ogg' pickup_sound = 'sound/items/pickup/toolbox.ogg' +//Emergency /obj/item/weapon/storage/toolbox/emergency name = "emergency toolbox" + icon = 'icons/obj/storage_vr.dmi' icon_state = "red" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") starts_with = list( @@ -34,8 +39,10 @@ new /obj/item/device/flashlight/flare(src) . = ..() +//Mechanical /obj/item/weapon/storage/toolbox/mechanical name = "mechanical toolbox" + icon = 'icons/obj/storage_vr.dmi' icon_state = "blue" item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue") starts_with = list( @@ -47,8 +54,10 @@ /obj/item/weapon/tool/wirecutters ) +//Electrical /obj/item/weapon/storage/toolbox/electrical name = "electrical toolbox" + icon = 'icons/obj/storage_vr.dmi' icon_state = "yellow" item_state_slots = list(slot_r_hand_str = "toolbox_yellow", slot_l_hand_str = "toolbox_yellow") starts_with = list( @@ -67,8 +76,10 @@ new /obj/item/stack/cable_coil/random(src,30) calibrate_size() +//Syndicate /obj/item/weapon/storage/toolbox/syndicate name = "black and red toolbox" + icon = 'icons/obj/storage_vr.dmi' icon_state = "syndicate" item_state_slots = list(slot_r_hand_str = "toolbox_syndi", slot_l_hand_str = "toolbox_syndi") origin_tech = list(TECH_COMBAT = 1, TECH_ILLEGAL = 1) @@ -94,9 +105,28 @@ /obj/item/device/analyzer ) +//Brass +/obj/item/weapon/storage/toolbox/brass + name = "brass toolbox" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "brass" + item_state_slots = list(slot_r_hand_str = "toolbox_yellow", slot_l_hand_str = "toolbox_yellow") + starts_with = list( + /obj/item/weapon/tool/crowbar/brass, + /obj/item/weapon/tool/wirecutters/brass, + /obj/item/weapon/tool/screwdriver/brass, + /obj/item/weapon/tool/wrench/brass, + /obj/item/weapon/weldingtool/brass + ) + +/* + * Lunchboxes + */ + /obj/item/weapon/storage/toolbox/lunchbox max_storage_space = ITEMSIZE_COST_SMALL * 4 //slightly smaller than a toolbox name = "rainbow lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_rainbow" item_state_slots = list(slot_r_hand_str = "toolbox_pink", slot_l_hand_str = "toolbox_pink") desc = "A little lunchbox. This one is the colors of the rainbow!" @@ -125,6 +155,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/heart name = "heart lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_lovelyhearts" item_state_slots = list(slot_r_hand_str = "toolbox_pink", slot_l_hand_str = "toolbox_pink") desc = "A little lunchbox. This one has cute little hearts on it!" @@ -134,6 +165,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/cat name = "cat lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_sciencecatshow" item_state_slots = list(slot_r_hand_str = "toolbox_green", slot_l_hand_str = "toolbox_green") desc = "A little lunchbox. This one has a cute little science cat from a popular show on it!" @@ -143,6 +175,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/nt name = "NanoTrasen brand lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_nanotrasen" item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue") desc = "A little lunchbox. This one is branded with the NanoTrasen logo!" @@ -152,6 +185,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/mars name = "\improper Mojave university lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_marsuniversity" item_state_slots = list(slot_r_hand_str = "toolbox_red", slot_l_hand_str = "toolbox_red") desc = "A little lunchbox. This one is branded with the Mojave university logo!" @@ -161,6 +195,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/cti name = "\improper CTI lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_cti" item_state_slots = list(slot_r_hand_str = "toolbox_blue", slot_l_hand_str = "toolbox_blue") desc = "A little lunchbox. This one is branded with the CTI logo!" @@ -170,6 +205,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/nymph name = "\improper Diona nymph lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_dionanymph" item_state_slots = list(slot_r_hand_str = "toolbox_yellow", slot_l_hand_str = "toolbox_yellow") desc = "A little lunchbox. This one is an adorable Diona nymph on the side!" @@ -179,6 +215,7 @@ /obj/item/weapon/storage/toolbox/lunchbox/syndicate name = "black and red lunchbox" + icon = 'icons/obj/storage.dmi' icon_state = "lunchbox_syndie" item_state_slots = list(slot_r_hand_str = "toolbox_syndi", slot_l_hand_str = "toolbox_syndi") desc = "A little lunchbox. This one is a sleek black and red, made of a durable steel!" diff --git a/code/game/objects/items/weapons/tools/brass.dm b/code/game/objects/items/weapons/tools/brass.dm new file mode 100644 index 00000000000..eedebe3220d --- /dev/null +++ b/code/game/objects/items/weapons/tools/brass.dm @@ -0,0 +1,32 @@ +/* + * Brass Tools + */ + +//Crowbar +/obj/item/weapon/tool/crowbar/brass + icon_state = "crowbar_brass" + item_state = "crowbar" + +//Cutters +/obj/item/weapon/tool/wirecutters/brass + icon_state = "cutters_brass" + item_state = "cutters_yellow" + +//Screwdriver +/obj/item/weapon/tool/screwdriver/brass + icon_state = "screwdriver_brass" + item_state = "screwdriver_black" + +//Wrench +/obj/item/weapon/tool/wrench/brass + icon_state = "wrench_brass" + item_state = "wrench_brass" + +//Welder +/obj/item/weapon/weldingtool/brass + name = "brass welding tool" + desc = "A welder made from brass fittings." + icon_state = "brasswelder" + max_fuel = 20 + origin_tech = list(TECH_ENGINEERING = 2, TECH_PHORON = 2) + matter = list(MAT_STEEL = 70, MAT_GLASS = 60) \ No newline at end of file diff --git a/code/game/objects/items/weapons/tools/crowbar.dm b/code/game/objects/items/weapons/tools/crowbar.dm index 0d349376565..9da82688c30 100644 --- a/code/game/objects/items/weapons/tools/crowbar.dm +++ b/code/game/objects/items/weapons/tools/crowbar.dm @@ -1,7 +1,6 @@ /* * Crowbar */ - /obj/item/weapon/tool/crowbar name = "crowbar" desc = "Used to remove floors and to pry open doors." @@ -27,6 +26,10 @@ icon_state = "red_crowbar" item_state = "crowbar_red" +/obj/item/weapon/tool/crowbar/old + icon = 'icons/obj/tools.dmi' + icon_state = "old_crowbar" + item_state = "crowbar" /datum/category_item/catalogue/anomalous/precursor_a/alien_crowbar name = "Precursor Alpha Object - Hard Light Pry Tool" diff --git a/code/game/objects/items/weapons/tools/crowbar_vr.dm b/code/game/objects/items/weapons/tools/crowbar_vr.dm index b376c15af85..b846a0e294d 100644 --- a/code/game/objects/items/weapons/tools/crowbar_vr.dm +++ b/code/game/objects/items/weapons/tools/crowbar_vr.dm @@ -7,11 +7,11 @@ desc = "A steel bar with a wedge, designed specifically for opening unpowered doors in an emergency. It comes in a variety of configurations - collect them all!" icon = 'icons/obj/tools_vr.dmi' icon_state = "prybar" + item_state = "crowbar" slot_flags = SLOT_BELT force = 4 throwforce = 5 pry = 1 - item_state = "crowbar" w_class = ITEMSIZE_SMALL origin_tech = list(TECH_ENGINEERING = 1) matter = list(MAT_STEEL = 30) diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index a8f64d4f101..6e5973f0c33 100644 --- a/code/game/objects/items/weapons/tools/wirecutters.dm +++ b/code/game/objects/items/weapons/tools/wirecutters.dm @@ -6,6 +6,7 @@ desc = "This cuts wires." icon = 'icons/obj/tools.dmi' icon_state = "cutters" + item_state = "cutters" center_of_mass = list("x" = 18,"y" = 10) slot_flags = SLOT_BELT force = 6 @@ -26,9 +27,20 @@ var/random_color = TRUE /obj/item/weapon/tool/wirecutters/New() - if(random_color && prob(50)) - icon_state = "cutters-y" - item_state = "cutters_yellow" + if(random_color) + switch(pick("red","blue","yellow")) + if ("red") + icon_state = "cutters" + item_state = "cutters" + if ("blue") + icon_state = "cutters-b" + item_state = "cutters_blue" + if ("yellow") + icon_state = "cutters-y" + item_state = "cutters_yellow" + + if (prob(75)) + src.pixel_y = rand(0, 16) ..() /obj/item/weapon/tool/wirecutters/attack(mob/living/carbon/C as mob, mob/user as mob) diff --git a/code/game/objects/items/weapons/tools/wrench.dm b/code/game/objects/items/weapons/tools/wrench.dm index 052eae0d2cb..634382ff119 100644 --- a/code/game/objects/items/weapons/tools/wrench.dm +++ b/code/game/objects/items/weapons/tools/wrench.dm @@ -25,6 +25,14 @@ usesound = 'sound/items/drill_use.ogg' toolspeed = 0.5 +/obj/item/weapon/tool/wrench/pipe + name = "pipe wrench" + desc = "A wrench used for plumbing. Can make a good makeshift weapon." + icon_state = "pipe_wrench" + slot_flags = SLOT_BELT + force = 8 + throwforce = 10 + /obj/item/weapon/tool/wrench/hybrid // Slower and bulkier than normal power tools, but it has the power of reach. If reach even worked half the time. name = "strange wrench" desc = "A wrench with many common uses. Can be usually found in your hand." @@ -40,7 +48,6 @@ toolspeed = 0.5 reach = 2 - /datum/category_item/catalogue/anomalous/precursor_a/alien_wrench name = "Precursor Alpha Object - Fastener Torque Tool" desc = "This is an object that has a distinctive tool shape. \ diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index 20c744e0a0b..3d67535cea0 100644 Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi index 2975e654093..1cbbd348dd8 100644 Binary files a/icons/obj/storage_vr.dmi and b/icons/obj/storage_vr.dmi differ diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi index dbc403ce407..e3745e8cc1a 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ