cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

Browse Source
This commit is contained in:
Waterpig
2024-09-08 00:59:39 +02:00
parent 410024afef 4b4ae0958f
commit 4c4930c71d
1728 changed files with 273718 additions and 2237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/unit_tests/unit_test.dm
+3
View File
@@ -339,6 +339,7 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
returnable_list += typesof(/turf/open/space/openspace)
returnable_list += typesof(/turf/open/openspace)
<<<<<<< HEAD
//SKYRAT EDIT ADDITION START - OUR UNCREATABLES DOWN HERE
//Not designed to be spawned without a turf.
returnable_list += typesof(/obj/effect/abstract/liquid_turf)
@@ -355,6 +356,8 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
returnable_list += list(/obj/item/organ/external/neck_accessory, /obj/item/organ/external/head_accessory)
//SKYRAT EDIT ADDITION END
=======
>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
return returnable_list
/proc/RunUnitTests()