cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conflict Resolution

Browse Source
This commit is contained in:
Unknown
2019-04-06 14:47:21 -04:00
parent 1d59d8683c
commit c4860391b6
4 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/unsorted.dm
View File

@@ -1549,9 +1549,6 @@ var/mob/dview/dview_mob = new
/proc/IsValidSrc(datum/D)
if(istype(D))
return !QDELETED(D)
<<<<<<< HEAD
return FALSE
=======
return FALSE
//gives us the stack trace from CRASH() without ending the current proc.
@@ -1574,4 +1571,3 @@ var/mob/dview/dview_mob = new
else
return "\[[url_encode(thing.tag)]\]"
return "\ref[input]"
>>>>>>> 6a2cd30... Replaces AI-controlled Maint Drones with AI-controlled Borg Shells (#6025)