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

Adds some new lights and does a few more map tweaks

Browse Source
This commit is contained in:
VerySoft
2021-07-03 00:27:04 -04:00
parent 3d590e1f0d
commit ce7c3a4d2d
8 changed files with 8196 additions and 8144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/lighting_vr.dm
+68
View File
@@ -49,3 +49,71 @@
nightshift_range = 6
nightshift_power = 0.45
// Floor tube lights
/obj/machinery/light/floortube
icon_state = "floortube1"
base_state = "floortube"
desc = "A tube light set into a floor fixture."
shows_alerts = FALSE
plane = TURF_PLANE
layer = ABOVE_TURF_LAYER
construct_type = /obj/machinery/light_construct/floortube
/obj/machinery/light/floortube/flicker
auto_flicker = TRUE
/obj/machinery/light_construct/floortube
name = "floor light fixture frame"
desc = "A floor light fixture under construction."
icon = 'icons/obj/lighting_vr.dmi'
icon_state = "floortube-construct-stage1"
anchored = 1
stage = 1
fixture_type = /obj/machinery/light/floortube
sheets_refunded = 1
/obj/machinery/light_construct/floortube/update_icon()
switch(stage)
if(1)
icon_state = "floortube-construct-stage1"
if(2)
icon_state = "floortube-construct-stage2"
if(3)
icon_state = "floortube-empty"
// Big Flamp
/obj/machinery/light/bigfloorlamp
icon = 'icons/obj/lighting32x64.dmi'
icon_state = "big_flamp1"
base_state = "big_flamp"
desc = "A set of tube lights on a raised, solid fixture"
shows_alerts = FALSE
density = 1
plane = MOB_PLANE
layer = ABOVE_MOB_LAYER
construct_type = /obj/machinery/light_construct/bigfloorlamp
/obj/machinery/light/bigfloorlamp/flicker
auto_flicker = TRUE
/obj/machinery/light_construct/bigfloorlamp
name = "big floor light fixture frame"
desc = "A big floor light fixture under construction."
icon = 'icons/obj/lighting32x64.dmi'
icon_state = "big_flamp-construct-stage1"
anchored = 1
stage = 1
fixture_type = /obj/machinery/light/bigfloorlamp
sheets_refunded = 1
/obj/machinery/light_construct/bigfloorlamp/update_icon()
switch(stage)
if(1)
icon_state = "big_flamp-construct-stage1"
if(2)
icon_state = "big_flamp-construct-stage2"
if(3)
icon_state = "big_flamp-empty"
icons/obj/lighting32x64.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

