Skip to content

Commit

Permalink
ok there we go
Browse files Browse the repository at this point in the history
  • Loading branch information
wraith-54321 committed Oct 21, 2023
1 parent c62a3ce commit f4831e9
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3840,11 +3840,6 @@
/obj/structure/table/reinforced,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/medical)
"qD" = (
/obj/structure/table/reinforced,
/obj/machinery/infuser,
/turf/open/floor/iron/dark,
/area/centcom/central_command_areas/botany)
"qE" = (
/obj/effect/turf_decal/siding/blue{
dir = 4
Expand Down Expand Up @@ -7345,7 +7340,6 @@
},
/obj/merge_conflict_marker{

Check failure on line 7341 in _maps/map_files/generic/CentCom.dmm

View workflow job for this annotation

GitHub Actions / Run Linters

DMM Linter

(in pop Fk) (at (156, 16, 1)) Typepath /obj/merge_conflict_marker is banned.
name = "---Merge Conflict Marker---";

desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
},
/obj/effect/turf_decal/tile/dark/opposingcorners,
Expand Down Expand Up @@ -49852,7 +49846,7 @@ aa
aa
dS
rd
qD
yZ
xH
uE
dS
Expand Down

0 comments on commit f4831e9

Please sign in to comment.