cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 06:00:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes conflict

Browse Source
This commit is contained in:
Heroman3003
2022-10-29 16:22:12 +10:00
committed by GitHub
parent 16b707f110
commit 3592ac7a10
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/_helpers/type2type.dm
-4
View File
@@ -293,8 +293,6 @@
return strtype
return copytext(strtype, delim_pos)
<<<<<<< HEAD
=======
// Concatenates a list of strings into a single string. A seperator may optionally be provided.
/proc/list2text(list/ls, sep)
if (ls.len <= 1) // Early-out code for empty or singleton lists.
@@ -396,8 +394,6 @@
last_found = found + delim_len
while (found)
>>>>>>> b9e2f498c3f... Merge pull request #8737 from Spookerton/spkrtn/fix/type2parent-correction
/proc/type2parent(child)
var/string_type = "[child]"
var/last_slash = findlasttext(string_type, "/")