Destructible Walls (And Mineral Walls)

_maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm

@@ -3367,7 +3367,7 @@ of
 IA
 ro
 ro
-hJ
+bf
 Ew
 LT
 hi
@@ -3446,7 +3446,7 @@ je
 kC
 nq
 qm
-hJ
+bf
 tw
 tC
 vK

_maps/shuttles/independent/independent_mudskipper.dmm

@@ -349,6 +349,7 @@
 /obj/item/circular_saw,
 /obj/item/multitool,
 /obj/item/stack/marker_beacon/thirty,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech,
 /area/ship/cargo)
 "gT" = (

_maps/shuttles/independent/independent_rigger.dmm

@@ -4468,6 +4468,7 @@
 /obj/item/storage/toolbox/mechanical,
 /obj/item/storage/belt/utility,
 /obj/item/clothing/glasses/welding,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plating,
 /area/ship/engineering)
 

_maps/shuttles/independent/independent_shetland.dmm

@@ -4725,6 +4725,8 @@
 /obj/item/multitool,
 /obj/item/clothing/glasses/welding,
 /obj/item/clothing/glasses/welding,
+/obj/item/gun/energy/plasmacutter,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering/electrical)
 "OU" = (

_maps/shuttles/inteq/inteq_talos.dmm

@@ -928,6 +928,7 @@
 	req_access_txt = "11";
 	req_one_access = null
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "gm" = (
@@ -1348,6 +1349,7 @@
 	req_access_txt = "11";
 	req_one_access = null
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "iM" = (
@@ -1645,6 +1647,7 @@
 	pixel_x = 20;
 	pixel_y = 11
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering)
 "jZ" = (
@@ -6273,6 +6276,7 @@
 	name = "honorable artificer's toolbelt"
 	},
 /obj/machinery/airalarm/directional/west,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/engineering/communications)
 "Oq" = (

_maps/shuttles/nanotrasen/nanotrasen_gecko.dmm

@@ -383,6 +383,7 @@
 /obj/item/clothing/under/rank/cargo/miner,
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/glasses/meson,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/port)
 "dC" = (
@@ -4112,6 +4113,7 @@
 /obj/item/clothing/under/rank/cargo/miner,
 /obj/item/clothing/gloves/color/black,
 /obj/item/clothing/glasses/meson,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/cargo/starboard)
 "Qc" = (

_maps/shuttles/nanotrasen/nanotrasen_heron.dmm

@@ -1474,6 +1474,7 @@
 	pixel_y = -11;
 	pixel_x = 9
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "gd" = (
@@ -10650,6 +10651,7 @@
 	pixel_y = -10;
 	pixel_x = 5
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "NC" = (

_maps/shuttles/nanotrasen/nanotrasen_osprey.dmm

@@ -5899,6 +5899,7 @@
 	},
 /obj/item/holosign_creator/engineering,
 /obj/item/storage/box/metalfoam,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/patterned/grid,
 /area/ship/engineering)
 "My" = (

_maps/shuttles/nanotrasen/nanotrasen_ranger.dmm

@@ -1554,6 +1554,7 @@
 /obj/item/clothing/glasses/meson/gar{
 	pixel_y = 8
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/mono/dark,
 /area/ship/engineering)
 "pA" = (

_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm

@@ -899,6 +899,7 @@
 /obj/item/clothing/under/syndicate/ngr/jumpsuit,
 /obj/item/clothing/suit/hazardvest/ngr,
 /obj/item/clothing/head/hardhat/ngr,
+/obj/item/pickaxe/drill,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/storage)
 "pu" = (
@@ -1153,6 +1154,7 @@
 /obj/item/clothing/under/syndicate/ngr/jumpsuit,
 /obj/item/clothing/suit/hazardvest/ngr,
 /obj/item/clothing/head/hardhat/ngr,
+/obj/item/pickaxe/drill,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/storage)
 "tI" = (
@@ -3160,10 +3162,10 @@
 	dir = 4
 	},
 /obj/structure/rack,
-/obj/item/pickaxe/drill/jackhammer/old{
+/obj/item/gun/energy/plasmacutter{
 	pixel_y = 10
 	},
-/obj/item/pickaxe/drill/jackhammer/old,
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/tech/grid,
 /area/ship/storage)
 "Yv" = (

_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm

@@ -1175,6 +1175,7 @@
 	},
 /obj/item/clothing/under/syndicate/hardliners,
 /obj/item/clothing/suit/hazardvest/hardliners,
+/obj/item/gun/energy/plasmacutter,
 /obj/item/clothing/gloves/color/red/insulated,
 /turf/open/floor/plasteel/tech,
 /area/ship/engineering)

_maps/shuttles/syndicate/syndicate_twinkleshine.dmm

@@ -4440,6 +4440,7 @@
 /obj/item/clothing/head/hardhat/red{
 	name = "hard hat"
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "Af" = (
@@ -8917,6 +8918,7 @@
 /obj/item/clothing/head/hardhat/red{
 	name = "hard hat"
 	},
+/obj/item/gun/energy/plasmacutter,
 /turf/open/floor/plasteel/dark,
 /area/ship/engineering)
 "Zg" = (

code/__DEFINES/projectiles.dm

@@ -7,3 +7,9 @@
 #define PROJECTILE_PIERCE_PHASE 2
 // Delete self without hitting
 #define PROJECTILE_DELETE_WITHOUT_HITTING 3
+
+#define PROJECTILE_BONUS_DAMAGE_NONE 0
+#define PROJECTILE_BONUS_DAMAGE_MINERALS (1<<0) //minable walls
+#define PROJECTILE_BONUS_DAMAGE_WALLS (1<<1) // walls
+#define PROJECTILE_BONUS_DAMAGE_RWALLS (1<<2) //reinforced walls
+

code/__DEFINES/turfs.dm

@@ -12,3 +12,9 @@
 #define CHANGETURF_DEFER_BATCH (1 << 5)
 
 #define IS_OPAQUE_TURF(turf) (turf.directional_opacity == ALL_CARDINALS)
+
+// Integrity of mineral walls.
+#define MINERAL_WALL_INTEGRITY 100
+
+// how many bullet holes a wall can have at a given time
+#define MAX_DENT_DECALS 15

code/game/mecha/equipment/tools/mining_tools.dm

@@ -17,6 +17,7 @@
 	toolspeed = 0.9
 	var/drill_delay = 7
 	var/drill_level = DRILL_BASIC
+	wall_decon_damage = 100
 
 /obj/item/mecha_parts/mecha_equipment/drill/Initialize()
 	. = ..()
@@ -62,15 +63,19 @@
 	return
 
 /turf/closed/wall/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
-	if(drill.do_after_mecha(src, 60 / drill.drill_level))
+	while(drill.do_after_mecha(src, 15 / drill.drill_level))
 		drill.log_message("Drilled through [src]", LOG_MECHA)
-		dismantle_wall(devastated = TRUE)
+		alter_integrity(-drill.wall_decon_damage)
+		drill.occupant_message("<span class='notice'>You drill through some of the outer plating...</span>")
+		playsound(src,'sound/weapons/drill.ogg',60,TRUE)
 
 /turf/closed/wall/r_wall/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
 	if(drill.drill_level >= DRILL_HARDENED)
-		if(drill.do_after_mecha(src, 120 / drill.drill_level))
+		while(drill.do_after_mecha(src, 20 / drill.drill_level))
 			drill.log_message("Drilled through [src]", LOG_MECHA)
-			dismantle_wall(devastated = TRUE)
+			alter_integrity(-drill.wall_decon_damage)
+			drill.occupant_message("<span class='notice'>You drill through some of the outer plating...</span>")
+			playsound(src,'sound/weapons/drill.ogg',60,TRUE)
 	else
 		drill.occupant_message("<span class='danger'>[src] is too durable to drill through.</span>")
 
@@ -150,6 +155,7 @@
 	drill_level = DRILL_HARDENED
 	force = 15
 	toolspeed = 0.7
+	wall_decon_damage = 300
 
 
 /obj/item/mecha_parts/mecha_equipment/mining_scanner

code/game/objects/items.dm

@@ -162,6 +162,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	var/tool_behaviour = NONE
 	///How fast does the tool work
 	var/toolspeed = 1
+	/// how much damage does this item do when tearing down walls during deconstruction steps?
+	var/wall_decon_damage = 0
 
 	var/block_chance = 0
 	var/block_cooldown_time = 1 SECONDS

code/game/objects/items/grenades/plastic.dm

@@ -52,6 +52,9 @@
 			target.cut_overlay(plastic_overlay, TRUE)
 			if(!ismob(target) || full_damage_on_mobs)
 				target.ex_act(EXPLODE_HEAVY, target)
+			if(iswallturf(target))
+				var/turf/closed/wall/wall = target
+				wall.dismantle_wall(TRUE)
 	else
 		location = get_turf(src)
 	if(location)

code/game/objects/items/storage/belt.dm

@@ -74,7 +74,8 @@
 		/obj/item/chisel,
 		/obj/item/clothing/glasses/welding, //WS edit: ok mald sure I'll add the welding stuff to the. ok.
 		/obj/item/clothing/mask/gas/welding,
-		/obj/item/clothing/head/welding //WS end
+		/obj/item/clothing/head/welding, //WS end
+		/obj/item/gun/energy/plasmacutter
 		))
 
 /obj/item/storage/belt/utility/chief

code/game/objects/items/tools/weldingtool.dm

@@ -39,6 +39,7 @@
 	var/acti_sound = 'sound/items/welderactivate.ogg'
 	var/deac_sound = 'sound/items/welderdeactivate.ogg'
 	var/start_full = TRUE
+	wall_decon_damage = 50
 
 /obj/item/weldingtool/empty
 	start_full = FALSE
@@ -348,6 +349,7 @@
 	light_system = NO_LIGHT_SUPPORT
 	light_range = 0
 	change_icons = 0
+	wall_decon_damage = 500
 
 /obj/item/weldingtool/abductor/process()
 	if(get_fuel() <= max_fuel)
@@ -378,6 +380,7 @@
 	can_off_process = 1
 	light_range = 1
 	toolspeed = 0.5
+	wall_decon_damage = 100
 	var/last_gen = 0
 	var/nextrefueltick = 0
 

code/game/objects/structures/crates_lockers/closets.dm

@@ -27,7 +27,8 @@
 	var/max_mob_size = MOB_SIZE_HUMAN //Biggest mob_size accepted by the container
 	var/mob_storage_capacity = 3 // how many human sized mob/living can fit together inside a closet.
 	var/storage_capacity = 30 //This is so that someone can't pack hundreds of items in a locker/crate then open it in a populated area to crash clients.
-	var/cutting_tool = /obj/item/weldingtool
+	// defaults to welder if null
+	var/cutting_tool = TOOL_WELDER
 	var/open_sound = 'sound/machines/closet_open.ogg'
 	var/close_sound = 'sound/machines/closet_close.ogg'
 	var/open_sound_volume = 35
@@ -261,27 +262,22 @@
 /obj/structure/closet/proc/tool_interact(obj/item/W, mob/user)//returns TRUE if attackBy call shouldnt be continued (because tool was used/closet was of wrong type), FALSE if otherwise
 	. = TRUE
 	if(opened)
-		if(istype(W, cutting_tool))
-			if(W.tool_behaviour == TOOL_WELDER)
-				if(!W.tool_start_check(user, amount=0))
-					return
-
-				to_chat(user, "<span class='notice'>You begin cutting \the [src] apart...</span>")
-				if(W.use_tool(src, user, 40, volume=50))
-					if(!opened)
-						return
-					user.visible_message("<span class='notice'>[user] slices apart \the [src].</span>",
-									"<span class='notice'>You cut \the [src] apart with \the [W].</span>",
-									"<span class='hear'>You hear welding.</span>")
-					deconstruct(TRUE)
+		if(W.tool_behaviour == cutting_tool && user.a_intent != INTENT_HELP)
+			if(!W.tool_start_check(user, amount=0))
 				return
-			else // for example cardboard box is cut with wirecutters
-				user.visible_message("<span class='notice'>[user] cut apart \the [src].</span>", \
-									"<span class='notice'>You cut \the [src] apart with \the [W].</span>")
+
+			to_chat(user, "<span class='notice'>You begin cutting \the [src] apart...</span>")
+			if(W.use_tool(src, user, 40, volume=50))
+				if(!opened)
+					return
+				user.visible_message("<span class='notice'>[user] slices apart \the [src].</span>",
+								"<span class='notice'>You cut \the [src] apart with \the [W].</span>",
+								"<span class='hear'>You hear cutting.</span>")
 				deconstruct(TRUE)
-				return
+			return
 		if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
 			return
+		return
 	else if(W.tool_behaviour == TOOL_WELDER && can_weld_shut)
 		if(!W.tool_start_check(user, amount=0))
 			return

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -8,7 +8,7 @@
 	max_integrity = 70
 	integrity_failure = 0
 	can_weld_shut = 0
-	cutting_tool = /obj/item/wirecutters
+	cutting_tool = TOOL_WIRECUTTER
 	material_drop = /obj/item/stack/sheet/cardboard
 	delivery_icon = "deliverybox"
 	anchorable = FALSE
@@ -70,7 +70,7 @@
 	mob_storage_capacity = 5
 	resistance_flags = NONE
 	move_speed_multiplier = 2
-	cutting_tool = /obj/item/weldingtool
+	cutting_tool = TOOL_WELDER
 	open_sound = 'sound/machines/crate_open.ogg'
 	close_sound = 'sound/machines/crate_close.ogg'
 	open_sound_volume = 35

code/game/objects/structures/girders.dm

@@ -38,7 +38,7 @@
 
 	if(istype(W, /obj/item/gun/energy/plasmacutter))
 		to_chat(user, "<span class='notice'>You start slicing apart the girder...</span>")
-		if(W.use_tool(src, user, 40, volume=100))
+		if(W.use_tool(src, user, 10, volume=100))
 			to_chat(user, "<span class='notice'>You slice apart the girder.</span>")
 			var/obj/item/stack/sheet/metal/M = new (loc, 2)
 			M.add_fingerprint(user)