Merge pull request #5084 from FuzzyFuzlet/tool-revamp

tooooools
ARF-SS13 · Apr 30, 2024 · acb859c · acb859c
2 parents 633268d + 0c66682
commit acb859c
Show file tree

Hide file tree

Showing 47 changed files with 690 additions and 521 deletions.
diff --git a/_maps/map_files/Fortress Nash/FortNashLower.dmm b/_maps/map_files/Fortress Nash/FortNashLower.dmm
@@ -14367,7 +14367,7 @@
 	},
 /area/f13/building/sewers)
 "jNb" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "jNq" = (
@@ -17427,8 +17427,8 @@
 	icon_state = "mattress2";
 	pixel_y = 7
 	},
-/obj/item/crowbar/basic,
-/obj/item/screwdriver/basic,
+/obj/item/crowbar/crude,
+/obj/item/screwdriver/crude,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13{
 	icon_state = "darkrusty"
@@ -21611,7 +21611,7 @@
 	},
 /area/f13/building/sewers)
 "pyr" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm
@@ -8862,10 +8862,10 @@
 /area/f13/building/sewers)
 "esu" = (
 /obj/structure/table/wood,
-/obj/item/wrench/basic,
-/obj/item/screwdriver/basic,
-/obj/item/crowbar/basic,
-/obj/item/weldingtool/basic,
+/obj/item/wrench/crude,
+/obj/item/screwdriver/crude,
+/obj/item/crowbar/crude,
+/obj/item/weldingtool/crude,
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/caves)
 "esI" = (
@@ -16255,7 +16255,7 @@
 	},
 /area/f13/building/sewers)
 "jNb" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "jNl" = (
@@ -19735,8 +19735,8 @@
 	icon_state = "mattress2";
 	pixel_y = 7
 	},
-/obj/item/crowbar/basic,
-/obj/item/screwdriver/basic,
+/obj/item/crowbar/crude,
+/obj/item/screwdriver/crude,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13{
 	icon_state = "darkrusty"
@@ -24402,7 +24402,7 @@
 	},
 /area/f13/building/sewers)
 "pyr" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,

diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm
@@ -4951,8 +4951,8 @@
 /area/f13/village)
 "bZk" = (
 /obj/structure/rack,
-/obj/item/crowbar/basic,
-/obj/item/wrench/basic,
+/obj/item/crowbar/crude,
+/obj/item/wrench/crude,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "verticalrightborderright0"
 	},
