cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset map files.

Browse Source
This commit is contained in:
Cadyn
2020-10-14 21:51:31 -07:00
parent 77336c7c98
commit 213cec1dcc
11 changed files with 13 additions and 19350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4139
maps/offmap_vr/om_ships/gecko_cr.dmm
View File

File diff suppressed because it is too large Load Diff

4090
maps/offmap_vr/om_ships/gecko_cr_wreck.dmm
View File

File diff suppressed because it is too large Load Diff

3822
maps/offmap_vr/om_ships/gecko_sh.dmm
View File

File diff suppressed because it is too large Load Diff

1461
maps/offmap_vr/om_ships/mackerel_hc.dmm
View File

File diff suppressed because it is too large Load Diff

1658
maps/offmap_vr/om_ships/mackerel_hc_skel.dmm
View File

File diff suppressed because it is too large Load Diff

1306
maps/offmap_vr/om_ships/mackerel_lc.dmm
View File

File diff suppressed because it is too large Load Diff

1392
maps/offmap_vr/om_ships/mackerel_lc_wreck.dmm
View File

File diff suppressed because it is too large Load Diff

1366
maps/offmap_vr/om_ships/mackerel_sh.dmm
View File

File diff suppressed because it is too large Load Diff

104
maps/offmap_vr/talon/talon1.dmm
View File

@@ -1258,112 +1258,8 @@
/area/talon/deckone/bridge_hallway)
"cL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
<<<<<<< HEAD
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/structure/cable/green{
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled/eris/steel,
/area/talon/deckone/brig)
"cM" = (
/obj/structure/closet/crate/solar,
/obj/machinery/firealarm{
layer = 3.3;
pixel_y = 26
},
/turf/simulated/floor/tiled/eris/dark/brown_platform,
/area/talon/deckone/starboard_eng_store)
"cN" = (
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
},
/turf/simulated/floor/tiled/eris/dark/brown_platform,
/area/talon/deckone/port_eng_store)
"cO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 9
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/catwalk_plated,
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plating/eris/under,
/area/talon/deckone/port_eng)
"cP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/light_switch{
name = "light switch ";
pixel_x = -12;
pixel_y = 26
},
/obj/machinery/atmospherics/pipe/cap/hidden{
dir = 4
},
/obj/machinery/power/apc/talon{
dir = 1;
name = "north bump";
pixel_y = 28
},
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
},
/turf/simulated/floor/tiled/eris/dark/brown_perforated,
/area/talon/deckone/port_eng)
"cQ" = (
/obj/structure/table/rack/shelf/steel,
/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked,
/turf/simulated/floor/tiled/eris/white/danger,
/area/talon/deckone/armory)
"cR" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/eris/steel/cargo,
/area/talon/deckone/workroom)
"cS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/light_switch{
name = "light switch ";
pixel_x = 12;
pixel_y = 26
},
/obj/machinery/atmospherics/pipe/cap/hidden{
dir = 8
},
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/apc/talon{
dir = 1;
name = "north bump";
pixel_y = 28
},
/turf/simulated/floor/tiled/eris/dark/brown_perforated,
/area/talon/deckone/starboard_eng)
"cT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/aux{
dir = 5
=======
dir = 4;
icon_state = "intact-scrubbers"
>>>>>>> master-holdert
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1

23
maps/tether/tether-01-surface1.dmm
View File

@@ -11494,16 +11494,6 @@
},
/turf/simulated/floor/water/pool,
/area/tether/surfacebase/surface_one_hall)
"atm" = (
/obj/structure/bed/chair/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"atn" = (
/obj/machinery/status_display{
pixel_x = 32;
@@ -17320,6 +17310,17 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"aIs" = (
/obj/structure/bed/chair/wood,
/obj/structure/bed/chair/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"aIt" = (
/obj/structure/bed/chair/wood,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -46105,7 +46106,7 @@ aEK
aEK
aEK
aDu
atm
aIs
aCQ
aJV
aDu

2
tools/vr-merge-upstream-pull-request.sh → tools/ch-merge-upstream-pull-request.sh
View File

@@ -12,7 +12,7 @@ set -f # disable pathname expansion
set -C # noclobber
readonly BASE_BRANCH_NAME="upstream-merge-"
readonly BASE_PULL_URL="https://api.github.com/repos/PolarisSS13/Polaris/pulls"
readonly BASE_PULL_URL="https://api.github.com/repos/VOREStation/VOREStation/pulls"
# Ensure the current directory is a git directory
if [ ! -d .git ]; then