diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 9595f1ba80..3b20ccbb5c 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -1,3 +1,16 @@ +/* + * Contains: + * Flashlights + * Lamps + * Flares + * Chemlights + * Slime Extract + */ + +/* + * Flashlights + */ + /obj/item/device/flashlight name = "flashlight" desc = "A hand-held emergency light." @@ -7,15 +20,15 @@ slot_flags = SLOT_BELT matter = list(MAT_STEEL = 50,MAT_GLASS = 20) action_button_name = "Toggle Flashlight" - + light_system = MOVABLE_LIGHT_DIRECTIONAL light_range = 4 //luminosity when on light_power = 0.8 //lighting power when on light_color = "#FFFFFF" //LIGHT_COLOR_INCANDESCENT_FLASHLIGHT //lighting colour when on light_cone_y_offset = -7 - + var/on = 0 - + var/obj/item/weapon/cell/cell var/cell_type = /obj/item/weapon/cell/device var/power_usage = 1 @@ -26,7 +39,7 @@ if(power_use && cell_type) cell = new cell_type(src) - + update_brightness() /obj/item/device/flashlight/Destroy() @@ -232,24 +245,34 @@ w_class = ITEMSIZE_TINY power_use = 0 -/obj/item/device/flashlight/color //Default color is blue, just roll with it. +/obj/item/device/flashlight/color //Default color is blue name = "blue flashlight" - desc = "A hand-held emergency light. This one is blue." + desc = "A small flashlight. This one is blue." icon_state = "flashlight_blue" +/obj/item/device/flashlight/color/green + name = "green flashlight" + desc = "A small flashlight. This one is green." + icon_state = "flashlight_green" + +/obj/item/device/flashlight/color/purple + name = "purple flashlight" + desc = "A small flashlight. This one is purple." + icon_state = "flashlight_purple" + /obj/item/device/flashlight/color/red name = "red flashlight" - desc = "A hand-held emergency light. This one is red." + desc = "A small flashlight. This one is red." icon_state = "flashlight_red" /obj/item/device/flashlight/color/orange name = "orange flashlight" - desc = "A hand-held emergency light. This one is orange." + desc = "A small flashlight. This one is orange." icon_state = "flashlight_orange" /obj/item/device/flashlight/color/yellow name = "yellow flashlight" - desc = "A hand-held emergency light. This one is yellow." + desc = "A small flashlight. This one is yellow." icon_state = "flashlight_yellow" /obj/item/device/flashlight/maglight @@ -273,7 +296,11 @@ w_class = ITEMSIZE_TINY power_use = 0 -// the desk lamps are a bit special +/* + * Lamps + */ + +// pixar desk lamp /obj/item/device/flashlight/lamp name = "desk lamp" desc = "A desk lamp with an adjustable mount." @@ -286,14 +313,6 @@ on = 1 light_system = STATIC_LIGHT - -// green-shaded desk lamp -/obj/item/device/flashlight/lamp/green - desc = "A classic green-shaded desk lamp." - icon_state = "lampgreen" - center_of_mass = list("x" = 15,"y" = 11) - light_color = "#FFC58F" - /obj/item/device/flashlight/lamp/verb/toggle_light() set name = "Toggle light" set category = "Object" @@ -302,7 +321,23 @@ if(!usr.stat) attack_self(usr) -// FLARES +// green-shaded desk lamp +/obj/item/device/flashlight/lamp/green + desc = "A classic green-shaded desk lamp." + icon_state = "lampgreen" + center_of_mass = list("x" = 15,"y" = 11) + light_color = "#FFC58F" + +// clown lamp +/obj/item/device/flashlight/lamp/clown + desc = "A whacky banana peel shaped lamp." + icon_state = "bananalamp" + center_of_mass = list("x" = 15,"y" = 11) + + +/* + * Flares + */ /obj/item/device/flashlight/flare name = "flare" @@ -368,18 +403,20 @@ START_PROCESSING(SSobj, src) return 1 -//Glowsticks +/* + * Chemlights + */ /obj/item/device/flashlight/glowstick name = "green glowstick" - desc = "A green military-grade glowstick." + desc = "A green military-grade chemical light." w_class = ITEMSIZE_SMALL light_system = MOVABLE_LIGHT light_range = 4 light_power = 0.9 light_color = "#49F37C" - icon_state = "glowstick" - item_state = "glowstick" + icon_state = "glowstick_green" + item_state = "glowstick_green" var/fuel = 0 power_use = 0 @@ -414,32 +451,45 @@ /obj/item/device/flashlight/glowstick/red name = "red glowstick" - desc = "A red military-grade glowstick." + desc = "A red military-grade chemical light." light_color = "#FC0F29" icon_state = "glowstick_red" item_state = "glowstick_red" /obj/item/device/flashlight/glowstick/blue name = "blue glowstick" - desc = "A blue military-grade glowstick." + desc = "A blue military-grade chemical light." light_color = "#599DFF" icon_state = "glowstick_blue" item_state = "glowstick_blue" /obj/item/device/flashlight/glowstick/orange name = "orange glowstick" - desc = "A orange military-grade glowstick." + desc = "A orange military-grade chemical light." light_color = "#FA7C0B" icon_state = "glowstick_orange" item_state = "glowstick_orange" /obj/item/device/flashlight/glowstick/yellow name = "yellow glowstick" - desc = "A yellow military-grade glowstick." + desc = "A yellow military-grade chemical light." light_color = "#FEF923" icon_state = "glowstick_yellow" item_state = "glowstick_yellow" +/obj/item/device/flashlight/glowstick/radioisotope + name = "radioisotope glowstick" + desc = "A radioisotope powered chemical light. Escaping particles light up the area far brighter on similar levels to flares and for longer" + icon_state = "glowstick_isotope" + item_state = "glowstick_isotope" + + light_range = 8 + light_power = 0.1 + light_color = "#49F37C" + +/* + * Slime Extract + */ /obj/item/device/flashlight/slime gender = PLURAL diff --git a/code/game/objects/items/devices/flashlight_vr.dm b/code/game/objects/items/devices/flashlight_vr.dm deleted file mode 100644 index 876dddc76d..0000000000 --- a/code/game/objects/items/devices/flashlight_vr.dm +++ /dev/null @@ -1,9 +0,0 @@ -/obj/item/device/flashlight/glowstick/radioisotope - name = "radioisotope glowstick" - desc = "A radioisotope powered glowstick. Escaping particles light up the area far brighter on similar levels to flares and for longer" - icon_state = "glowstick_blue" - item_state = "glowstick_blue" - - light_range = 8 - light_power = 0.1 - light_color = "#599DFF" diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index e62ac35ea8..bd80bf247e 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,43 @@ /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 + ) + +//Hydro +/obj/item/weapon/storage/toolbox/hydro + name = "hydroponic toolbox" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "green" + item_state_slots = list(slot_r_hand_str = "toolbox_green", slot_l_hand_str = "toolbox_green") + starts_with = list( + /obj/item/device/analyzer/plant_analyzer, + /obj/item/weapon/material/minihoe, + /obj/item/weapon/material/knife/machete/hatchet, + /obj/item/weapon/tool/wirecutters/clippers/trimmers, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/glass/beaker + ) + +/* + * 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 +170,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 +180,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 +190,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 +200,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 +210,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 +220,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 +230,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 0000000000..eedebe3220 --- /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 0d34937656..9da82688c3 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 b376c15af8..b846a0e294 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/weldingtool.dm b/code/game/objects/items/weapons/tools/weldingtool.dm index 34a824112c..ab673d3fc0 100644 --- a/code/game/objects/items/weapons/tools/weldingtool.dm +++ b/code/game/objects/items/weapons/tools/weldingtool.dm @@ -21,7 +21,7 @@ //R&D tech level origin_tech = list(TECH_ENGINEERING = 1) - + tool_qualities = list(TOOL_WELDER) //Welding tool specific stuff @@ -375,7 +375,7 @@ /obj/item/weapon/weldingtool/hugetank name = "upgraded welding tool" desc = "A much larger welder with a huge tank." - icon_state = "indwelder" + icon_state = "upindwelder" max_fuel = 80 w_class = ITEMSIZE_NORMAL origin_tech = list(TECH_ENGINEERING = 3) @@ -392,6 +392,9 @@ toolspeed = 2 eye_safety_modifier = 1 // Safer on eyes. +/obj/item/weapon/weldingtool/mini/two + icon_state = "miniwelder2" + /datum/category_item/catalogue/anomalous/precursor_a/alien_welder name = "Precursor Alpha Object - Self Refueling Exothermic Tool" desc = "An unwieldly tool which somewhat resembles a weapon, due to \ diff --git a/code/game/objects/items/weapons/tools/wirecutters.dm b/code/game/objects/items/weapons/tools/wirecutters.dm index a8f64d4f10..6e5973f0c3 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 052eae0d2c..634382ff11 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/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm index b9ebfd1dc0..3075c40415 100644 --- a/code/game/objects/random/mapping_vr.dm +++ b/code/game/objects/random/mapping_vr.dm @@ -8,14 +8,21 @@ /obj/random/empty_or_lootable_crate/item_to_spawn() return pick(/obj/random/crate, /obj/random/multiple/corp_crate) - + /obj/random/forgotten_tram name = "random forgotten tram item" desc = "Spawns a random item that someone might accidentally leave on a tram. Sometimes spawns nothing." spawn_nothing_percentage = 30 /obj/random/forgotten_tram/item_to_spawn() - return pick(prob(2);/obj/item/device/flashlight, + return pick( + prob(2);/obj/item/device/flashlight, + prob(2);/obj/item/device/flashlight/color, + prob(2);/obj/item/device/flashlight/color/green, + prob(2);/obj/item/device/flashlight/color/purple, + prob(2);/obj/item/device/flashlight/color/red, + prob(2);/obj/item/device/flashlight/color/orange, + prob(2);/obj/item/device/flashlight/color/yellow, prob(2);/obj/item/device/flashlight/glowstick, prob(2);/obj/item/device/flashlight/glowstick/blue, prob(1);/obj/item/device/flashlight/glowstick/orange, diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index 0d85609223..4726aa3a10 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -972,3 +972,21 @@ prob(5);/obj/item/weapon/storage/pouch/baton/full, prob(1);/obj/item/weapon/storage/pouch/holding ) + +/obj/random/flashlight + name = "Random Flashlight" + desc = "This is a random storage pouch." + icon = 'icons/obj/lighting.dmi' + icon_state = "random_flashlight" + +/obj/random/flashlight/item_to_spawn() + return pick( + prob(8);/obj/item/device/flashlight, + prob(6);/obj/item/device/flashlight/color, + prob(6);/obj/item/device/flashlight/color/green, + prob(6);/obj/item/device/flashlight/color/purple, + prob(6);/obj/item/device/flashlight/color/red, + prob(6);/obj/item/device/flashlight/color/orange, + prob(6);/obj/item/device/flashlight/color/yellow, + prob(2);/obj/item/device/flashlight/maglight + ) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index d185ca2608..ea12b86778 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -89,37 +89,37 @@ display_name = "flashlight" path = /obj/item/device/flashlight -/datum/gear/utility/flashlight_blue - display_name = "flashlight, blue" - path = /obj/item/device/flashlight/color - -/datum/gear/utility/flashlight_orange - display_name = "flashlight, orange" - path = /obj/item/device/flashlight/color/orange - -/datum/gear/utility/flashlight_red - display_name = "flashlight, red" - path = /obj/item/device/flashlight/color/red - -/datum/gear/utility/flashlight_yellow - display_name = "flashlight, yellow" - path = /obj/item/device/flashlight/color/yellow - /datum/gear/utility/maglight display_name = "flashlight, maglight" path = /obj/item/device/flashlight/maglight cost = 2 +/datum/gear/utility/flashlight/color + display_name = "flashlight, small (selection)" + path = /obj/item/device/flashlight/color + +/datum/gear/utility/flashlight/color/New() + ..() + var/list/flashlights = list( + "Blue Flashlight" = /obj/item/device/flashlight/color, + "Red Flashlight" = /obj/item/device/flashlight/color/red, + "Green Flashlight" = /obj/item/device/flashlight/color/green, + "Yellow Flashlight" = /obj/item/device/flashlight/color/yellow, + "Purple Flashlight" = /obj/item/device/flashlight/color/purple, + "Orange Flashlight" = /obj/item/device/flashlight/color/orange + ) + gear_tweaks += new/datum/gear_tweak/path(flashlights) + /datum/gear/utility/battery display_name = "cell, device" path = /obj/item/weapon/cell/device /datum/gear/utility/pen - display_name = "Fountain Pen" + display_name = "fountain pen" path = /obj/item/weapon/pen/fountain /datum/gear/utility/umbrella - display_name = "Umbrella" + display_name = "umbrella" path = /obj/item/weapon/melee/umbrella cost = 3 @@ -131,7 +131,7 @@ display_name = "wheelchair selection" path = /obj/item/wheelchair cost = 4 - + /datum/gear/utility/wheelchair/New() ..() gear_tweaks += gear_tweak_free_color_choice diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 327eb3b9ce..17b80b78a5 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 75d2c9ac51..f8b95c18bc 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi index 20c744e0a0..99362c782d 100644 Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 84fdd7be13..ededfc4b50 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi index 2975e65409..31181de6c7 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 dbc403ce40..f81d8a42d6 100644 Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ diff --git a/icons/obj/tools_vr.dmi b/icons/obj/tools_vr.dmi index c49a991ff9..05de9a423a 100644 Binary files a/icons/obj/tools_vr.dmi and b/icons/obj/tools_vr.dmi differ diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 9f685e9b55..1ea3e6f625 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2850,6 +2850,18 @@ dir = 10 }, /obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "aeE" = ( @@ -3359,9 +3371,6 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 4 }, @@ -3577,6 +3586,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "afN" = ( @@ -3589,6 +3603,11 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "afO" = ( @@ -17402,21 +17421,9 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "aCg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, @@ -32164,6 +32171,38 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +<<<<<<< HEAD +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +"cwS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +======= +"ctE" = ( +/obj/structure/table/rack, +/obj/item/weapon/tank/emergency, +/obj/item/weapon/tank/emergency, +/obj/item/weapon/tank/emergency, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) +"cwS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz "cAR" = ( /turf/simulated/floor/looking_glass/center, /area/looking_glass/lg_1) @@ -32421,6 +32460,20 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) +"dvU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/lowernorthhall) "dxY" = ( /obj/structure/table/rack, /obj/item/clothing/mask/gas, @@ -32528,6 +32581,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"dNE" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) "dNP" = ( /obj/machinery/door/airlock/silver{ name = "Clown's Office"; @@ -32785,6 +32844,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) +"eJc" = ( +/obj/item/weapon/storage/toolbox/brass, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "eJQ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -34066,6 +34129,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"jkI" = ( +/obj/structure/table/rack/shelf, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) "jnj" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -34970,6 +35039,24 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +<<<<<<< HEAD +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +"lEA" = ( +/turf/simulated/wall, +/area/maintenance/engineering/atmos/airlock/gas) +======= +"lEA" = ( +/turf/simulated/wall, +/area/maintenance/engineering/atmos/airlock/gas) +"lEB" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz "lIj" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, @@ -35362,6 +35449,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "mGP" = ( @@ -36587,6 +36680,40 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/lowerhall) +<<<<<<< HEAD +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +"qtU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/atmos/airlock/gas) +======= +"qtC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/lowernorthhall) +"qtU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/engineering/atmos/airlock/gas) +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz "qwm" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -36621,7 +36748,39 @@ pixel_x = -24 }, /turf/simulated/wall, +<<<<<<< HEAD /area/maintenance/substation/cargostoresubstation) +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +/area/maintenance/substation/surfaceservicesubstation) +"qEW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/funny/clownoffice) +======= +/area/maintenance/substation/surfaceservicesubstation) +"qEW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/tether/surfacebase/funny/clownoffice) +"qJe" = ( +/obj/structure/table/rack/shelf, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz "qJl" = ( /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, @@ -36888,6 +37047,13 @@ /obj/item/weapon/bedsheet/mimedouble, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) +"rtV" = ( +/obj/random/maintenance/medical, +/obj/structure/table/rack, +/obj/random/maintenance/cargo, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) "ruj" = ( /obj/machinery/door/airlock/silver{ name = "Mime's Office"; @@ -37213,6 +37379,10 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) +"syt" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) "szT" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -37259,6 +37429,33 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +<<<<<<< HEAD +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +"sHK" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/funny/mimeoffice) +======= +"sGh" = ( +/obj/structure/table/rack/shelf, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/maintenance/cargo, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) +"sHK" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/funny/mimeoffice) +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz "sHO" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 @@ -37325,6 +37522,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) +"sYi" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "tak" = ( /obj/structure/table/steel, /obj/structure/cable/green{ @@ -37341,6 +37542,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"tcK" = ( +/obj/item/clothing/suit/storage/hooded/wintercoat/ratvar, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "tdg" = ( /turf/simulated/mineral, /area/maintenance/lowmedbaymaint) @@ -37415,6 +37620,20 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"tAo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/lowernorthhall) "tAT" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -37645,6 +37864,16 @@ }, /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) +"ucq" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/tether/surfacebase/lowernorthhall) "ucv" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_security{ @@ -37662,6 +37891,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/lowerhall) +"udU" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/lowmedbaymaint) "uge" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -38181,7 +38414,73 @@ }, /turf/simulated/wall, /area/maintenance/substation/surfaceservicesubstation) +<<<<<<< HEAD >>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +"wjo" = ( +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "atmoslockdown"; + layer = 1; + name = "Atmospherics Lockdown"; + opacity = 0; + open_layer = 1 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "atmos_airlock_outer"; + locked = 1 + }, +/obj/machinery/access_button/airlock_exterior{ + dir = 8; + master_tag = "atmos_airlock"; + pixel_x = -8; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/engineering/atmos/airlock) +======= +"wjd" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) +"wjo" = ( +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "atmoslockdown"; + layer = 1; + name = "Atmospherics Lockdown"; + opacity = 0; + open_layer = 1 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1379; + icon_state = "door_locked"; + id_tag = "atmos_airlock_outer"; + locked = 1 + }, +/obj/machinery/access_button/airlock_exterior{ + dir = 8; + master_tag = "atmos_airlock"; + pixel_x = -8; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/engineering/atmos/airlock) +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz "wjq" = ( /obj/structure/bed/chair{ dir = 4 @@ -38451,6 +38750,9 @@ }, /turf/simulated/floor/tiled/freezer, /area/tether/surfacebase/security/brig/bathroom) +"xfm" = ( +/turf/simulated/floor/tiled/steel_dirty, +/area/maintenance/lowmedbaymaint) "xgQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -46700,6 +47002,7 @@ aad aad aad aad +<<<<<<< HEAD aad aah gCa @@ -46762,6 +47065,163 @@ aDg aGo aGX awn +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +aaa +"} +(80,1,1) = {" +aqR +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aAD +aAD +aAD +aAD +aAI +aAI +aAI +aef +aeZ +afN +aBA +aCr +aCr +aCr +aCr +aCr +aGa +aGa +aGa +aHV +aGa +aGa +aGa +agM +aja +afh +agM +agM +agM +aqI +agM +agM +agM +asa +agM +asM +agM +aqI +agM +agM +agM +agM +agM +agM +abc +sQB +byP +agM +aBO +aBO +aBO +aBO +aEz +aFl +======= +aaa +"} +(80,1,1) = {" +aqR +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aAD +aAD +aAD +aAD +sGh +qJe +jkI +aef +aeZ +afN +aBA +aCr +aCr +aCr +aCr +aCr +aGa +aGa +aGa +aHV +aGa +aGa +aGa +agM +aja +afh +agM +agM +agM +aqI +agM +agM +agM +asa +agM +asM +agM +aqI +agM +agM +agM +agM +agM +agM +abc +sQB +byP +agM +aBO +aBO +aBO +aBO +aEz +aFl +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz aBO aBO aBO @@ -46818,6 +47278,250 @@ aad aad aad aad +<<<<<<< HEAD +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +aaa +"} +(81,1,1) = {" +aqR +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aAD +aAI +aAI +aAI +aAI +aAI +aAI +aef +aeS +afO +aBB +aCr +aDa +aDU +aEj +aCr +aGb +aGK +aHr +aIq +aJU +aLt +aGa +anD +anU +afp +aoP +apz +aqd +aqJ +arf +arx +arN +aqd +asr +asN +atk +atM +aus +auN +avm +avV +jDg +wUW +abh +abk +osh +agM +aah +aah +aah +aBO +aEw +aFl +aBO +aah +aBO +aHC +aIh +aIV +aJN +aJI +aJI +aJI +aMs +aNa +aJI +aJI +aJI +aJI +aJI +aNZ +aQy +aNa +aJI +aMm +aSM +aTo +aTS +aTS +aIh +aTZ +aEx +aVn +aWc +aWc +aWc +aWA +aHd +aYb +aYb +aHZ +aHZ +aYb +aYb +aZY +aYd +======= +aaa +"} +(81,1,1) = {" +aqR +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aAD +udU +sYi +aAD +xfm +syt +xfm +aef +aeS +tAo +aBB +aCr +aDa +aDU +aEj +aCr +aGb +aGK +aHr +aIq +aJU +aLt +aGa +anD +anU +afp +aoP +apz +aqd +aqJ +arf +arx +arN +aqd +asr +asN +atk +atM +aus +auN +avm +avV +jDg +wUW +abh +abk +osh +agM +aah +aah +aah +aBO +aEw +aFl +aBO +aah +aBO +aHC +aIh +aIV +aJN +aJI +aJI +aJI +aMs +aNa +aJI +aJI +aJI +aJI +aJI +aNZ +aQy +aNa +aJI +aMm +aSM +aTo +aTS +aTS +aIh +aTZ +aEx +aVn +aWc +aWc +aWc +aWA +aHd +aYb +aYb +aHZ +aHZ +aYb +aYb +aZY +aYd +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz aad aad aad @@ -46844,6 +47548,7 @@ aad aad aad aad +<<<<<<< HEAD gCa gCa ucv @@ -46907,6 +47612,151 @@ aHt aBN aIa aBO +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +aaa +"} +(82,1,1) = {" +aqR +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aAD +aAI +aAI +aAI +aAI +aAI +aAI +aef +aeS +afO +aBC +aCr +aDb +aDV +aEk +aCr +aGc +aGL +aHs +aIs +aKb +aLu +aGa +aic +anV +aoh +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +asb +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +xAT +aoQ +tvk +abl +ghr +agM +======= +aaa +"} +(82,1,1) = {" +aqR +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aAD +tcK +aAI +aAD +rtV +ctE +lEB +ucq +qtC +dvU +aBC +aCr +aDb +aDV +aEk +aCr +aGc +aGL +aHs +aIs +aKb +aLu +aGa +aic +anV +aoh +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +asb +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +aoQ +xAT +aoQ +tvk +abl +ghr +agM +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz aah aah aah @@ -46967,8 +47817,258 @@ aad aad aaa "} +<<<<<<< HEAD (58,1,1) = {" aaa +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +(83,1,1) = {" +aqR +aaf +aaf +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aaf +aag +aaf +aaf +aAD +aAI +aAI +aAI +aAI +aAI +aAI +aef +afi +afQ +bca +aCr +aDs +aDW +aEl +aFc +aGe +aGM +aHz +aIA +aKc +aLZ +baX +aid +goJ +aoi +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoi +awH +oQm +gVe +lNt +mon +agM +aah +aah +aah +aBO +aAY +aFl +aBO +aah +aBO +aHC +aIh +aIX +aJO +aKw +aLd +aLJ +aMr +aNc +aNK +aOf +aOf +aOf +aOf +aNZ +aQB +aRe +aRJ +aSe +aSO +aTr +aer +aTZ +aTZ +aTZ +aTZ +aVn +aWe +aWd +aWc +aWA +aXG +aXk +aWA +aWA +aWA +aWA +aXk +aWc +aWc +aWc +bas +baU +baU +aad +======= +(83,1,1) = {" +aqR +aaf +aaf +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aae +aaf +aag +aaf +aaf +aAD +eJc +udU +aAD +syt +dNE +wjd +aef +afi +afQ +bca +aCr +aDs +aDW +aEl +aFc +aGe +aGM +aHz +aIA +aKc +aLZ +baX +aid +goJ +aoi +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoj +aoi +awH +oQm +gVe +lNt +mon +agM +aah +aah +aah +aBO +aAY +aFl +aBO +aah +aBO +aHC +aIh +aIX +aJO +aKw +aLd +aLJ +aMr +aNc +aNK +aOf +aOf +aOf +aOf +aNZ +aQB +aRe +aRJ +aSe +aSO +aTr +aer +aTZ +aTZ +aTZ +aTZ +aVn +aWe +aWd +aWc +aWA +aXG +aXk +aWA +aWA +aWA +aWA +aXk +aWc +aWc +aWc +bas +baU +baU +aad +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz aad aad aad @@ -48533,6 +49633,222 @@ asS aaa aad aad +<<<<<<< HEAD +||||||| parent of 18fa28a431... Merge pull request #11698 from GhostActual/toolz +aan +abj +acm +acU +adA +aan +aBn +lbu +axL +adc +adS +aeU +afs +aeD +aCg +mGH +aDH +mGH +aEX +aFv +aGw +aGV +aHU +aJT +tRA +igw +bbf +ago +anY +aok +aok +aok +aok +aok +aok +aok +aok +ase +aok +aok +aok +sEz +aut +aut +avn +avW +awJ +avW +kgk +mSz +qhq +oib +agM +aCJ +aCJ +aCJ +aCJ +aCJ +aCJ +agM +agM +agM +aIm +aJf +aJQ +aKC +aLg +aLM +aLM +aLM +aLg +aOk +aOk +aOk +aOj +aQc +aQc +aQc +aQb +aSj +aSj +aSj +aSi +aUc +aUc +aUc +aVr +aUc +aUc +aUc +aUb +aXt +aXO +aYh +aHE +aIj +aZo +aZC +aZC +aVp +aWu +aZQ +baS +baU +baU +aah +======= +aan +abj +acm +acU +adA +aan +aBn +lbu +axL +adc +adS +aeU +afs +aeD +aCg +mGH +aDH +adx +aEX +aFv +aGw +aGV +aHU +aJT +tRA +igw +bbf +ago +anY +aok +aok +aok +aok +aok +aok +aok +aok +ase +aok +aok +aok +sEz +aut +aut +avn +avW +awJ +avW +kgk +mSz +qhq +oib +agM +aCJ +aCJ +aCJ +aCJ +aCJ +aCJ +agM +agM +agM +aIm +aJf +aJQ +aKC +aLg +aLM +aLM +aLM +aLg +aOk +aOk +aOk +aOj +aQc +aQc +aQc +aQb +aSj +aSj +aSj +aSi +aUc +aUc +aUc +aVr +aUc +aUc +aUc +aUb +aXt +aXO +aYh +aHE +aIj +aZo +aZC +aZC +aVp +aWu +aZQ +baS +baU +baU +aah +>>>>>>> 18fa28a431... Merge pull request #11698 from GhostActual/toolz aad aad aad diff --git a/vorestation.dme b/vorestation.dme index bea44f2300..fcedb19a20 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1230,7 +1230,6 @@ #include "code\game\objects\items\devices\flash.dm" #include "code\game\objects\items\devices\flash_vr.dm" #include "code\game\objects\items\devices\flashlight.dm" -#include "code\game\objects\items\devices\flashlight_vr.dm" #include "code\game\objects\items\devices\floor_painter.dm" #include "code\game\objects\items\devices\geiger.dm" #include "code\game\objects\items\devices\gps.dm" @@ -1497,6 +1496,7 @@ #include "code\game\objects\items\weapons\tanks\tank_types.dm" #include "code\game\objects\items\weapons\tanks\tank_types_vr.dm" #include "code\game\objects\items\weapons\tanks\tanks.dm" +#include "code\game\objects\items\weapons\tools\brass.dm" #include "code\game\objects\items\weapons\tools\crowbar.dm" #include "code\game\objects\items\weapons\tools\crowbar_vr.dm" #include "code\game\objects\items\weapons\tools\screwdriver.dm"