upload files

2021-02-18 14:47:10 -03:00
parent 4e18044450
commit cf2e70671a
182 changed files with 552 additions and 528 deletions
@@ -25,7 +25,7 @@
 	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
+	var/cutting_tool = TOOL_WELDER
 	var/open_sound = 'sound/machines/click.ogg'
 	var/close_sound = 'sound/machines/click.ogg'
 	var/material_drop = /obj/item/stack/sheet/metal
@@ -302,7 +302,9 @@
 	update_icon()
 	return TRUE

-/obj/structure/closet/proc/handle_lock_removal(mob/user, obj/item/screwdriver/S)
+/obj/structure/closet/proc/handle_lock_removal(mob/user, obj/item/S)
+	if(!S.tool_behaviour == TOOL_SCREWDRIVER)
+		return
 	if(lock_in_use)
 		to_chat(user, "<span class='notice'>Wait for work on [src] to be done first!</span>")
 		return
@@ -357,7 +359,7 @@
 	if(opened)
 		if(istype(W, cutting_tool))
 			var/welder = FALSE
-			if(istype(W, /obj/item/weldingtool))
+			if(W.tool_behaviour == TOOL_WELDER)
 				if(!W.tool_start_check(user, amount=0))
 					return
 				to_chat(user, "<span class='notice'>You begin [welder ? "slicing" : "deconstructing"] \the [src] apart...</span>")
@@ -377,9 +379,9 @@
 			return TRUE
 	else if(istype(W, /obj/item/electronics/airlock))
 		handle_lock_addition(user, W)
-	else if(istype(W, /obj/item/screwdriver))
+	else if(W.tool_behaviour == TOOL_SCREWDRIVER)
 		handle_lock_removal(user, W)
-	else if(istype(W, /obj/item/weldingtool) && can_weld_shut)
+	else if(W.tool_behaviour == TOOL_WELDER && can_weld_shut)
 		if(!W.tool_start_check(user, amount=0))
 			return

@@ -396,7 +398,7 @@
 							"<span class='notice'>You [welded ? "weld" : "unwelded"] \the [src] with \the [W].</span>",
 							"<span class='italics'>You hear welding.</span>")
 			update_icon()
-	else if(istype(W, /obj/item/wrench) && anchorable)
+	else if(W.tool_behaviour == TOOL_WRENCH && anchorable)
 		if(isinspace() && !anchored)
 			return
 		setAnchored(!anchored)
@@ -32,7 +32,7 @@
 		else
 			name = "body bag"
 		return
-	else if(istype(I, /obj/item/wirecutters))
+	else if(I.tool_behaviour == TOOL_WIRECUTTER)
 		to_chat(user, "<span class='notice'>You cut the tag off [src].</span>")
 		name = "body bag"
 		tagged = 0
@@ -8,7 +8,7 @@
 	max_integrity = 70
 	integrity_failure = 0
 	can_weld_shut = 0
-	cutting_tool = /obj/item/wirecutters
+	cutting_tool = TOOL_WIRECUTTER
 	open_sound = "rustle"
 	material_drop = /obj/item/stack/sheet/cardboard
 	delivery_icon = "deliverybox"
@@ -74,7 +74,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/click.ogg'
 	material_drop = /obj/item/stack/sheet/plasteel
 #undef SNAKE_SPAM_TICKS
@@ -5,7 +5,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	material_drop = /obj/item/stack/sheet/mineral/wood
-	cutting_tool = /obj/item/screwdriver
+	cutting_tool = TOOL_SCREWDRIVER

 /obj/structure/closet/acloset
 	name = "strange closet"
@@ -5,7 +5,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	material_drop = /obj/item/stack/sheet/mineral/wood
-	cutting_tool = /obj/item/screwdriver
+	cutting_tool = TOOL_SCREWDRIVER

 /obj/structure/closet/secure_closet/bar/PopulateContents()
 	..()
@@ -26,7 +26,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	material_drop = /obj/item/stack/sheet/mineral/wood
-	cutting_tool = /obj/item/screwdriver
+	cutting_tool = TOOL_SCREWDRIVER

 /obj/structure/closet/secure_closet/personal/cabinet/PopulateContents()
 	new /obj/item/storage/backpack/satchel/leather/withwallet( src )
@@ -155,7 +155,7 @@
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
 	material_drop = /obj/item/stack/sheet/mineral/wood
-	cutting_tool = /obj/item/screwdriver
+	cutting_tool = TOOL_SCREWDRIVER

 /obj/structure/closet/secure_closet/detective/PopulateContents()
 	..()
@@ -16,7 +16,7 @@
 		to_chat(user, "<span class='warning'>You need a crowbar to pry this open!</span>")

 /obj/structure/closet/crate/large/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/crowbar))
+	if(W.tool_behaviour == TOOL_CROWBAR)
 		if(manifest)
 			tear_manifest(user)