cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Merge Conflicts Markers to Create_And_Destroy Blacklist (#68427)

Browse Source 
* Adds Merge Conflicts Markers to Create_And_Destroy Blacklist

Hey there,

My bad, I forgot this used. It was suggested to use an #IFNDEF UNIT_TESTS, but the sole purpose of this is to fail very, very loudly in any context. I don't want linters to somehow fail and have this be ignored by unit tests such that it doesn't show up during that part of CI. I want it to fail and yell at you and scream every time this motherfucker initializes, so let's not bug this fella for the purposes of this test.

* small comment update

* lets move it to the list
This commit is contained in:
san7890
2022-07-16 23:41:21 -05:00
committed by GitHub
parent 8f8b8666eb
commit b7760b85a6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/unit_tests/create_and_destroy.dm
+2
View File
@@ -25,6 +25,8 @@
/mob/dview,
//Template type
/obj/item/bodypart,
//This is meant to fail extremely loud every single time it occurs in any environment in any context, and it falsely alarms when this unit test iterates it. Let's not spawn it in.
/obj/merge_conflict_marker,
)
//Say it with me now, type template
ignore += typesof(/obj/effect/mapping_helpers)