cyberpresidentvanellope/Citadel-Station-13
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13.git synced 2026-08-23 02:57:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update helpers.dm

Browse Source
This commit is contained in:
deathride58
2018-05-07 08:47:44 -04:00
committed by GitHub
parent 6415ecdbe9
commit be42e97101
1 changed files with 1 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/helpers.dm
+1 -20
View File
@@ -1,21 +1,3 @@
<<<<<<< HEAD
// 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 0
/*
Name: IsAssemblyHolder
Desc: If true is an object that can hold an assemblyholder object
*/
/obj/proc/IsAssemblyHolder()
return 0
=======
// See _DEFINES/is_helpers.dm for type helpers
/*
@@ -31,5 +13,4 @@ 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)
return FALSE