cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-22 19:26:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

map cleanups (#7504)

Browse Source 
cleanup map files
This commit is contained in:
Letter N
2026-01-27 12:43:51 -05:00
committed by GitHub
parent fed38ec2c8
commit fcdae04ae0
51 changed files with 136467 additions and 136622 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/utility/merge_conflict_marker.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon = 'icons/effects/mapping_helpers.dmi'
icon_state = "merge_conflict_marker"
desc = "If you are seeing this in-game: someone REALLY, REALLY, REALLY fucked up. They physically mapped in a fucking Merge Conflict Marker. What the shit."
plane = ABOVE_PLANE
plane = POINT_PLANE
///We REALLY do not want un-addressed merge conflicts in maps for an inexhaustible list of reasons. This should help ensure that this will not be missed in case linters fail to catch it for any reason what-so-ever.
/obj/merge_conflict_marker/Initialize(mapload)