fix sawfly remote mechscan (goonstation#19685)

Retrino · Jun 26, 2024 · 7b55791 · 7b55791
1 parent 03718bc
commit 7b55791
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 30 deletions.
diff --git a/_std/defines/materials.dm b/_std/defines/materials.dm
@@ -22,32 +22,6 @@
 /// Global static list of rarity color associations
 var/global/static/list/RARITY_COLOR = list("#9d9d9d", "#ffffff", "#1eff00", "#0070dd", "#a335ee", "#ff8000", "#ff0000")
 
-/// Material category names as displayed in fabricators
-/// see match_material_pattern() for exact definitions
-var/global/list/material_category_names = list(
-	"ALL"   = "Any Material",
-	"CON-1" = "Conductive Material",
-	"CON-2" = "High Energy Conductor",
-	"CRY-1" = "Crystal",
-	"DEN-1" = "High Density Matter",
-	"DEN-2" = "Very High Density Matter",
-	"CRY-2" = "Extraordinarily Dense Crystalline Matter",
-	"FAB-1" = "Fabric",
-	"INS-1" = "Insulative Material",
-	"INS-2" = "Highly Insulative Material",
-	"MET-1" = "Metal",
-	"MET-2" = "Sturdy Metal",
-	"MET-3" = "Extremely Tough Metal",
-	"POW-1" = "Power Source",
-	"POW-2" = "Significant Power Source",
-	"POW-3" = "Extreme Power Source",
-	"REF-1" = "Reflective Material",
-	"ORG|RUB" = "Organic or Rubber Material",
-	"RUB" = "Rubber Material",
-	"WOOD" = "Wood",
-	"GEM-1" = "Any Gemstone"
-)
-
 #define TRIGGERS_ON_BULLET "triggersOnBullet"
 #define TRIGGERS_ON_EAT "triggersOnEat"
 #define TRIGGERS_ON_TEMP "triggersTemp"

diff --git a/code/atom.dm b/code/atom.dm
@@ -475,8 +475,8 @@ TYPEINFO(/atom)
 	..()
 
 TYPEINFO(/atom/movable)
-	/// Either a number or a list of the form list("MET-1"=5, "erebite"=3)
-	/// See the `match_material_pattern` proc for an explanation of what "CRY-2" is supposed to mean
+	/// A key-value list of match property or material IDs and an amount required to construct the item
+	/// See `/datum/manufacturing_requirement/match_property` for match properties
 	var/list/mats = null
 
 /atom/movable

diff --git a/code/obj/sawflymisc.dm b/code/obj/sawflymisc.dm
@@ -96,8 +96,8 @@ TYPEINFO(/obj/item/old_grenade/sawfly)
 			icon_state_armed = "clusterflyB1"
 
 // -------------------controller---------------
-TYPEINFO(/obj/item/old_grenade/sawfly)
-	mats = list("CON-1"=2)
+TYPEINFO(/obj/item/remote/sawflyremote)
+	mats = list("conductive"=2)
 /obj/item/remote/sawflyremote
 	name = "Sawfly remote"
 	desc = "A small device that can be used to fold or deploy sawflies in range."