Shows assemblies some love. ♥

2018-05-06 08:05:37 -04:00
parent 11c1e8fbf7
commit 6415ecdbe9
21 changed files with 432 additions and 261 deletions
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 // See _DEFINES/is_helpers.dm for type helpers

 /*
@@ -13,4 +14,22 @@ Name:	IsAssemblyHolder
 Desc:	If true is an object that can hold an assemblyholder object
 */
 /obj/proc/IsAssemblyHolder()
-	return 0
+	return 0
+=======
+// See _DEFINES/is_helpers.dm for type helpers
+
+/*
+Name:	IsSpecialAssembly
+Desc:	If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door
+*/
+
+/obj/proc/IsSpecialAssembly()
+	return FALSE
+
+/*
+Name:	IsAssemblyHolder
+Desc:	If true is an object that can hold an assemblyholder object
+*/
+/obj/proc/IsAssemblyHolder()
+	return FALSE
+>>>>>>> b4d11c6... Shows assemblies some love. ♥ (#37632)