@@ -7088,10 +7088,10 @@
 /area/f13/building)
 "cYR" = (
 /obj/structure/rack,
-/obj/item/weldingtool/basic{
+/obj/item/weldingtool/crude{
 	pixel_x = 2
 	},
-/obj/item/screwdriver/basic,
+/obj/item/screwdriver/crude,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "verticalrightborderright0"
 	},
@@ -52872,7 +52872,7 @@
 "wNK" = (
 /obj/structure/rack,
 /obj/item/stack/cable_coil/ten,
-/obj/item/wirecutters/basic,
+/obj/item/wirecutters/crude,
 /turf/open/indestructible/ground/outside/sidewalk{
 	dir = 4;
 	icon_state = "outerbordercorner"
@@ -54354,7 +54354,7 @@
 /turf/open/water,
 /area/f13/caves)
 "xth" = (
-/obj/item/wirecutters/basic,
+/obj/item/wirecutters/crude,
 /obj/item/screwdriver/crude,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Nash 3.0 WIP/Pahrump-Sunset - Copy.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Nash 3.0 WIP/Pahrump-Sunset - Copy.dmm
@@ -15389,7 +15389,7 @@
 	icon_state = "crowbar";
 	name = "chest-opener"
 	},
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/surgicaldrill{
 	icon = 'icons/obj/tools.dmi';
 	icon_state = "drill_screw"
@@ -45642,7 +45642,7 @@
 /obj/item/wrench,
 /obj/item/screwdriver,
 /obj/item/crowbar,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/clothing/head/welding/f13/fire,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderchest,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderhead,
@@ -85875,7 +85875,7 @@
 	},
 /obj/item/clothing/head/welding/f13,
 /obj/item/clothing/head/welding/f13,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/weldingtool/mini,
 /obj/effect/spawner/lootdrop/f13/common,
 /turf/open/indestructible/ground/outside/sidewalk{

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Nash 3.0 WIP/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Nash 3.0 WIP/Pahrump-Sunset.dmm
@@ -15389,7 +15389,7 @@
 	icon_state = "crowbar";
 	name = "chest-opener"
 	},
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/surgicaldrill{
 	icon = 'icons/obj/tools.dmi';
 	icon_state = "drill_screw"
@@ -45642,7 +45642,7 @@
 /obj/item/wrench,
 /obj/item/screwdriver,
 /obj/item/crowbar,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/clothing/head/welding/f13/fire,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderchest,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderhead,
@@ -85875,7 +85875,7 @@
 	},
 /obj/item/clothing/head/welding/f13,
 /obj/item/clothing/head/welding/f13,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/weldingtool/mini,
 /obj/effect/spawner/lootdrop/f13/common,
 /turf/open/indestructible/ground/outside/sidewalk{

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Nash 3.0 WIP/catle nash (2).dmm b/_maps/map_files/Pahrump-Sunset - Backup/Nash 3.0 WIP/catle nash (2).dmm
@@ -15410,7 +15410,7 @@
 	icon_state = "crowbar";
 	name = "chest-opener"
 	},
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/surgicaldrill{
 	icon = 'icons/obj/tools.dmi';
 	icon_state = "drill_screw"
@@ -45662,7 +45662,7 @@
 /obj/item/wrench,
 /obj/item/screwdriver,
 /obj/item/crowbar,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/clothing/head/welding/f13/fire,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderchest,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderhead,
@@ -85855,7 +85855,7 @@
 	},
 /obj/item/clothing/head/welding/f13,
 /obj/item/clothing/head/welding/f13,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/weldingtool/mini,
 /obj/effect/spawner/lootdrop/f13/common,
 /turf/open/indestructible/ground/outside/sidewalk{

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Lower.dmm
@@ -15323,7 +15323,7 @@
 	},
 /area/f13/building/sewers)
 "jNb" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "jNl" = (
@@ -18366,8 +18366,8 @@
 	icon_state = "mattress2";
 	pixel_y = 7
 	},
-/obj/item/crowbar/basic,
-/obj/item/screwdriver/basic,
+/obj/item/crowbar/crude,
+/obj/item/screwdriver/crude,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13{
 	icon_state = "darkrusty"
@@ -22466,7 +22466,7 @@
 	},
 /area/f13/building/sewers)
 "pyr" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,

