Merge pull request #12595 from Very-Soft/gbtweaks

Normal Map Tweaks
This commit is contained in:
Casey
2022-04-02 08:17:55 -04:00
committed by GitHub
7 changed files with 289 additions and 321 deletions
+10 -3
View File
@@ -54,10 +54,10 @@ var/datum/planet/virgo3c/planet_virgo3c = null
switch(sun_position) switch(sun_position)
if(0 to 0.45) // Night if(0 to 0.45) // Night
low_brightness = 0.1 low_brightness = 0.3
low_color = "#000066" low_color = "#000066"
high_brightness = 0.2 high_brightness = 0.4
high_color = "#66004D" high_color = "#66004D"
min = 0 min = 0
@@ -531,7 +531,6 @@ var/datum/planet/virgo3c/planet_virgo3c = null
alpha = 0xFF alpha = 0xFF
VIRGO3C_SET_ATMOS VIRGO3C_SET_ATMOS
VIRGO3C_TURF_CREATE(/turf/simulated/mineral/cave)
VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/newdirt) VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/newdirt)
VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/newdirt_nograss) VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/newdirt_nograss)
VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/sidewalk) VIRGO3C_TURF_CREATE(/turf/simulated/floor/outdoors/sidewalk)
@@ -546,10 +545,18 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/dark)
VIRGO3C_TURF_CREATE(/turf/simulated/mineral) VIRGO3C_TURF_CREATE(/turf/simulated/mineral)
VIRGO3C_TURF_CREATE(/turf/simulated/floor) VIRGO3C_TURF_CREATE(/turf/simulated/floor)
/turf/simulated/mineral/cave/virgo3c
VIRGO3C_SET_ATMOS
outdoors = 0
/turf/simulated/mineral/floor/virgo3c /turf/simulated/mineral/floor/virgo3c
VIRGO3C_SET_ATMOS VIRGO3C_SET_ATMOS
outdoors = 0 outdoors = 0
/turf/simulated/mineral/floor/ignore_mapgen/virgo3c
VIRGO3C_SET_ATMOS
outdoors = 0
/turf/simulated/floor/outdoors/grass/virgo3c /turf/simulated/floor/outdoors/grass/virgo3c
VIRGO3C_SET_ATMOS VIRGO3C_SET_ATMOS
+135 -136
View File
@@ -2,19 +2,18 @@
"a" = ( "a" = (
/turf/unsimulated/wall/planetary/virgo3c, /turf/unsimulated/wall/planetary/virgo3c,
/area/groundbase/mining/unexplored) /area/groundbase/mining/unexplored)
"o" = ( "b" = (
/obj/effect/step_trigger/teleporter/from_mining{ /turf/simulated/wall/r_wall,
pixel_y = -16 /area/groundbase/mining/unexplored)
}, "x" = (
/turf/simulated/mineral/floor/ignore_mapgen, /obj/effect/step_trigger/teleporter/from_mining,
/turf/simulated/mineral/floor/ignore_mapgen/virgo3c,
/area/groundbase/mining/unexplored) /area/groundbase/mining/unexplored)
"I" = ( "I" = (
/turf/simulated/mineral/cave/virgo3c{ /turf/simulated/mineral/cave/virgo3c,
outdoors = 0
},
/area/groundbase/mining/unexplored) /area/groundbase/mining/unexplored)
"Z" = ( "Z" = (
/turf/simulated/mineral/floor/ignore_mapgen, /turf/simulated/mineral/floor/ignore_mapgen/virgo3c,
/area/groundbase/mining/unexplored) /area/groundbase/mining/unexplored)
(1,1,1) = {" (1,1,1) = {"
@@ -1982,9 +1981,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -2123,12 +2122,12 @@ I
I I
I I
I I
I
Z Z
Z Z
I b
I b
I b
I
I I
I I
I I
@@ -2264,13 +2263,13 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -2406,13 +2405,13 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -2549,12 +2548,12 @@ I
I I
I I
I I
I
Z Z
Z Z
I b
I b
I b
I
I I
I I
I I
@@ -2692,9 +2691,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -4212,9 +4211,9 @@ I
Z Z
Z Z
Z Z
I
Z Z
I Z
Z
Z Z
Z Z
I I
@@ -4357,8 +4356,8 @@ Z
Z Z
Z Z
Z Z
I Z
I Z
Z Z
Z Z
I I
@@ -4501,7 +4500,7 @@ I
Z Z
Z Z
Z Z
I Z
Z Z
Z Z
I I
@@ -4642,7 +4641,7 @@ I
I I
Z Z
I I
I Z
Z Z
Z Z
Z Z
@@ -4785,7 +4784,7 @@ I
I I
I I
Z Z
I Z
Z Z
I I
Z Z
@@ -5335,9 +5334,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -5476,12 +5475,12 @@ I
I I
I I
I I
I
Z Z
Z Z
I b
I b
I b
I
I I
I I
I I
@@ -5617,13 +5616,13 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -5759,13 +5758,13 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -5902,12 +5901,12 @@ I
I I
I I
I I
I
Z Z
Z Z
I b
I b
I b
I
I I
I I
I I
@@ -6045,9 +6044,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -6516,7 +6515,7 @@ I
I I
I I
Z Z
I Z
Z Z
I I
I I
@@ -6657,7 +6656,7 @@ I
I I
Z Z
Z Z
I Z
Z Z
I I
I I
@@ -6799,7 +6798,7 @@ I
I I
Z Z
Z Z
I Z
I I
I I
I I
@@ -6940,7 +6939,7 @@ I
Z Z
Z Z
Z Z
I Z
I I
I I
I I
@@ -7286,7 +7285,7 @@ I
I I
Z Z
Z Z
I Z
Z Z
I I
I I
@@ -7426,8 +7425,8 @@ I
I I
I I
I I
I Z
I Z
Z Z
I I
I I
@@ -8918,7 +8917,7 @@ I
I I
I I
I I
I Z
Z Z
Z Z
I I
@@ -9341,7 +9340,7 @@ I
I I
I I
Z Z
I Z
I I
I I
I I
@@ -9479,10 +9478,10 @@ I
I I
I I
I I
I
Z Z
Z Z
I Z
Z
I I
I I
I I
@@ -10252,9 +10251,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -10393,12 +10392,12 @@ I
I I
I I
I I
I
Z Z
Z Z
I b
I b
I b
I
I I
I I
I I
@@ -10534,13 +10533,13 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -10676,13 +10675,13 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -10819,12 +10818,12 @@ I
I I
I I
I I
I
Z Z
Z Z
I b
I b
I b
I
I I
I I
I I
@@ -10962,9 +10961,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -13450,7 +13449,7 @@ I
I I
I I
I I
I Z
Z Z
Z Z
Z Z
@@ -13731,7 +13730,7 @@ I
I I
I I
Z Z
I Z
Z Z
I I
Z Z
@@ -13874,7 +13873,7 @@ I
Z Z
Z Z
Z Z
I Z
Z Z
Z Z
I I
@@ -17285,9 +17284,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
@@ -17426,13 +17425,13 @@ I
I I
I I
I I
I
I
Z Z
Z Z
I b
I b
I b
I
I
I I
I I
I I
@@ -17567,14 +17566,14 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -17709,14 +17708,14 @@ I
I I
I I
I I
Z
Z
Z
o
Z
I
I I
I I
Z
Z
Z
x
Z
b
I I
I I
I I
@@ -17852,13 +17851,13 @@ I
I I
I I
I I
I
I
Z Z
Z Z
I b
I b
I b
I
I
I I
I I
I I
@@ -17995,9 +17994,9 @@ I
I I
I I
I I
Z I
Z I
Z I
I I
I I
I I
+64 -138
View File
@@ -1117,9 +1117,6 @@
}, },
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/engineering/engine) /area/groundbase/engineering/engine)
"dh" = (
/turf/simulated/mineral/floor/cave,
/area/maintenance/groundbase/level1/netunnel)
"dj" = ( "dj" = (
/obj/structure/table/marble, /obj/structure/table/marble,
/obj/machinery/chemical_dispenser/bar_soft/full, /obj/machinery/chemical_dispenser/bar_soft/full,
@@ -2529,14 +2526,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/groundbase/command/tcomms/storage) /area/groundbase/command/tcomms/storage)
"gX" = (
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -28;
req_access = list(67)
},
/turf/simulated/floor/tiled/dark,
/area/groundbase/security/warden)
"gY" = ( "gY" = (
/obj/machinery/telecomms/hub/preset/groundbase, /obj/machinery/telecomms/hub/preset/groundbase,
/turf/simulated/floor/tiled/dark{ /turf/simulated/floor/tiled/dark{
@@ -3208,12 +3197,7 @@
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c, /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c,
/area/groundbase/level1/northspur) /area/groundbase/level1/northspur)
"iY" = ( "iY" = (
/obj/effect/step_trigger/teleporter/to_mining{ /turf/simulated/mineral/floor/virgo3c,
pixel_y = -16
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/netunnel) /area/maintenance/groundbase/level1/netunnel)
"iZ" = ( "iZ" = (
/obj/structure/table/rack/shelf/steel, /obj/structure/table/rack/shelf/steel,
@@ -3242,14 +3226,6 @@
"jd" = ( "jd" = (
/turf/simulated/wall, /turf/simulated/wall,
/area/maintenance/groundbase/substation/medcargo) /area/maintenance/groundbase/substation/medcargo)
"je" = (
/obj/effect/step_trigger/teleporter/to_mining{
pixel_y = -16
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/nwtunnel)
"jf" = ( "jf" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/fiftyspawner/steel, /obj/fiftyspawner/steel,
@@ -4819,13 +4795,13 @@
/turf/simulated/floor/carpet/oracarpet, /turf/simulated/floor/carpet/oracarpet,
/area/groundbase/engineering/ce) /area/groundbase/engineering/ce)
"nk" = ( "nk" = (
/obj/structure/railing{ /obj/effect/step_trigger/teleporter/to_mining{
dir = 8 pixel_y = -32
}, },
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0 outdoors = 0
}, },
/area/maintenance/groundbase/level1/swtunnel) /area/maintenance/groundbase/level1/netunnel)
"nl" = ( "nl" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
@@ -6299,13 +6275,13 @@
/turf/simulated/floor/bmarble, /turf/simulated/floor/bmarble,
/area/groundbase/civilian/gateway) /area/groundbase/civilian/gateway)
"rn" = ( "rn" = (
/obj/structure/railing{ /obj/effect/step_trigger/teleporter/to_mining{
dir = 8 pixel_y = -32
}, },
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0 outdoors = 0
}, },
/area/maintenance/groundbase/level1/netunnel) /area/maintenance/groundbase/level1/nwtunnel)
"rp" = ( "rp" = (
/obj/machinery/atmospherics/binary/pump{ /obj/machinery/atmospherics/binary/pump{
dir = 8 dir = 8
@@ -6822,7 +6798,7 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/security/briefing) /area/groundbase/security/briefing)
"sM" = ( "sM" = (
/turf/simulated/mineral/floor/cave, /turf/simulated/mineral/floor/virgo3c,
/area/maintenance/groundbase/level1/nwtunnel) /area/maintenance/groundbase/level1/nwtunnel)
"sN" = ( "sN" = (
/obj/machinery/door/firedoor, /obj/machinery/door/firedoor,
@@ -10010,11 +9986,13 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/security/detective) /area/groundbase/security/detective)
"Bq" = ( "Bq" = (
/obj/structure/railing, /obj/effect/step_trigger/teleporter/to_mining{
pixel_y = -32
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{ /turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0 outdoors = 0
}, },
/area/maintenance/groundbase/level1/netunnel) /area/maintenance/groundbase/level1/swtunnel)
"Br" = ( "Br" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
@@ -10208,12 +10186,6 @@
}, },
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/civilian/apparel) /area/groundbase/civilian/apparel)
"BM" = (
/obj/structure/railing,
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/nwtunnel)
"BN" = ( "BN" = (
/obj/machinery/alarm, /obj/machinery/alarm,
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
@@ -10856,14 +10828,6 @@
}, },
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/groundbase/engineering/atmos) /area/groundbase/engineering/atmos)
"DH" = (
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/nwtunnel)
"DI" = ( "DI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -11173,14 +11137,6 @@
}, },
/turf/simulated/floor/lino, /turf/simulated/floor/lino,
/area/groundbase/civilian/bar) /area/groundbase/civilian/bar)
"Ew" = (
/obj/structure/railing{
dir = 8
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/nwtunnel)
"Ex" = ( "Ex" = (
/obj/structure/table/standard, /obj/structure/table/standard,
/obj/item/weapon/aiModule/reset, /obj/item/weapon/aiModule/reset,
@@ -12662,14 +12618,6 @@
/obj/effect/floor_decal/industrial/danger, /obj/effect/floor_decal/industrial/danger,
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/engineering/engine) /area/groundbase/engineering/engine)
"IO" = (
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/swtunnel)
"IQ" = ( "IQ" = (
/obj/structure/bed/chair/comfy/orange{ /obj/structure/bed/chair/comfy/orange{
dir = 8 dir = 8
@@ -12885,9 +12833,6 @@
}, },
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/engineering/atmos) /area/groundbase/engineering/atmos)
"Jy" = (
/turf/simulated/mineral/floor/cave,
/area/maintenance/groundbase/level1/swtunnel)
"Jz" = ( "Jz" = (
/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c,
/area/groundbase/civilian/arrivals) /area/groundbase/civilian/arrivals)
@@ -13057,14 +13002,6 @@
/obj/item/weapon/shield/riot, /obj/item/weapon/shield/riot,
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/security/armory) /area/groundbase/security/armory)
"JV" = (
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/netunnel)
"JX" = ( "JX" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
@@ -16891,12 +16828,7 @@
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/groundbase/substation/aiciv) /area/maintenance/groundbase/substation/aiciv)
"UK" = ( "UK" = (
/obj/effect/step_trigger/teleporter/to_mining{ /turf/simulated/mineral/floor/virgo3c,
pixel_y = -16
},
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/swtunnel) /area/maintenance/groundbase/level1/swtunnel)
"UL" = ( "UL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -18126,12 +18058,6 @@
}, },
/turf/simulated/floor/tiled/techmaint, /turf/simulated/floor/tiled/techmaint,
/area/groundbase/engineering/atmos) /area/groundbase/engineering/atmos)
"Yl" = (
/obj/structure/railing,
/turf/simulated/floor/outdoors/newdirt_nograss/virgo3c{
outdoors = 0
},
/area/maintenance/groundbase/level1/swtunnel)
"Yn" = ( "Yn" = (
/obj/effect/landmark/start{ /obj/effect/landmark/start{
name = "Psychiatrist" name = "Psychiatrist"
@@ -20835,8 +20761,8 @@ AZ
AZ AZ
AZ AZ
AZ AZ
dM Qq
IO Qq
Qq Qq
Qq Qq
dM dM
@@ -20977,10 +20903,10 @@ AZ
AZ AZ
AZ AZ
AZ AZ
Yl Qq
Jy
UK UK
dM UK
Bq
dM dM
PC PC
dM dM
@@ -21119,10 +21045,10 @@ AZ
AZ AZ
AZ AZ
AZ AZ
Yl Qq
Jy
UK UK
dM UK
Bq
dM dM
PC PC
dM dM
@@ -21261,8 +21187,8 @@ AZ
AZ AZ
AZ AZ
AZ AZ
dM Qq
nk Qq
Qq Qq
Qq Qq
dM dM
@@ -24188,10 +24114,10 @@ MO
MO MO
MO MO
MO MO
FF
DH
xh xh
FF xh
xh
xh
Jh Jh
FF FF
co co
@@ -24244,7 +24170,7 @@ Jp
zg zg
mi mi
VV VV
gX Pl
qa qa
zK zK
uc uc
@@ -24330,10 +24256,10 @@ MO
MO MO
MO MO
MO MO
BM xh
sM sM
je sM
FF rn
Jh Jh
FF FF
EK EK
@@ -24472,10 +24398,10 @@ MO
MO MO
MO MO
MO MO
BM xh
sM sM
je sM
FF rn
Ht Ht
jU jU
oJ oJ
@@ -24614,10 +24540,10 @@ MO
MO MO
MO MO
MO MO
FF
Ew
xh xh
FF xh
xh
xh
FF FF
FF FF
Jh Jh
@@ -27027,7 +26953,7 @@ lE
kr kr
hb hb
uQ uQ
XS gO
wV wV
XS XS
pT pT
@@ -27311,7 +27237,7 @@ lE
bD bD
vw vw
aJ aJ
XS nR
wV wV
XS XS
Nc Nc
@@ -29105,10 +29031,10 @@ qE
qE qE
qE qE
qE qE
pU
JV
iH iH
pU iH
iH
iH
Ro Ro
sF sF
sF sF
@@ -29247,10 +29173,10 @@ qE
qE qE
qE qE
qE qE
Bq iH
dh
iY iY
pU iY
nk
Ro Ro
sF sF
sF sF
@@ -29389,10 +29315,10 @@ qE
qE qE
qE qE
qE qE
Bq iH
dh
iY iY
pU iY
nk
Ro Ro
sF sF
pU pU
@@ -29531,10 +29457,10 @@ qE
qE qE
qE qE
qE qE
pU
rn
iH iH
pU iH
iH
iH
Ro Ro
pU pU
pU pU
@@ -36139,10 +36065,10 @@ Lt
Lt Lt
Lt Lt
Lt Lt
FF
DH
xh xh
FF xh
xh
xh
VL VL
jF jF
jF jF
@@ -36281,10 +36207,10 @@ Lt
Lt Lt
Lt Lt
Lt Lt
BM xh
sM sM
je sM
FF rn
zf zf
vj vj
vj vj
@@ -36423,10 +36349,10 @@ Lt
Lt Lt
Lt Lt
Lt Lt
BM xh
sM sM
je sM
FF rn
zf zf
vj vj
Lt Lt
@@ -36565,10 +36491,10 @@ Lt
Lt Lt
Lt Lt
Lt Lt
FF
Ew
xh xh
FF xh
xh
xh
zf zf
Lt Lt
Lt Lt
@@ -37391,7 +37317,7 @@ uH
uH uH
qE qE
Lb Lb
uH Lb
qE qE
qE qE
qE qE
@@ -37675,7 +37601,7 @@ uH
Lb Lb
Lb Lb
qE qE
uH Lb
sV sV
qE qE
sV sV
+46 -32
View File
@@ -702,7 +702,7 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/dorms) /area/groundbase/dorms)
"ce" = ( "ce" = (
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/nw) /area/groundbase/level2/nw)
"cf" = ( "cf" = (
/obj/structure/table/woodentable, /obj/structure/table/woodentable,
@@ -1206,7 +1206,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 8 dir = 8
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/sw) /area/groundbase/level2/sw)
"dL" = ( "dL" = (
/obj/structure/table/woodentable, /obj/structure/table/woodentable,
@@ -1557,7 +1557,7 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/dorms) /area/groundbase/dorms)
"eN" = ( "eN" = (
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/sw) /area/groundbase/level2/sw)
"eO" = ( "eO" = (
/obj/structure/table/woodentable, /obj/structure/table/woodentable,
@@ -2107,6 +2107,12 @@
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/cargo/office) /area/groundbase/cargo/office)
"gC" = (
/obj/structure/bed/chair/sofa/bench{
dir = 1
},
/turf/simulated/floor/outdoors/newdirt/virgo3c,
/area/groundbase/level2/se)
"gE" = ( "gE" = (
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/command/tcomms) /area/groundbase/command/tcomms)
@@ -4561,11 +4567,6 @@
}, },
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/groundbase/cargo/qm) /area/groundbase/cargo/qm)
"ou" = (
/obj/structure/table/woodentable,
/obj/structure/table/woodentable,
/turf/simulated/floor/carpet,
/area/groundbase/civilian/library)
"ov" = ( "ov" = (
/obj/structure/table/standard, /obj/structure/table/standard,
/obj/machinery/cell_charger, /obj/machinery/cell_charger,
@@ -4698,7 +4699,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/nw) /area/groundbase/level2/nw)
"oS" = ( "oS" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
@@ -5738,6 +5739,12 @@
}, },
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/civilian/chapel) /area/groundbase/civilian/chapel)
"sr" = (
/obj/structure/bed/chair/sofa/bench/right{
dir = 1
},
/turf/simulated/floor/outdoors/newdirt/virgo3c,
/area/groundbase/level2/se)
"ss" = ( "ss" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-4" icon_state = "1-4"
@@ -6062,6 +6069,12 @@
}, },
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/groundbase/medical/lobby) /area/groundbase/medical/lobby)
"tA" = (
/obj/structure/bed/chair/sofa/bench/left{
dir = 1
},
/turf/simulated/floor/outdoors/newdirt/virgo3c,
/area/groundbase/level2/se)
"tB" = ( "tB" = (
/obj/machinery/door/blast/regular{ /obj/machinery/door/blast/regular{
density = 0; density = 0;
@@ -8275,7 +8288,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 1 dir = 1
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/se) /area/groundbase/level2/se)
"AK" = ( "AK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -8690,7 +8703,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/ne) /area/groundbase/level2/ne)
"BX" = ( "BX" = (
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
@@ -8713,7 +8726,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 1 dir = 1
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/nw) /area/groundbase/level2/nw)
"Ca" = ( "Ca" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
@@ -9982,7 +9995,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/sw) /area/groundbase/level2/sw)
"FT" = ( "FT" = (
/obj/effect/landmark{ /obj/effect/landmark{
@@ -10822,7 +10835,7 @@
/area/groundbase/science/xenobot) /area/groundbase/science/xenobot)
"Is" = ( "Is" = (
/obj/structure/railing/grey, /obj/structure/railing/grey,
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/se) /area/groundbase/level2/se)
"It" = ( "It" = (
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
@@ -12925,7 +12938,7 @@
/area/groundbase/civilian/hydroponics) /area/groundbase/civilian/hydroponics)
"Oy" = ( "Oy" = (
/obj/structure/railing/grey, /obj/structure/railing/grey,
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/ne) /area/groundbase/level2/ne)
"Oz" = ( "Oz" = (
/obj/structure/sink/kitchen{ /obj/structure/sink/kitchen{
@@ -13245,7 +13258,8 @@
dir = 8 dir = 8
}, },
/turf/simulated/floor/tiled/virgo3c{ /turf/simulated/floor/tiled/virgo3c{
edge_blending_priority = -1 edge_blending_priority = -1;
outdoors = 0
}, },
/area/groundbase/level2/nw) /area/groundbase/level2/nw)
"PA" = ( "PA" = (
@@ -15085,7 +15099,7 @@
/obj/machinery/light/bigfloorlamp, /obj/machinery/light/bigfloorlamp,
/obj/machinery/light/small, /obj/machinery/light/small,
/turf/simulated/floor/outdoors/grass/virgo3c, /turf/simulated/floor/outdoors/grass/virgo3c,
/area/groundbase/level2/ne) /area/groundbase/medical/Chemistry)
"Vb" = ( "Vb" = (
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/civilian/janitor) /area/groundbase/civilian/janitor)
@@ -15185,7 +15199,7 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/groundbase/science/hall) /area/groundbase/science/hall)
"Vs" = ( "Vs" = (
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/se) /area/groundbase/level2/se)
"Vt" = ( "Vt" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
@@ -15318,7 +15332,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 1 dir = 1
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/ne) /area/groundbase/level2/ne)
"VQ" = ( "VQ" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
@@ -15330,7 +15344,7 @@
/turf/simulated/floor/tiled/dark, /turf/simulated/floor/tiled/dark,
/area/groundbase/command/hall) /area/groundbase/command/hall)
"VR" = ( "VR" = (
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/ne) /area/groundbase/level2/ne)
"VS" = ( "VS" = (
/obj/structure/table/woodentable, /obj/structure/table/woodentable,
@@ -15448,7 +15462,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 8 dir = 8
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/ne) /area/groundbase/level2/ne)
"We" = ( "We" = (
/obj/machinery/light{ /obj/machinery/light{
@@ -15706,7 +15720,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 8 dir = 8
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/level2/nw) /area/groundbase/level2/nw)
"WY" = ( "WY" = (
/obj/effect/landmark/start/botanist, /obj/effect/landmark/start/botanist,
@@ -21290,7 +21304,7 @@ rb
CC CC
rP rP
Ak Ak
ou Ak
cX cX
iE iE
WA WA
@@ -34524,9 +34538,9 @@ Vs
Vs Vs
Bo Bo
Bo Bo
Bo At
Bo At
Bo At
Bo Bo
Bo Bo
Bo Bo
@@ -34667,7 +34681,7 @@ Vs
Vs Vs
Bo Bo
Bo Bo
Bo At
Bo Bo
Bo Bo
Bo Bo
@@ -34809,8 +34823,8 @@ Vs
Vs Vs
Bo Bo
Bo Bo
Bo At
Bo tA
Bo Bo
UE UE
UE UE
@@ -34951,8 +34965,8 @@ Vs
Vs Vs
Vs Vs
Bo Bo
Bo At
Bo gC
UE UE
UE UE
UE UE
@@ -35094,7 +35108,7 @@ Vs
Vs Vs
Bo Bo
Bo Bo
UE sr
UE UE
UE UE
UE UE
+8 -8
View File
@@ -346,7 +346,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/cargo/office) /area/groundbase/cargo/office)
"hN" = ( "hN" = (
/obj/structure/table/bench/marble, /obj/structure/table/bench/marble,
@@ -608,7 +608,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 8 dir = 8
}, },
/turf/simulated/open/virgo3c, /turf/simulated/open,
/area/groundbase/medical/uhallway) /area/groundbase/medical/uhallway)
"nr" = ( "nr" = (
/obj/machinery/button/remote/airlock{ /obj/machinery/button/remote/airlock{
@@ -666,7 +666,7 @@
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/groundbase/medical/cmo) /area/groundbase/medical/cmo)
"nZ" = ( "nZ" = (
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/cargo/office) /area/groundbase/cargo/office)
"og" = ( "og" = (
/obj/machinery/suit_cycler/medical, /obj/machinery/suit_cycler/medical,
@@ -1357,7 +1357,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open/virgo3c, /turf/simulated/open,
/area/groundbase/medical/uhallway) /area/groundbase/medical/uhallway)
"Ef" = ( "Ef" = (
/obj/effect/landmark/start{ /obj/effect/landmark/start{
@@ -1537,7 +1537,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 8 dir = 8
}, },
/turf/simulated/open/virgo3c, /turf/simulated/open,
/area/groundbase/medical/uhallway) /area/groundbase/medical/uhallway)
"Gn" = ( "Gn" = (
/obj/effect/floor_decal/industrial/warning{ /obj/effect/floor_decal/industrial/warning{
@@ -1972,7 +1972,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/cargo/office) /area/groundbase/cargo/office)
"PH" = ( "PH" = (
/turf/simulated/wall/rshull, /turf/simulated/wall/rshull,
@@ -2081,7 +2081,7 @@
/area/groundbase/exploration/equipment) /area/groundbase/exploration/equipment)
"RY" = ( "RY" = (
/obj/structure/railing/grey, /obj/structure/railing/grey,
/turf/simulated/open, /turf/simulated/open/virgo3c,
/area/groundbase/cargo/office) /area/groundbase/cargo/office)
"Sa" = ( "Sa" = (
/obj/structure/closet/secure_closet/personal/patient, /obj/structure/closet/secure_closet/personal/patient,
@@ -2302,7 +2302,7 @@
/obj/structure/railing/grey{ /obj/structure/railing/grey{
dir = 4 dir = 4
}, },
/turf/simulated/open/virgo3c, /turf/simulated/open,
/area/groundbase/medical/uhallway) /area/groundbase/medical/uhallway)
"VU" = ( "VU" = (
/obj/structure/bed/chair/office/light{ /obj/structure/bed/chair/office/light{
+21 -4
View File
@@ -4,7 +4,7 @@
icon_state = "blublacir" icon_state = "blublacir"
requires_power = TRUE requires_power = TRUE
dynamic_lighting = TRUE dynamic_lighting = TRUE
ambience = AMBIENCE_MAINTENANCE ambience = AMBIENCE_RUINS
base_turf = /turf/simulated/mineral/floor/virgo3c base_turf = /turf/simulated/mineral/floor/virgo3c
/area/maintenance/groundbase /area/maintenance/groundbase
@@ -12,7 +12,7 @@
icon = 'icons/turf/areas_vr.dmi' icon = 'icons/turf/areas_vr.dmi'
icon_state = "purblasqu" icon_state = "purblasqu"
flags = RAD_SHIELDED flags = RAD_SHIELDED
ambience = AMBIENCE_MAINTENANCE ambience = AMBIENCE_RUINS
flags = AREA_FLAG_IS_NOT_PERSISTENT flags = AREA_FLAG_IS_NOT_PERSISTENT
base_turf = /turf/simulated/mineral/floor/virgo3c base_turf = /turf/simulated/mineral/floor/virgo3c
@@ -75,6 +75,7 @@
name = "Science" name = "Science"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu" icon_state = "purwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/science/hall /area/groundbase/science/hall
name = "Science Hallway" name = "Science Hallway"
/area/groundbase/science/rnd /area/groundbase/science/rnd
@@ -100,6 +101,7 @@
name = "Command" name = "Command"
holomap_color = HOLOMAP_AREACOLOR_COMMAND holomap_color = HOLOMAP_AREACOLOR_COMMAND
icon_state = "bluwhisqu" icon_state = "bluwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/command/bridge /area/groundbase/command/bridge
name = "Bridge" name = "Bridge"
/area/groundbase/command/captain /area/groundbase/command/captain
@@ -114,6 +116,7 @@
name = "Command Meeting Room" name = "Command Meeting Room"
/area/groundbase/command/ai /area/groundbase/command/ai
name = "AI Core" name = "AI Core"
ambience = AMBIENCE_AI
/area/groundbase/command/ai/chamber /area/groundbase/command/ai/chamber
name = "AI Chamber" name = "AI Chamber"
/area/groundbase/command/ai/upload /area/groundbase/command/ai/upload
@@ -131,6 +134,7 @@
name = "Security" name = "Security"
holomap_color = HOLOMAP_AREACOLOR_SECURITY holomap_color = HOLOMAP_AREACOLOR_SECURITY
icon_state = "redwhisqu" icon_state = "redwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/security/lobby /area/groundbase/security/lobby
name = "Security Lobby" name = "Security Lobby"
/area/groundbase/security/processing /area/groundbase/security/processing
@@ -143,10 +147,12 @@
name = "Warden's Office" name = "Warden's Office"
/area/groundbase/security/armory /area/groundbase/security/armory
name = "Security Armory" name = "Security Armory"
ambience = AMBIENCE_HIGHSEC
/area/groundbase/security/briefing /area/groundbase/security/briefing
name = "Security Briefing Room" name = "Security Briefing Room"
/area/groundbase/security/equipment /area/groundbase/security/equipment
name = "Security Equipment Room" name = "Security Equipment Room"
ambience = AMBIENCE_HIGHSEC
/area/groundbase/security/iaa1 /area/groundbase/security/iaa1
name = "Internal Affairs West Office" name = "Internal Affairs West Office"
/area/groundbase/security/iaa2 /area/groundbase/security/iaa2
@@ -208,6 +214,7 @@
name = "Engineering" name = "Engineering"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhisqu" icon_state = "yelwhisqu"
ambience = AMBIENCE_ENGINEERING
/area/groundbase/engineering/lobby /area/groundbase/engineering/lobby
name = "Engineering Lobby" name = "Engineering Lobby"
/area/groundbase/engineering/ce /area/groundbase/engineering/ce
@@ -224,6 +231,7 @@
name = "Engine" name = "Engine"
/area/groundbase/engineering/atmos /area/groundbase/engineering/atmos
name = "Atmospherics" name = "Atmospherics"
ambience = AMBIENCE_ATMOS
/area/groundbase/engineering/atmos/monitoring /area/groundbase/engineering/atmos/monitoring
name = "Atmospherics Monitoring" name = "Atmospherics Monitoring"
@@ -231,6 +239,7 @@
name = "Cargo" name = "Cargo"
holomap_color = HOLOMAP_AREACOLOR_CARGO holomap_color = HOLOMAP_AREACOLOR_CARGO
icon_state = "orawhisqu" icon_state = "orawhisqu"
ambience = AMBIENCE_HANGAR
/area/groundbase/cargo/office /area/groundbase/cargo/office
name = "Cargo Office" name = "Cargo Office"
/area/groundbase/cargo/bay /area/groundbase/cargo/bay
@@ -246,6 +255,7 @@
name = "Civilian" name = "Civilian"
holomap_color = HOLOMAP_AREACOLOR_CIV holomap_color = HOLOMAP_AREACOLOR_CIV
icon_state = "grewhisqu" icon_state = "grewhisqu"
ambience = AMBIENCE_FOREBODING
/area/groundbase/civilian/arrivals /area/groundbase/civilian/arrivals
name = "Arrivals" name = "Arrivals"
/area/groundbase/civilian/toolstorage /area/groundbase/civilian/toolstorage
@@ -264,6 +274,7 @@
name = "Kitchen Back Room" name = "Kitchen Back Room"
/area/groundbase/civilian/chapel /area/groundbase/civilian/chapel
name = "Chapel" name = "Chapel"
ambience = AMBIENCE_CHAPEL
/area/groundbase/civilian/chapel/office /area/groundbase/civilian/chapel/office
name = "Chaplain's Office" name = "Chaplain's Office"
/area/groundbase/civilian/library /area/groundbase/civilian/library
@@ -284,6 +295,7 @@
name = "Exploration" name = "Exploration"
holomap_color = HOLOMAP_AREACOLOR_SCIENCE holomap_color = HOLOMAP_AREACOLOR_SCIENCE
icon_state = "purwhisqu" icon_state = "purwhisqu"
ambience = AMBIENCE_GENERIC
/area/groundbase/exploration/equipment /area/groundbase/exploration/equipment
name = "Exploration Equipment Room" name = "Exploration Equipment Room"
/area/groundbase/exploration/shuttlepad /area/groundbase/exploration/shuttlepad
@@ -294,6 +306,7 @@
holomap_color = HOLOMAP_AREACOLOR_DORMS holomap_color = HOLOMAP_AREACOLOR_DORMS
icon_state = "grawhisqu" icon_state = "grawhisqu"
flags = RAD_SHIELDED | BLUE_SHIELDED flags = RAD_SHIELDED | BLUE_SHIELDED
ambience = AMBIENCE_GENERIC
/area/groundbase/dorms/bathroom /area/groundbase/dorms/bathroom
name = "Dormitory Bathroom" name = "Dormitory Bathroom"
/area/groundbase/dorms/room1 /area/groundbase/dorms/room1
@@ -317,6 +330,7 @@
name = "Substation" name = "Substation"
holomap_color = HOLOMAP_AREACOLOR_ENGINEERING holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
icon_state = "yelwhitri" icon_state = "yelwhitri"
ambience = AMBIENCE_SUBSTATION
/area/maintenance/groundbase/substation/medcargo /area/maintenance/groundbase/substation/medcargo
name = "Medical/Cargo Substation" name = "Medical/Cargo Substation"
/area/maintenance/groundbase/substation/secsci /area/maintenance/groundbase/substation/secsci
@@ -337,7 +351,10 @@
/area/maintenance/groundbase/level1/swtunnel /area/maintenance/groundbase/level1/swtunnel
name = "\improper Level 1 Southwest Tunnel" name = "\improper Level 1 Southwest Tunnel"
/area/groundbase/mining
name = "Mining"
ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg', 'sound/ambience/old_foreboding/foreboding2.ogg')
/area/groundbase/mining/unexplored /area/groundbase/mining/unexplored
name = "Mining" icon_state = "orablacir"
/area/groundbase/mining/explored /area/groundbase/mining/explored
name = "Mining" icon_state = "blublacir"
+5
View File
@@ -441,6 +441,8 @@
icon = 'icons/obj/structures/stairs_64x64.dmi' icon = 'icons/obj/structures/stairs_64x64.dmi'
icon_state = "" icon_state = ""
invisibility = 0 invisibility = 0
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
/obj/effect/step_trigger/teleporter/to_mining/Initialize() /obj/effect/step_trigger/teleporter/to_mining/Initialize()
. = ..() . = ..()
teleport_x = x teleport_x = x
@@ -451,6 +453,9 @@
icon = 'icons/obj/structures/stairs_64x64.dmi' icon = 'icons/obj/structures/stairs_64x64.dmi'
icon_state = "" icon_state = ""
invisibility = 0 invisibility = 0
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
/obj/effect/step_trigger/teleporter/from_mining/Initialize() /obj/effect/step_trigger/teleporter/from_mining/Initialize()
. = ..() . = ..()
teleport_x = x teleport_x = x