maps/gateway_vr/variable/arynthilake_a.dmm
+1 -5
View File
@@ -2256,10 +2256,6 @@
},
/turf/simulated/floor/tiled/eris/cafe,
/area/gateway/arynthilake/dome)
"TI" = (
/obj/random/mob/semirandom_mob_spawner/monster,
/turf/simulated/floor/tiled/eris/dark/monofloor,
/area/gateway/arynthilake/dome)
"TR" = (
/turf/unsimulated/wall/planetary/normal{
desc = "Why would you want to go this way??!?";
@@ -6611,7 +6607,7 @@ Qr
Qr
qM
vG
TI
aY
Vo
qM
AQ
maps/gateway_vr/variable/arynthilake_b.dmm
+1 -5
View File
@@ -29,10 +29,6 @@
},
/turf/simulated/floor/tiled/eris/white/brown_platform,
/area/gateway/arynthilake/dome)
"bb" = (
/obj/random/mob/semirandom_mob_spawner/monster/d,
/turf/simulated/floor/tiled/eris/dark/monofloor,
/area/gateway/arynthilake/dome)
"bj" = (
/obj/machinery/light{
dir = 1
@@ -18225,7 +18221,7 @@ ek
ek
Qm
JT
bb
JT
mq
Qm
kv
maps/gateway_vr/variable/arynthilakeunderground_b.dmm
+25 -34
View File
@@ -139,10 +139,6 @@
/area/gateway/arynthilake/underground/intocave{
enter_message = "There is some light filtering from the center of this patch of sand. You could probably climb up from there."
})
"ni" = (
/obj/random/mob/semirandom_mob_spawner/robot,
/turf/simulated/floor/tiled/eris/steel/danger,
/area/gateway/arynthilake/engine)
"oL" = (
/turf/simulated/floor/tiled/eris/steel/techfloor,
/area/gateway/arynthilake/engine)
@@ -197,10 +193,6 @@
"wi" = (
/turf/simulated/wall/r_wall,
/area/gateway/arynthilake/underground/maintenance)
"wG" = (
/obj/random/mob/semirandom_mob_spawner/robot,
/turf/simulated/floor/tiled/eris/steel/techfloor,
/area/gateway/arynthilake/engine)
"xl" = (
/obj/random/awayloot,
/obj/structure/table/rack/shelf/steel,
@@ -442,7 +434,6 @@
/obj/machinery/light/small{
dir = 1
},
/obj/random/mob/semirandom_mob_spawner/robot,
/turf/simulated/floor/tiled/eris/steel/techfloor,
/area/gateway/arynthilake/engine)
"ZX" = (
@@ -915,7 +906,7 @@ oZ
oZ
oZ
oZ
cE
oZ
oZ
wi
oZ
@@ -2026,9 +2017,9 @@ bL
bL
bL
kb
ni
fM
Zl
ni
fM
kb
bL
bL
@@ -3480,7 +3471,7 @@ oZ
oZ
oZ
oZ
cE
oZ
cH
Oe
wi
@@ -4162,7 +4153,7 @@ hy
kb
gk
oL
wG
oL
va
kb
bL
@@ -4882,16 +4873,6 @@ oZ
oZ
wi
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
cE
oZ
oZ
@@ -4900,6 +4881,16 @@ oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
oZ
Ej
wi
bL
@@ -5040,7 +5031,7 @@ oZ
oZ
oZ
oZ
oZ
cE
oZ
Oe
wi
@@ -5174,7 +5165,7 @@ wi
wi
wi
wi
cE
oZ
oZ
oZ
oZ
@@ -6057,7 +6048,7 @@ oZ
wi
oZ
oZ
ID
oZ
oZ
oZ
wi
@@ -6471,7 +6462,7 @@ oZ
oZ
oZ
oZ
ID
oZ
Vj
oZ
oZ
@@ -7431,7 +7422,7 @@ wi
Mg
oZ
oZ
cE
oZ
oZ
oZ
oZ
@@ -12571,7 +12562,7 @@ oZ
oZ
oZ
oZ
LQ
oZ
oZ
oZ
oZ
@@ -12865,7 +12856,7 @@ oZ
oZ
Vj
oZ
LQ
oZ
oZ
oZ
oZ
@@ -14277,7 +14268,7 @@ oZ
oZ
wi
wi
LQ
oZ
oZ
oZ
wi
@@ -15390,7 +15381,7 @@ oZ
oZ
oZ
oZ
LQ
oZ
oZ
oZ
wi
@@ -19999,7 +19990,7 @@ oZ
oZ
Vj
oZ
LQ
oZ
oZ
oZ
oZ
maps/gateway_vr/wildwest.dmm
+8035 -8048
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-01-surface1.dmm
+13 -13
View File
@@ -8890,10 +8890,6 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
"aoR" = (
/obj/machinery/light/flamp/noshade,
/turf/simulated/floor/grass,
/area/tether/surfacebase/surface_one_hall)
"aoS" = (
/obj/structure/flora/ausbushes/ppflowers,
/turf/simulated/floor/grass,
@@ -33298,6 +33294,10 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker/laundry_arrival)
"hzr" = (
/obj/machinery/light/bigfloorlamp,
/turf/simulated/floor/grass,
/area/tether/surfacebase/surface_one_hall)
"hAe" = (
/turf/simulated/floor/looking_glass{
dir = 5
@@ -50366,21 +50366,21 @@ aKd
aie
anW
aoj
aoR
hzr
apA
apA
apA
aoR
hzr
ary
ary
ary
ary
ary
aoR
hzr
apA
apA
apA
aoR
hzr
aoj
awH
axk
@@ -51083,7 +51083,7 @@ aqf
arg
arA
arz
aoR
hzr
arz
asO
apC
@@ -51786,21 +51786,21 @@ aef
bbq
anW
aoj
aoR
hzr
apA
apA
apA
aoR
hzr
ary
ary
ary
ary
ary
aoR
hzr
apA
apA
apA
aoR
hzr
aoj
awH
axm
maps/tether/tether-03-surface3.dmm
+53 -39
View File
@@ -13989,12 +13989,12 @@
/obj/machinery/chemical_dispenser/bar_alc/full{
dir = 8
},
/obj/machinery/light{
dir = 1
},
/obj/structure/sign/poster{
dir = 4
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar)
"awU" = (
@@ -14216,9 +14216,6 @@
/obj/machinery/chemical_dispenser/bar_soft/full{
dir = 8
},
/obj/machinery/light{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/bar)
"axp" = (
@@ -14669,10 +14666,20 @@
/turf/simulated/floor/wood,
/area/tether/surfacebase/bar_backroom)
"axZ" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/floortube{
dir = 4;
pixel_x = 6
},
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
"aya" = (
/obj/machinery/space_heater,
/turf/simulated/floor/tiled/techmaint,
@@ -14974,6 +14981,10 @@
/area/tether/surfacebase/barbackmaintenance)
"ayE" = (
/obj/structure/closet/firecloset,
/obj/machinery/light/floortube{
dir = 8;
pixel_x = -6
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/barbackmaintenance)
"ayF" = (
@@ -16130,9 +16141,6 @@
/obj/random/maintenance/clean,
/obj/random/maintenance/clean,
/obj/structure/table/rack/steel,
/obj/machinery/light/small{
dir = 8
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/barbackmaintenance)
"aAm" = (
@@ -20302,6 +20310,9 @@
"aHl" = (
/obj/structure/table/woodentable,
/obj/item/weapon/flame/candle,
/obj/machinery/light/floortube{
pixel_y = -6
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"aHm" = (
@@ -29818,9 +29829,6 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/light{
dir = 4
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -29852,6 +29860,10 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/light/floortube{
dir = 4;
pixel_x = 6
},
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
"aZd" = (
@@ -30769,7 +30781,11 @@
/turf/simulated/floor/tiled/eris/cafe,
/area/hydroponics)
"baC" = (
/obj/machinery/light,
/obj/structure/table/woodentable,
/obj/machinery/light/floortube{
dir = 1;
pixel_y = 6
},
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"baD" = (
@@ -32902,12 +32918,13 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"bel" = (
/obj/machinery/light{
dir = 8
},
/obj/effect/floor_decal/techfloor{
dir = 8
},
/obj/machinery/light/floortube{
dir = 8;
pixel_x = -3
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"bem" = (
@@ -33276,12 +33293,13 @@
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"beP" = (
/obj/machinery/light{
dir = 4
},
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/machinery/light/floortube{
dir = 4;
pixel_x = 2
},
/turf/simulated/floor/tiled/techfloor,
/area/crew_quarters/sleep/cryo)
"beQ" = (
@@ -33879,7 +33897,7 @@
/obj/effect/landmark{
name = "Observer-Start"
},
/obj/machinery/light/flamp/noshade,
/obj/machinery/hologram/holopad,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bge" = (
@@ -38655,12 +38673,6 @@
},
/turf/simulated/floor/tiled/eris/dark/golden,
/area/shuttle/tourbus/general)
"fdB" = (
/obj/machinery/light/flamp/noshade{
pixel_y = 5
},
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
"feu" = (
/obj/machinery/alarm{
dir = 1;
@@ -40094,13 +40106,11 @@
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/iaa/officea)
"kKV" = (
/obj/machinery/light/flamp/noshade{
pixel_y = 5
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/light/bigfloorlamp,
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
"kQb" = (
@@ -41673,6 +41683,10 @@
},
/turf/simulated/floor/tiled/monotile,
/area/tether/surfacebase/southhall)
"qFD" = (
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"qFL" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -43510,7 +43524,7 @@
/turf/simulated/floor/grass,
/area/hydroponics)
"xwQ" = (
/obj/machinery/light/flamp/noshade,
/obj/machinery/light/bigfloorlamp,
/turf/simulated/floor/grass,
/area/tether/surfacebase/public_garden_three)
"xxe" = (
@@ -48740,7 +48754,7 @@ sXa
pIJ
xwQ
aDe
fdB
xwQ
aDj
ajt
aDu
@@ -56285,7 +56299,7 @@ aZs
aTt
aEb
aSE
aYS
axZ
aYh
aYS
aYY
@@ -58871,7 +58885,7 @@ aHl
aIi
bgd
aLd
bbT
baC
bcm
aAG
bfR
@@ -59153,12 +59167,12 @@ asX
asX
aET
aIo
axZ
bbM
bbM
bbV
aAc
aAG
baC
asX
ayM
bdV
beb
@@ -59300,7 +59314,7 @@ asX
bfY
bbY
bfl
asX
qFD
ayM
ayd
ayb