diff --git a/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm b/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm
@@ -35641,7 +35641,7 @@
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
 "rmW" = (
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
 "rne" = (

diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset - Outdated.dmm
@@ -5013,8 +5013,8 @@
 /area/f13/village)
 "bZk" = (
 /obj/structure/rack,
-/obj/item/crowbar/basic,
-/obj/item/wrench/basic,
+/obj/item/crowbar/crude,
+/obj/item/wrench/crude,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "verticalrightborderright0"
 	},
@@ -7170,10 +7170,10 @@
 /area/f13/building)
 "cYR" = (
 /obj/structure/rack,
-/obj/item/weldingtool/basic{
+/obj/item/weldingtool/crude{
 	pixel_x = 2
 	},
-/obj/item/screwdriver/basic,
+/obj/item/screwdriver/crude,
 /turf/open/indestructible/ground/outside/sidewalk{
 	icon_state = "verticalrightborderright0"
 	},
@@ -53687,7 +53687,7 @@
 "wNK" = (
 /obj/structure/rack,
 /obj/item/stack/cable_coil/ten,
-/obj/item/wirecutters/basic,
+/obj/item/wirecutters/crude,
 /turf/open/indestructible/ground/outside/sidewalk{
 	dir = 4;
 	icon_state = "outerbordercorner"
@@ -55217,7 +55217,7 @@
 /turf/open/water,
 /area/f13/caves)
 "xth" = (
-/obj/item/wirecutters/basic,
+/obj/item/wirecutters/crude,
 /obj/item/screwdriver/crude,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/caves)

diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm
@@ -6942,7 +6942,7 @@
 /turf/open/floor/carpet/black,
 /area/f13/enclave)
 "dSg" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -16292,7 +16292,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
 /area/f13/bunker)
 "jnf" = (
-/obj/item/wirecutters/basic,
+/obj/item/wirecutters/crude,
 /obj/item/screwdriver/crude,
 /obj/structure/table/wood,
 /obj/item/storage/box/handcuffs,
@@ -35157,8 +35157,8 @@
 	icon_state = "mattress2";
 	pixel_y = 7
 	},
-/obj/item/crowbar/basic,
-/obj/item/screwdriver/basic,
+/obj/item/crowbar/crude,
+/obj/item/screwdriver/crude,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13{
 	icon_state = "darkrusty"

diff --git a/_maps/map_files/coyote_bayou/Ashdown.dmm b/_maps/map_files/coyote_bayou/Ashdown.dmm
@@ -53749,7 +53749,7 @@
 "xLY" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/item/storage/toolbox/mechanical,
-/obj/item/screwdriver/basic,
+/obj/item/screwdriver/crude,
 /turf/open/floor/f13{
 	icon_state = "cafeteria"
 	},

diff --git a/_maps/map_files/coyote_bayou/Backup Nash/Nash_and_Texarkana.dmm b/_maps/map_files/coyote_bayou/Backup Nash/Nash_and_Texarkana.dmm
@@ -16100,7 +16100,7 @@
 	icon_state = "crowbar";
 	name = "chest-opener"
 	},
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/surgicaldrill{
 	icon = 'icons/obj/tools.dmi';
 	icon_state = "drill_screw"
@@ -53005,7 +53005,7 @@
 /obj/item/wrench,
 /obj/item/screwdriver,
 /obj/item/crowbar,
-/obj/item/weldingtool/basic,
+/obj/item/weldingtool/crude,
 /obj/item/clothing/head/welding/f13/fire,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderchest,
 /obj/effect/spawner/lootdrop/f13/armor/randomraiderhead,

diff --git a/_maps/map_files/coyote_bayou/Backup Nash/Texarkana_underground.dmm b/_maps/map_files/coyote_bayou/Backup Nash/Texarkana_underground.dmm
@@ -9408,10 +9408,10 @@
 /area/f13/building/sewers)
 "esu" = (
 /obj/structure/table/wood,
-/obj/item/wrench/basic,
-/obj/item/screwdriver/basic,
-/obj/item/crowbar/basic,
-/obj/item/weldingtool/basic,
+/obj/item/wrench/crude,
+/obj/item/screwdriver/crude,
+/obj/item/crowbar/crude,
+/obj/item/weldingtool/crude,
 /turf/open/floor/wood_common/wood_common_dark,
 /area/f13/caves)
 "esG" = (
@@ -17982,7 +17982,7 @@
 	},
 /area/f13/building/sewers)
 "jNb" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "jNl" = (
@@ -21919,8 +21919,8 @@
 	icon_state = "mattress2";
 	pixel_y = 7
 	},
-/obj/item/crowbar/basic,
-/obj/item/screwdriver/basic,
+/obj/item/crowbar/crude,
+/obj/item/screwdriver/crude,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/f13{
 	icon_state = "darkrusty"
@@ -27459,7 +27459,7 @@
 /turf/open/floor/plasteel/f13/vault_floor/misc/bar,
 /area/f13/caves)
 "pyr" = (
-/obj/item/wrench/basic,
+/obj/item/wrench/crude,
 /obj/machinery/light/small,
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,