forked from Riesen/-tg-station
-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert more files to LF line endings
- Loading branch information
Showing
61 changed files
with
44,305 additions
and
44,301 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| # dmm map merger hook | ||
| # needs additional setup, see tools/mapmerge/install.txt | ||
| # dmm map merger hook | ||
| # needs additional setup, see tools/mapmerge/install.txt | ||
| *.dmm merge=merge-dmm | ||
|
|
||
| # force changelog merging to use union | ||
| html/changelog.html merge=union | ||
| # force changelog merging to use union | ||
| html/changelog.html merge=union | ||
|
|
||
| *.dm text eol=lf | ||
| *.dmm text eol=lf | ||
| *.txt text eol=lf | ||
| *.html text eol=lf | ||
| *.py text eol=lf |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,73 @@ | ||
| "a" = (/turf/simulated/floor/plating/beach/sand{density = 1; opacity = 1},/area/awaymission/beach) | ||
| "b" = (/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "c" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "d" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "e" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "f" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "g" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "h" = (/obj/machinery/gateway/centeraway,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "i" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "j" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "k" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "l" = (/obj/machinery/gateway,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "m" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "n" = (/turf/indestructible/riveted{tag = "icon-sandstone6"; icon_state = "sandstone6"},/area/awaymission/beach) | ||
| "o" = (/turf/indestructible/riveted{tag = "icon-sandstone12"; icon_state = "sandstone12"},/area/awaymission/beach) | ||
| "p" = (/turf/indestructible/riveted{tag = "icon-sandstone10"; icon_state = "sandstone10"},/area/awaymission/beach) | ||
| "q" = (/obj/structure/closet/athletic_mixed,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "r" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/structure/closet/crate,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "s" = (/turf/indestructible/riveted{tag = "icon-sandstone3"; icon_state = "sandstone3"},/area/awaymission/beach) | ||
| "t" = (/obj/structure/closet/gmcloset,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "u" = (/obj/structure/closet/secure_closet/bar,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "v" = (/obj/structure/table/wood,/obj/item/weapon/book/manual/barman_recipes,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "w" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "x" = (/obj/structure/table/wood,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "y" = (/obj/structure/table/wood,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "z" = (/obj/machinery/vending/boozeomat{emagged = 1},/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "A" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "B" = (/obj/machinery/vending/cola,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "C" = (/obj/machinery/vending/snack,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "D" = (/turf/indestructible/riveted{tag = "icon-sandstone1"; icon_state = "sandstone1"},/area/awaymission/beach) | ||
| "E" = (/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "F" = (/obj/structure/mineral_door/wood{tag = "icon-wood"; icon_state = "wood"},/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "G" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "H" = (/turf/indestructible/riveted{tag = "icon-sandstone0"; icon_state = "sandstone0"},/area/awaymission/beach) | ||
| "I" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "J" = (/obj/item/toy/beach_ball,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "K" = (/obj/structure/stool,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "L" = (/mob/living/simple_animal/crab,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "M" = (/obj/effect/overlay/coconut,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "N" = (/mob/living/simple_animal/crab/Coffee,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "O" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "P" = (/turf/simulated/floor/plating/beach/coastline,/area/awaymission/beach) | ||
| "Q" = (/turf/simulated/floor/plating/beach/coastline{density = 1; opacity = 1},/area/awaymission/beach) | ||
| "R" = (/turf/simulated/floor/plating/beach/water,/area/awaymission/beach) | ||
| "S" = (/turf/simulated/floor/plating/beach/water{density = 1; opacity = 1},/area/awaymission/beach) | ||
| (1,1,1) = {" | ||
| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
| bcdebbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbfba | ||
| bghibbbbjbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba | ||
| bklmbbbbbbbbnoooooooooopbbqrqrqrqrqrqrqa | ||
| bbbbbbbbbbbbstuvwxyzABCsbbbbbbbbbbbbbbba | ||
| bbbbbbbbbbbbDEEEEEEEEEEsbbbbbbbbbbbbbbba | ||
| bbbbbbbbbbbbFEEEEEEEEEEsbbbbbbbbbGbbbbba | ||
| bbfbbbbbbbbbHxIxxxxxxxxDbbbGbbJbbbbbbbba | ||
| bbbbbbbbbbbbbKKKKKKKKKKbbbbbbbbbbbbbbbba | ||
| bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba | ||
| bbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbfbbbbbbba | ||
| bbbbbbGMbbbbbbbbbbbbbbGbbbbbNbbbMbbbbbfa | ||
| bbbJbbbbbbLbbObObObObObObbbbbbbbbbObObba | ||
| bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba | ||
| PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPQ | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| "} | ||
| "a" = (/turf/simulated/floor/plating/beach/sand{density = 1; opacity = 1},/area/awaymission/beach) | ||
| "b" = (/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "c" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "d" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "e" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "f" = (/obj/effect/overlay/palmtree_r,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "g" = (/obj/machinery/gateway{dir = 8},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "h" = (/obj/machinery/gateway/centeraway,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "i" = (/obj/machinery/gateway{dir = 4},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "j" = (/obj/effect/overlay/palmtree_l,/obj/effect/overlay/coconut,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "k" = (/obj/machinery/gateway{dir = 10},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "l" = (/obj/machinery/gateway,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "m" = (/obj/machinery/gateway{dir = 6},/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "n" = (/turf/indestructible/riveted{tag = "icon-sandstone6"; icon_state = "sandstone6"},/area/awaymission/beach) | ||
| "o" = (/turf/indestructible/riveted{tag = "icon-sandstone12"; icon_state = "sandstone12"},/area/awaymission/beach) | ||
| "p" = (/turf/indestructible/riveted{tag = "icon-sandstone10"; icon_state = "sandstone10"},/area/awaymission/beach) | ||
| "q" = (/obj/structure/closet/athletic_mixed,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "r" = (/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/structure/closet/crate,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "s" = (/turf/indestructible/riveted{tag = "icon-sandstone3"; icon_state = "sandstone3"},/area/awaymission/beach) | ||
| "t" = (/obj/structure/closet/gmcloset,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "u" = (/obj/structure/closet/secure_closet/bar,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "v" = (/obj/structure/table/wood,/obj/item/weapon/book/manual/barman_recipes,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "w" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/shaker,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "x" = (/obj/structure/table/wood,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "y" = (/obj/structure/table/wood,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "z" = (/obj/machinery/vending/boozeomat{emagged = 1},/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "A" = (/obj/machinery/vending/cigarette,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "B" = (/obj/machinery/vending/cola,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "C" = (/obj/machinery/vending/snack,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "D" = (/turf/indestructible/riveted{tag = "icon-sandstone1"; icon_state = "sandstone1"},/area/awaymission/beach) | ||
| "E" = (/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "F" = (/obj/structure/mineral_door/wood{tag = "icon-wood"; icon_state = "wood"},/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "G" = (/obj/effect/overlay/palmtree_l,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "H" = (/turf/indestructible/riveted{tag = "icon-sandstone0"; icon_state = "sandstone0"},/area/awaymission/beach) | ||
| "I" = (/obj/structure/table/wood,/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/awaymission/beach) | ||
| "J" = (/obj/item/toy/beach_ball,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "K" = (/obj/structure/stool,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "L" = (/mob/living/simple_animal/crab,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "M" = (/obj/effect/overlay/coconut,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "N" = (/mob/living/simple_animal/crab/Coffee,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "O" = (/obj/structure/stool/bed/chair,/turf/simulated/floor/plating/beach/sand,/area/awaymission/beach) | ||
| "P" = (/turf/simulated/floor/plating/beach/coastline,/area/awaymission/beach) | ||
| "Q" = (/turf/simulated/floor/plating/beach/coastline{density = 1; opacity = 1},/area/awaymission/beach) | ||
| "R" = (/turf/simulated/floor/plating/beach/water,/area/awaymission/beach) | ||
| "S" = (/turf/simulated/floor/plating/beach/water{density = 1; opacity = 1},/area/awaymission/beach) | ||
|
|
||
| (1,1,1) = {" | ||
| aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | ||
| bcdebbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbfba | ||
| bghibbbbjbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba | ||
| bklmbbbbbbbbnoooooooooopbbqrqrqrqrqrqrqa | ||
| bbbbbbbbbbbbstuvwxyzABCsbbbbbbbbbbbbbbba | ||
| bbbbbbbbbbbbDEEEEEEEEEEsbbbbbbbbbbbbbbba | ||
| bbbbbbbbbbbbFEEEEEEEEEEsbbbbbbbbbGbbbbba | ||
| bbfbbbbbbbbbHxIxxxxxxxxDbbbGbbJbbbbbbbba | ||
| bbbbbbbbbbbbbKKKKKKKKKKbbbbbbbbbbbbbbbba | ||
| bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba | ||
| bbbLbbbbbbbbbbbbbbbbbbbbbbbbbbbfbbbbbbba | ||
| bbbbbbGMbbbbbbbbbbbbbbGbbbbbNbbbMbbbbbfa | ||
| bbbJbbbbbbLbbObObObObObObbbbbbbbbbObObba | ||
| bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbba | ||
| PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPQ | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRS | ||
| "} |
Oops, something went wrong.