From c322096905e7a483480156defb687ea194c27e00 Mon Sep 17 00:00:00 2001 From: uomo91 Date: Fri, 17 Apr 2020 20:16:10 -0500 Subject: [PATCH 1/2] Fixes "thats". --- _maps/RandomZLevels/caves.dmm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index ebb73f030d3..f340486e9e9 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -637,7 +637,7 @@ }, /obj/item/pickaxe{ attack_verb = list("ineffectively hit"); - desc = "A pickaxe thats been left to rust."; + desc = "A pickaxe that's been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; @@ -897,7 +897,7 @@ "cQ" = ( /obj/item/pickaxe{ attack_verb = list("ineffectively hit"); - desc = "A pickaxe thats been left to rust."; + desc = "A pickaxe that's been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; @@ -1099,7 +1099,7 @@ /obj/structure/closet/secure_closet/personal, /obj/item/pickaxe{ attack_verb = list("ineffectively hit"); - desc = "A pickaxe thats been left to rust."; + desc = "A pickaxe that's been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; @@ -1494,7 +1494,7 @@ /obj/structure/table, /obj/item/pickaxe{ attack_verb = list("ineffectively hit"); - desc = "A pickaxe thats been left to rust."; + desc = "A pickaxe that's been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; @@ -1502,7 +1502,7 @@ }, /obj/item/pickaxe{ attack_verb = list("ineffectively hit"); - desc = "A pickaxe thats been left to rust."; + desc = "A pickaxe that's been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; @@ -1874,7 +1874,7 @@ }, /obj/item/pickaxe{ attack_verb = list("ineffectively hit"); - desc = "A pickaxe thats been left to rust."; + desc = "A pickaxe that's been left to rust."; force = 1; name = "rusty pickaxe"; pixel_x = 5; From e573878ff329351a8ba95c369ce1c415426ef127 Mon Sep 17 00:00:00 2001 From: spookydonut Date: Fri, 24 Apr 2020 01:07:40 +0800 Subject: [PATCH 2/2] /obj/item/pickaxe/rusted --- _maps/RandomZLevels/caves.dmm | 54 +++++-------------- code/modules/mining/equipment/mining_tools.dm | 7 +++ 2 files changed, 19 insertions(+), 42 deletions(-) diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index f340486e9e9..f87cfc978e2 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -635,13 +635,8 @@ /obj/structure/closet/crate/miningcar{ name = "Mining cart" }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe that's been left to rust."; - force = 1; - name = "rusty pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/rusted{ + pixel_x = 5 }, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" @@ -895,13 +890,8 @@ }, /area/awaymission/caves/research) "cQ" = ( -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe that's been left to rust."; - force = 1; - name = "rusty pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/rusted{ + pixel_x = 5 }, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" @@ -1097,13 +1087,8 @@ /area/awaymission/caves/BMP_asteroid/level_two) "ds" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe that's been left to rust."; - force = 1; - name = "rusty pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/rusted{ + pixel_x = 5 }, /turf/open/floor/plasteel, /area/awaymission/caves/BMP_asteroid/level_two) @@ -1492,21 +1477,11 @@ /area/awaymission/caves/listeningpost) "eP" = ( /obj/structure/table, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe that's been left to rust."; - force = 1; - name = "rusty pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/rusted{ + pixel_x = 5 }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe that's been left to rust."; - force = 1; - name = "rusty pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/rusted{ + pixel_x = 5 }, /turf/open/floor/plasteel, /area/awaymission/caves/listeningpost) @@ -1872,13 +1847,8 @@ /obj/structure/closet/crate/miningcar{ name = "Mining cart" }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe that's been left to rust."; - force = 1; - name = "rusty pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/rusted{ + pixel_x = 5 }, /obj/item/stack/sheet/mineral/adamantine{ amount = 15 diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index d1c3b3421f1..3c6c6f1732f 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -24,6 +24,13 @@ user.visible_message("[user] couldn't do it!") return SHAME +/obj/item/pickaxe/rusted + name = "rusty pickaxe" + desc = "A pickaxe that's been left to rust." + attack_verb = list("ineffectively hit") + force = 1 + throwforce = 1 + /obj/item/pickaxe/mini name = "compact pickaxe" desc = "A smaller, compact version of the standard pickaxe."