cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-28 07:07:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2024-01-02 01:00:59 -05:00
parent d6f0244aa1 938c918b88
commit a9715638ad
75 changed files with 736 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/unit_tests/merge_type.dm
+3 -1
View File
@@ -9,7 +9,9 @@
var/list/paths = subtypesof(/obj/item/stack) - blacklist
for(var/stackpath in paths)
for(var/obj/item/stack/stackpath as anything in paths)
if(initial(stackpath.is_cyborg))
continue
var/obj/item/stack/stack = new stackpath
if(!stack.merge_type)
TEST_FAIL("([stack]) lacks set merge_type variable!")