From f7682a2627d064563d53176a53e8e6badd508904 Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Fri, 31 May 2019 18:58:57 +0200 Subject: [PATCH] Add safety pickaxes to Lavaland --- _maps/map_files/generic/Lavaland.dmm | 8 ++-- _maps/map_files/generic/z5.dmm | 72 +++++++--------------------- code/modules/mining/mine_items.dm | 25 +++++++--- 3 files changed, 39 insertions(+), 66 deletions(-) diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm index 69405d23205..96b460ea36b 100644 --- a/_maps/map_files/generic/Lavaland.dmm +++ b/_maps/map_files/generic/Lavaland.dmm @@ -112,8 +112,8 @@ "au" = ( /obj/structure/rack, /obj/item/storage/bag/ore, -/obj/item/pickaxe, -/obj/item/flashlight, +/obj/item/pickaxe/safety, +/obj/item/flashlight/lantern, /obj/item/clothing/glasses/meson, /obj/item/mining_scanner, /turf/simulated/floor/plasteel, @@ -121,8 +121,8 @@ "av" = ( /obj/structure/rack, /obj/item/storage/bag/ore, -/obj/item/flashlight, -/obj/item/pickaxe, +/obj/item/flashlight/lantern, +/obj/item/pickaxe/safety, /obj/item/clothing/glasses/meson, /obj/item/mining_scanner, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/generic/z5.dmm b/_maps/map_files/generic/z5.dmm index 465bf0bdaa0..99e23f4c9d4 100644 --- a/_maps/map_files/generic/z5.dmm +++ b/_maps/map_files/generic/z5.dmm @@ -1612,21 +1612,11 @@ /obj/item/clothing/glasses/meson, /obj/item/flashlight, /obj/item/storage/bag/ore, -/obj/item/shovel{ - attack_verb = list("ineffectively hit"); - desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon."; - force = 1; - name = "safety shovel"; - pixel_x = -5; - throwforce = 1 +/obj/item/shovel/safety{ + pixel_x = -5 }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon."; - force = 1; - name = "safety pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/safety{ + pixel_x = 5 }, /obj/item/radio/intercom/locked/prison{ pixel_y = 25 @@ -1642,21 +1632,11 @@ /obj/item/clothing/glasses/meson, /obj/item/flashlight, /obj/item/storage/bag/ore, -/obj/item/shovel{ - attack_verb = list("ineffectively hit"); - desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon."; - force = 1; - name = "safety shovel"; - pixel_x = -5; - throwforce = 1 +/obj/item/shovel/safety{ + pixel_x = -5 }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon."; - force = 1; - name = "safety pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/safety{ + pixel_x = 5 }, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -1669,21 +1649,11 @@ /obj/item/clothing/glasses/meson, /obj/item/flashlight, /obj/item/storage/bag/ore, -/obj/item/shovel{ - attack_verb = list("ineffectively hit"); - desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon."; - force = 1; - name = "safety shovel"; - pixel_x = -5; - throwforce = 1 +/obj/item/shovel/safety{ + pixel_x = -5 }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon."; - force = 1; - name = "safety pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/safety{ + pixel_x = 5 }, /obj/machinery/status_display{ density = 0; @@ -1702,21 +1672,11 @@ /obj/item/clothing/glasses/meson, /obj/item/flashlight, /obj/item/storage/bag/ore, -/obj/item/shovel{ - attack_verb = list("ineffectively hit"); - desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon."; - force = 1; - name = "safety shovel"; - pixel_x = -5; - throwforce = 1 +/obj/item/shovel/safety{ + pixel_x = -5 }, -/obj/item/pickaxe{ - attack_verb = list("ineffectively hit"); - desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon."; - force = 1; - name = "safety pickaxe"; - pixel_x = 5; - throwforce = 1 +/obj/item/pickaxe/safety{ + pixel_x = 5 }, /obj/machinery/camera{ c_tag = "Labor Camp Storage"; diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 72b36bd38a5..796cf1ce8f5 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -93,8 +93,8 @@ icon_state = "pickaxe" flags = CONDUCT slot_flags = SLOT_BELT - force = 15.0 - throwforce = 10.0 + force = 15 + throwforce = 10 item_state = "pickaxe" w_class = WEIGHT_CLASS_BULKY materials = list(MAT_METAL=2000) //one sheet, but where can you make them? @@ -114,6 +114,13 @@ name = "emergency disembarkation tool" desc = "For extracting yourself from rough landings." +/obj/item/pickaxe/safety + name = "safety pickaxe" + desc = "A pickaxe designed to be only effective at digging rock and ore, very ineffective as a weapon." + force = 1 + throwforce = 1 + attack_verb = list("ineffectively hit") + /obj/item/pickaxe/silver name = "silver-plated pickaxe" icon_state = "spickaxe" @@ -193,8 +200,8 @@ icon_state = "shovel" flags = CONDUCT slot_flags = SLOT_BELT - force = 8.0 - throwforce = 4.0 + force = 8 + throwforce = 4 item_state = "shovel" w_class = WEIGHT_CLASS_NORMAL materials = list(MAT_METAL=50) @@ -208,11 +215,17 @@ desc = "A small tool for digging and moving dirt." icon_state = "spade" item_state = "spade" - force = 5.0 - throwforce = 7.0 + force = 5 + throwforce = 7 w_class = WEIGHT_CLASS_SMALL toolspeed = 2 +/obj/item/shovel/safety + name = "safety shovel" + desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon." + force = 1 + throwforce = 1 + attack_verb = list("ineffectively hit") /**********************Mining car (Crate like thing, not the rail car)**************************/