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

Merge pull request #6068 from Rykka-Stormheart/shep-dev-post-fixes

Browse Source 
Multiple map fixes, Patch 10/15 Fixes
This commit is contained in:
Novacat
2019-10-17 02:57:24 -04:00
committed by GitHub
parent feed53aa8e 026b5076be
commit 8eec510a8b
11 changed files with 2596 additions and 2576 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/tether/submaps/space/_debrisfield.dm
+5 -1
View File
@@ -62,4 +62,8 @@
icon_state = "debrisexplored"
/area/tether_away/debrisfield/unexplored
icon_state = "debrisunexplored"
icon_state = "debrisunexplored"
/area/tether_away/debrisfield/derelict
icon_state = "debrisexplored"
forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')
maps/tether/submaps/space/pois/derelict.dmm
+2516 -2493
View File
File diff suppressed because it is too large Load Diff
maps/tether/submaps/underdark_pois/_templates.dm
+4 -3
View File
@@ -36,7 +36,7 @@
/datum/map_template/underdark/guardedloot_hard
name = "Underdark Guarded Loot Hard"
mappath = 'guardedloot_hard.dmm'
cost = 20
cost = 15
/datum/map_template/underdark/blaster
name = "Underdark Blaster"
@@ -88,12 +88,12 @@
/datum/map_template/underdark/old_drone_hive
name = "Underdark Old Drone Hive"
mappath = 'old_drone_hive.dmm'
cost = 25
cost = 15
/datum/map_template/underdark/phoron_rat_den
name = "Underdark Phoron Rat Den"
mappath = 'phoron_rat_den.dmm'
cost = 35
cost = 25
allow_duplicates = FALSE
/datum/map_template/underdark/subterranean_lake
@@ -123,6 +123,7 @@
mappath = 'abandonded_outpost.dmm'
cost = 45
allow_duplicates = FALSE
discard_prob = 35
/datum/map_template/underdark/mimicry
name = "Underdark Mimic Death"
maps/tether/submaps/underdark_pois/abandonded_outpost.dmm
+7 -28
View File
@@ -160,7 +160,9 @@
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/mine/explored/underdark)
"aO" = (
/obj/machinery/porta_turret/stationary/syndie,
/obj/machinery/porta_turret/stationary/syndie{
faction = "underdark"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/mine/explored/underdark)
"aP" = (
@@ -355,7 +357,9 @@
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/mine/explored/underdark)
"bB" = (
/mob/living/simple_mob/mechanical/infectionbot,
/mob/living/simple_mob/mechanical/infectionbot{
faction = "underdark"
},
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
/area/mine/explored/underdark)
"bC" = (
@@ -392,7 +396,6 @@ ad
ad
aj
ad
aa
ac
"}
(2,1,1) = {"
@@ -412,14 +415,13 @@ aj
ad
ad
ad
aX
ad
ad
ad
aj
ad
ad
ad
aa
ac
"}
(3,1,1) = {"
@@ -446,7 +448,6 @@ ab
ab
ab
ad
aa
ac
"}
(4,1,1) = {"
@@ -473,7 +474,6 @@ bp
ae
ab
ad
aa
ac
"}
(5,1,1) = {"
@@ -500,7 +500,6 @@ ae
ae
ab
ad
aa
ac
"}
(6,1,1) = {"
@@ -527,7 +526,6 @@ bi
ae
ab
ad
aa
ac
"}
(7,1,1) = {"
@@ -554,7 +552,6 @@ br
ae
ab
ad
aa
ac
"}
(8,1,1) = {"
@@ -581,7 +578,6 @@ bj
bj
ab
ad
aa
ac
"}
(9,1,1) = {"
@@ -608,7 +604,6 @@ bj
bj
ab
bc
aa
ac
"}
(10,1,1) = {"
@@ -635,7 +630,6 @@ bj
bD
ab
ad
aa
ac
"}
(11,1,1) = {"
@@ -662,7 +656,6 @@ ae
bC
ab
ad
aa
ac
"}
(12,1,1) = {"
@@ -689,7 +682,6 @@ ae
aJ
ab
ad
aa
ac
"}
(13,1,1) = {"
@@ -716,7 +708,6 @@ ae
aK
ab
ad
aa
ac
"}
(14,1,1) = {"
@@ -743,7 +734,6 @@ ae
aL
ab
bc
aa
ac
"}
(15,1,1) = {"
@@ -770,7 +760,6 @@ ae
bC
ab
ad
aa
ac
"}
(16,1,1) = {"
@@ -797,7 +786,6 @@ ae
bC
ab
ad
aa
ac
"}
(17,1,1) = {"
@@ -824,7 +812,6 @@ ae
ae
ab
ad
aa
ac
"}
(18,1,1) = {"
@@ -851,7 +838,6 @@ ae
ae
ab
ad
aa
ac
"}
(19,1,1) = {"
@@ -878,7 +864,6 @@ ae
bk
ab
ad
aa
ac
"}
(20,1,1) = {"
@@ -905,7 +890,6 @@ ae
ae
ab
ad
aa
ac
"}
(21,1,1) = {"
@@ -932,7 +916,6 @@ ae
ae
ab
ad
aa
ac
"}
(22,1,1) = {"
@@ -959,7 +942,6 @@ bq
ae
ab
ad
aa
ac
"}
(23,1,1) = {"
@@ -986,7 +968,6 @@ ab
ab
ab
ad
aa
ac
"}
(24,1,1) = {"
@@ -1013,7 +994,6 @@ ad
aj
ad
ad
aa
ac
"}
(25,1,1) = {"
@@ -1040,6 +1020,5 @@ ad
ad
ad
ad
aa
ac
"}
maps/tether/submaps/underdark_pois/mimicry.dmm
+5 -9
View File
@@ -8,10 +8,6 @@
"c" = (
/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
/area/mine/explored/underdark)
"d" = (
/obj/structure/closet/crate,
/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
/area/mine/explored/underdark)
"e" = (
/obj/structure/closet/crate/mimic/cointoss,
/turf/simulated/mineral/floor/ignore_cavegen/virgo3b,
@@ -53,7 +49,7 @@ a
b
c
e
d
h
g
h
f
@@ -66,7 +62,7 @@ c
i
c
c
d
h
a
"}
(4,1,1) = {"
@@ -82,11 +78,11 @@ a
(5,1,1) = {"
b
c
d
e
f
d
e
f
d
h
a
"}
(6,1,1) = {"
maps/tether/tether-01-surface1.dmm
+1 -13
View File
@@ -31571,18 +31571,6 @@
/obj/random/junk,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
"bcj" = (
/obj/structure/table/standard,
/obj/item/weapon/storage/firstaid/surgery,
/obj/item/weapon/paper{
desc = "";
info = "Stop installing NIFs in here you clods! Unless it's on a synth. Otherwise, STOP DOING IT! You're killing people! -Management";
name = "note to science staff"
},
/obj/item/device/robotanalyzer,
/obj/item/device/robotanalyzer,
/turf/simulated/floor/tiled/white,
/area/space)
"bck" = (
/obj/structure/disposalpipe/segment,
/obj/effect/decal/cleanable/dirt,
@@ -45849,7 +45837,7 @@ ahd
amR
aeJ
aah
bcj
aah
aah
ahx
ait
maps/tether/tether-07-station3.dmm
+10 -10
View File
@@ -25258,12 +25258,6 @@
"Nb" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 9
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Nc" = (
@@ -25285,13 +25279,17 @@
d2 = 4;
icon_state = "1-4"
},
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 9
},
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Nd" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2,
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
@@ -25309,6 +25307,8 @@
},
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
/obj/effect/floor_decal/borderfloorwhite/corner2,
/obj/effect/floor_decal/corner/paleblue/bordercorner2,
/turf/simulated/floor/tiled/white,
/area/medical/sleeper)
"Nf" = (
maps/tether/tether-08-mining.dmm
+1
View File
@@ -257,6 +257,7 @@
pixel_y = 24
},
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
},
/obj/machinery/light_switch{
maps/tether/tether-09-solars.dmm
+47 -19
View File
@@ -6490,6 +6490,11 @@
dir = 8;
icon_state = "tube1"
},
/obj/structure/extinguisher_cabinet{
dir = 4;
icon_state = "extinguisher_closed";
pixel_x = -30
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"lN" = (
@@ -6879,6 +6884,11 @@
dir = 4
},
/obj/effect/floor_decal/industrial/warning,
/obj/structure/extinguisher_cabinet{
dir = 4;
icon_state = "extinguisher_closed";
pixel_x = -30
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"my" = (
@@ -7110,8 +7120,26 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"mQ" = (
/obj/machinery/light,
/obj/machinery/artifact_scanpad,
/obj/machinery/camera/network/research_outpost{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/apc{
cell_type = /obj/item/weapon/cell/super;
dir = 8;
name = "west bump";
pixel_x = -28
},
/obj/structure/extinguisher_cabinet{
dir = 1;
icon_state = "extinguisher_closed";
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"mR" = (
@@ -7475,20 +7503,12 @@
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"nE" = (
/obj/machinery/camera/network/research_outpost{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/apc{
cell_type = /obj/item/weapon/cell/super;
dir = 8;
name = "west bump";
pixel_x = -28
/obj/machinery/light,
/obj/machinery/artifact_scanpad,
/obj/structure/extinguisher_cabinet{
dir = 1;
icon_state = "extinguisher_closed";
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
@@ -8048,6 +8068,14 @@
},
/turf/simulated/floor/wood,
/area/rnd/outpost/breakroom)
"oR" = (
/obj/structure/extinguisher_cabinet{
dir = 1;
icon_state = "extinguisher_closed";
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/anomaly_lab)
"oT" = (
/obj/structure/bed/chair/wood{
dir = 8
@@ -21767,7 +21795,7 @@ jw
nD
nM
kZ
mQ
nE
jx
ab
ab
@@ -21904,7 +21932,7 @@ kx
lA
ka
ol
nE
mQ
jx
no
mD
@@ -23755,7 +23783,7 @@ ma
nR
mJ
mW
kZ
oR
jx
ab
ab
sound/ambience/tension/horror.ogg
BIN
View File
Binary file not shown.
sound/ambience/tension/tension.ogg
BIN
View File
Binary file not shown.