cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-11 16:14:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add constructable floor lights + mapping subtypes (#93537)

Browse Source 
## About The Pull Request
Features:
- Floor lights can be constructed using a small light fixture on the
turf you are standing on
- Floor light construction sprites
- `/burned` subtypes for lights
- Convert `/build` subtypes to `/empty` subtypes with `UpdatePaths`
script

## Why It's Good For The Game
Floor lights can now be constructed in game using the same mechanics as
other lights. The `/burned` and `/empty` subtypes might be useful for
mapping.

## Changelog
🆑
add: Add constructable floor lights by using a small light fixture on
the floor. They are constructed the same way as other lights.
qol: Add `/burned` subtype to `/obj/machinery/light` for mapping
shenanigans
image: Add floor light construction sprites
map: Converted the `/built` subtype for `/obj/machinery/light` to be
`/empty` and added an UpdatePaths script.
/🆑

---------

Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
This commit is contained in:
Tim
2025-11-10 02:17:51 -06:00
committed by GitHub
parent bf4a53d6dc
commit e30b7d97ef
27 changed files with 209 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/icemoon_surface_pizza.dmm
+1 -1
View File
@@ -812,7 +812,7 @@
/area/ruin/pizzeria/kitchen)
"IW" = (
/obj/effect/spawner/random/entertainment/cigarette,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/surface/outdoors/nospawn)
"IY" = (
_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+9 -9
View File
@@ -199,7 +199,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/turf_decal/tile/brown/opposingcorners,
/turf/open/floor/iron,
/area/ruin/plasma_facility/operations)
@@ -325,7 +325,7 @@
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"fx" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/lava/plasma/ice_moon,
/area/ruin/plasma_facility/operations)
"fJ" = (
@@ -399,7 +399,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/turf/open/floor/iron/grimy,
/area/ruin/plasma_facility/commons)
"gH" = (
@@ -759,7 +759,7 @@
"lX" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/lantern,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/iron/smooth{
initial_gas_mix = "ICEMOON_ATMOS"
},
@@ -1182,7 +1182,7 @@
/turf/open/floor/plating/icemoon,
/area/ruin/plasma_facility/commons)
"sP" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/plasma_facility/operations)
"sX" = (
@@ -1928,7 +1928,7 @@
/area/icemoon/underground/explored)
"Jn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/iron/smooth{
initial_gas_mix = "ICEMOON_ATMOS"
},
@@ -2077,7 +2077,7 @@
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
"KY" = (
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/ruin/plasma_facility/commons)
"Lh" = (
@@ -2126,7 +2126,7 @@
/turf/open/floor/wood/large,
/area/ruin/plasma_facility/commons)
"LY" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/turf/open/floor/plating,
/area/ruin/plasma_facility/commons)
"LZ" = (
@@ -2912,7 +2912,7 @@
/area/ruin/plasma_facility/commons)
"ZC" = (
/obj/effect/decal/cleanable/glass,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/plating/snowed/icemoon,
/area/icemoon/underground/explored)
"ZH" = (
_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
+1 -1
View File
@@ -312,7 +312,7 @@
/obj/structure/rack,
/obj/item/wrench,
/obj/item/crowbar/large/twenty_force,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/plating/icemoon,
/area/ruin/powered/shuttle)
"Kr" = (
_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+1 -1
View File
@@ -266,7 +266,7 @@
/turf/open/floor/wood,
/area/ruin/powered/snow_biodome)
"hA" = (
/obj/machinery/light/built/directional/north,
/obj/machinery/light/empty/directional/north,
/obj/effect/mapping_helpers/no_lava,
/turf/open/floor/pod/dark{
initial_gas_mix = "LAVALAND_ATMOS"
_maps/RandomRuins/SpaceRuins/anomaly_research.dmm
+2 -2
View File
@@ -682,7 +682,7 @@
/turf/open/floor/iron/white,
/area/misc/anomaly_research)
"sX" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/spawner/random/environmentally_safe_anomaly/bioscramblerless,
/obj/item/reagent_containers/cup/bottle/wittel,
/obj/effect/spawner/random/trash/grime,
@@ -1807,7 +1807,7 @@
/turf/closed/mineral/snowmountain/cavern,
/area/misc/anomaly_research)
"Yo" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/spawner/random/trash/garbage,
/obj/effect/spawner/random/trash/mopbucket,
/obj/effect/decal/cleanable/dirt,
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+1 -1
View File
@@ -7054,7 +7054,7 @@
/obj/effect/turf_decal/tile/purple/half/contrasted{
dir = 8
},
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/turf/open/floor/iron/white/textured_edge{
dir = 4
},
_maps/RandomRuins/SpaceRuins/the_faceoff.dmm
+1 -1
View File
@@ -37,7 +37,7 @@
/area/ruin/space)
"aC" = (
/obj/effect/turf_decal/stripes/red/full,
/obj/machinery/light/small/built,
/obj/machinery/light/small/empty,
/obj/item/light/bulb/broken,
/turf/open/floor/iron/dark/smooth_large/airless,
/area/ruin/space)
_maps/RandomRuins/SpaceRuins/waystation.dmm
+1 -1
View File
@@ -1843,7 +1843,7 @@
},
/obj/effect/mapping_helpers/broken_floor,
/obj/item/light/tube/broken,
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/turf/open/floor/iron,
/area/ruin/space/has_grav/waystation/cargooffice)
"HH" = (
_maps/RandomZLevels/caves.dmm
+7 -7
View File
@@ -1038,7 +1038,7 @@
/turf/open/misc/asteroid/basalt,
/area/awaymission/caves/bmp_asteroid)
"nw" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/structure/spider/stickyweb,
/turf/open/floor/iron,
/area/awaymission/caves/bmp_asteroid/level_two)
@@ -1149,7 +1149,7 @@
desc = "A warning sign which warns of potential mech traffic to and from different levels of the mine.";
name = "\improper MECH TUNNEL PASSAGE A2 TO B1"
},
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/misc/asteroid/basalt,
/area/awaymission/caves/bmp_asteroid/level_two)
"vR" = (
@@ -1314,7 +1314,7 @@
/turf/open/floor/iron,
/area/awaymission/caves/research)
"FS" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/spider/stickyweb,
/mob/living/basic/spider/giant/hunter/away_caves,
/turf/open/floor/iron,
@@ -1324,7 +1324,7 @@
/turf/open/misc/asteroid/basalt,
/area/awaymission/caves/bmp_asteroid/level_two)
"Gt" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/machinery/suit_storage_unit/mining{
desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
name = "rusted suit storage unit"
@@ -1347,7 +1347,7 @@
/turf/open/floor/iron,
/area/awaymission/caves/research)
"IE" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/structure/sign/warning/pods/directional/east{
desc = "A warning sign which warns of potential mech traffic to and from different levels of the mine.";
name = "\improper MECH TUNNEL PASSAGE B1 TO A2"
@@ -1397,7 +1397,7 @@
/turf/open/misc/asteroid/basalt,
/area/awaymission/caves/bmp_asteroid/level_two)
"Mk" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/wood,
/area/awaymission/caves/northblock)
"Mq" = (
@@ -1453,7 +1453,7 @@
},
/area/awaymission/caves/bmp_asteroid)
"PS" = (
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/machinery/suit_storage_unit/mining{
desc = "An industrial unit made to hold space suits. Age has seemed to rust the sliding door mechanisms, making it difficult to open.";
name = "rusted suit storage unit"
_maps/RandomZLevels/snowdin.dmm
+3 -3
View File
@@ -7503,7 +7503,7 @@
/area/awaymission/snowdin/cave)
"De" = (
/obj/structure/table/reinforced,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
"Df" = (
@@ -7589,7 +7589,7 @@
/turf/open/floor/plating/snowed/smoothed,
/area/awaymission/snowdin/cave)
"Dx" = (
/obj/machinery/light/built/directional/south,
/obj/machinery/light/empty/directional/south,
/turf/open/floor/plating/snowed,
/area/awaymission/snowdin/cave)
"DA" = (
@@ -7881,7 +7881,7 @@
/area/awaymission/snowdin/cave)
"ES" = (
/obj/structure/table/reinforced,
/obj/machinery/light/built/directional/south,
/obj/machinery/light/empty/directional/south,
/turf/open/floor/iron/dark,
/area/awaymission/snowdin/cave)
"ET" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+2 -2
View File
@@ -22112,7 +22112,7 @@
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/virology)
"fyt" = (
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/turf/open/floor/plating,
/area/station/maintenance/port/aft)
"fyv" = (
@@ -57282,7 +57282,7 @@
"okj" = (
/obj/effect/spawner/random/structure/crate_loot,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/plating,
/area/station/medical/abandoned)
"okk" = (
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+3 -3
View File
@@ -20053,7 +20053,7 @@
/turf/open/floor/wood/parquet,
/area/station/service/bar/atrium)
"fDl" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/iron,
/area/station/maintenance/starboard/fore)
"fDn" = (
@@ -38693,7 +38693,7 @@
/area/station/cargo/storage)
"kUJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/structure/mirror/directional/west,
/obj/structure/sign/poster/contraband/random/directional/south,
/obj/effect/turf_decal/tile/yellow/opposingcorners,
@@ -45830,7 +45830,7 @@
dir = 4
},
/obj/effect/turf_decal/tile/yellow/opposingcorners,
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/turf/open/floor/iron/white,
/area/station/maintenance/port/fore)
"mZG" = (
_maps/map_files/tramstation/tramstation.dmm
+2 -2
View File
@@ -28121,7 +28121,7 @@
/obj/structure/chair/office{
dir = 4
},
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
"iXx" = (
@@ -58927,7 +58927,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/turf/open/floor/carpet,
/area/station/commons/vacant_room/office)
"tDn" = (
_maps/minigame/deathmatch/species_warfare.dmm
+6 -6
View File
@@ -34,7 +34,7 @@
/area/deathmatch)
"cd" = (
/obj/effect/turf_decal/tile/dark_blue/full,
/obj/machinery/light/built/directional/south,
/obj/machinery/light/empty/directional/south,
/obj/machinery/computer{
dir = 4
},
@@ -574,7 +574,7 @@
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
},
/obj/machinery/light/built/directional/south,
/obj/machinery/light/empty/directional/south,
/turf/open/indestructible,
/area/deathmatch)
"wb" = (
@@ -700,7 +700,7 @@
/area/deathmatch)
"zt" = (
/obj/effect/turf_decal/tile/dark_blue/full,
/obj/machinery/light/built/directional/south,
/obj/machinery/light/empty/directional/south,
/obj/machinery/computer{
dir = 8
},
@@ -867,7 +867,7 @@
/obj/item/ammo_casing/rebar,
/obj/item/ammo_casing/rebar,
/obj/item/ammo_casing/rebar,
/obj/machinery/light/built/directional/north,
/obj/machinery/light/empty/directional/north,
/turf/open/indestructible,
/area/deathmatch)
"EC" = (
@@ -963,7 +963,7 @@
/obj/effect/turf_decal/tile/dark_blue/full,
/obj/structure/rack,
/obj/item/gun/energy/e_gun/mini/practice_phaser,
/obj/machinery/light/built/directional/north,
/obj/machinery/light/empty/directional/north,
/turf/open/indestructible/dark/smooth_large,
/area/deathmatch)
"Iu" = (
@@ -1164,7 +1164,7 @@
/obj/structure/rack,
/obj/item/cane,
/obj/structure/fireaxecabinet/directional/south,
/obj/machinery/light/built/directional/south,
/obj/machinery/light/empty/directional/south,
/turf/open/indestructible/dark/smooth_large,
/area/deathmatch)
"ON" = (
_maps/shuttles/emergency_birdshot.dmm
+1 -1
View File
@@ -214,7 +214,7 @@
anchored = 1;
dir = 8
},
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/turf/open/floor/plating/airless,
/area/shuttle/escape)
"kZ" = (
_maps/shuttles/whiteship_birdshot.dmm
+6 -6
View File
@@ -201,12 +201,12 @@
amount = 10
},
/obj/structure/cable,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/engine)
"gv" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/textured,
/area/shuttle/abandoned/cargo)
@@ -240,7 +240,7 @@
/obj/machinery/atmospherics/components/tank/air{
dir = 1
},
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/catwalk_floor,
/area/shuttle/abandoned/engine)
"iB" = (
@@ -286,7 +286,7 @@
"jY" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/standard_unit,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/iron/smooth,
/area/shuttle/abandoned/crew)
"ku" = (
@@ -847,7 +847,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/medbay)
"Cz" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
@@ -1424,7 +1424,7 @@
pixel_y = 4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/turf/open/floor/carpet/green,
/area/shuttle/abandoned/bar)
"WW" = (
_maps/shuttles/whiteship_box.dmm
+21 -21
View File
@@ -190,7 +190,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/machinery/firealarm/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -280,7 +280,7 @@
/area/shuttle/abandoned/medbay)
"aJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/firealarm/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -396,7 +396,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"aW" = (
@@ -497,7 +497,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"bh" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"bi" = (
@@ -553,7 +553,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -656,7 +656,7 @@
/area/shuttle/abandoned/medbay)
"bA" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/structure/closet/secure_closet/medical2{
anchored = 1
},
@@ -670,7 +670,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/sleeper,
/obj/effect/turf_decal/delivery,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/machinery/firealarm/directional/north,
/turf/open/floor/iron,
/area/shuttle/abandoned/medbay)
@@ -705,7 +705,7 @@
/area/shuttle/abandoned/medbay)
"bF" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/cable,
/turf/open/floor/iron/white/side{
@@ -930,7 +930,7 @@
"ce" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/structure/closet/secure_closet/medical3{
anchored = 1
},
@@ -979,7 +979,7 @@
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/iron/white/side{
dir = 6
},
@@ -995,7 +995,7 @@
/area/shuttle/abandoned/medbay)
"cl" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue{
@@ -1009,7 +1009,7 @@
/obj/structure/rack,
/obj/item/storage/toolbox/emergency,
/obj/item/wrench,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/machinery/firealarm/directional/west,
/obj/machinery/button/door/directional/south{
id = "whiteship_windows";
@@ -1190,7 +1190,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/medical/emergency,
/obj/machinery/iv_drip,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/iron/white/side{
dir = 1
@@ -1245,7 +1245,7 @@
/obj/machinery/shower/directional/south,
/obj/item/soap,
/obj/structure/curtain,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/turf/open/floor/iron/freezer,
/area/shuttle/abandoned/medbay)
"cL" = (
@@ -1372,7 +1372,7 @@
"cX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/structure/table,
/obj/machinery/door/window/left/directional/west{
name = "Medical Equipment Storage"
@@ -1554,7 +1554,7 @@
/area/shuttle/abandoned/medbay)
"dn" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/iron/white/side{
dir = 4
},
@@ -1599,7 +1599,7 @@
"ds" = (
/obj/structure/sign/warning/vacuum/external/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/plating,
/area/shuttle/abandoned/medbay)
"dt" = (
@@ -1615,7 +1615,7 @@
/obj/item/storage/box/zipties,
/obj/item/assembly/flash/handheld,
/obj/item/melee/baton/telescopic,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/machinery/airalarm/directional/west,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/power/apc/auto_name/directional/north,
@@ -1680,7 +1680,7 @@
pixel_y = 3
},
/obj/item/storage/box/donkpockets,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/turf_decal/tile/neutral/fourcorners,
/turf/open/floor/iron,
/area/shuttle/abandoned/crew)
@@ -1733,7 +1733,7 @@
"Pz" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/bed{
dir = 4
},
@@ -1755,7 +1755,7 @@
"Uq" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/all_access,
_maps/shuttles/whiteship_delta.dmm
+23 -23
View File
@@ -52,7 +52,7 @@
/obj/machinery/shower/directional/south,
/obj/item/soap,
/obj/structure/curtain,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/freezer,
/area/shuttle/abandoned/crew)
@@ -67,7 +67,7 @@
/turf/open/floor/iron/freezer,
/area/shuttle/abandoned/crew)
"al" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed{
dir = 4
@@ -97,7 +97,7 @@
/area/shuttle/abandoned/crew)
"ao" = (
/obj/structure/sign/warning/vacuum/external/directional/east,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/plating,
/area/shuttle/abandoned/crew)
"ap" = (
@@ -122,7 +122,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"at" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/spider/stickyweb,
@@ -296,7 +296,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"aL" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line{
dir = 5
@@ -371,7 +371,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/crew)
"aV" = (
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -399,7 +399,7 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 6
},
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -424,7 +424,7 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 10
},
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 1
@@ -505,7 +505,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"bl" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -521,7 +521,7 @@
"bn" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/structure/spider/stickyweb,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
@@ -619,7 +619,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"bx" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -823,14 +823,14 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/iron,
/area/shuttle/abandoned/crew)
"bV" = (
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
@@ -977,7 +977,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/crew)
"ck" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
@@ -1116,7 +1116,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/east,
/obj/structure/spider/stickyweb,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue{
@@ -1240,7 +1240,7 @@
/area/shuttle/abandoned/engine)
"cP" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/structure/cable,
/obj/effect/turf_decal/tile/blue/half/contrasted{
@@ -1300,7 +1300,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/cargo)
"cX" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/structure/spider/stickyweb,
/turf/open/floor/iron,
@@ -1377,7 +1377,7 @@
/turf/open/floor/iron/white,
/area/shuttle/abandoned/medbay)
"dj" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/structure/spider/stickyweb,
/obj/machinery/firealarm/directional/north,
@@ -1422,7 +1422,7 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 5
},
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
@@ -1564,7 +1564,7 @@
/area/shuttle/abandoned/medbay)
"dE" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/spider/stickyweb,
@@ -1591,14 +1591,14 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/medbay)
"dJ" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
/turf/open/floor/iron,
/area/shuttle/abandoned/cargo)
"dM" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/white/line{
dir = 6
@@ -1666,7 +1666,7 @@
/area/shuttle/abandoned/medbay)
"dT" = (
/obj/structure/sign/warning/vacuum/external/directional/east,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/abandoned/medbay)
_maps/shuttles/whiteship_meta.dmm
+23 -23
View File
@@ -142,7 +142,7 @@
"at" = (
/obj/structure/sign/warning/vacuum/external/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/plating,
/area/shuttle/abandoned/crew)
"ax" = (
@@ -295,7 +295,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"ba" = (
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -317,7 +317,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/crew)
"be" = (
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -454,7 +454,7 @@
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
"bz" = (
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/west,
/obj/structure/closet/crate/internals,
@@ -480,7 +480,7 @@
/area/shuttle/abandoned/bar)
"bF" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/structure/curtain,
/obj/machinery/shower/directional/south,
/obj/item/soap,
@@ -529,7 +529,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
"bM" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
/obj/machinery/microwave,
@@ -647,7 +647,7 @@
/area/shuttle/abandoned/bar)
"cd" = (
/obj/structure/table,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/item/paper_bin{
pixel_x = -4
@@ -707,7 +707,7 @@
/area/shuttle/abandoned/engine)
"ci" = (
/obj/structure/sign/warning/vacuum/external/directional/north,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -832,7 +832,7 @@
/area/shuttle/abandoned/bar)
"cD" = (
/obj/structure/table,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/cell_charger,
/obj/item/stock_parts/power_store/cell/high,
@@ -888,7 +888,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/engine)
"cI" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
@@ -968,7 +968,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/cargo)
"cS" = (
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/firealarm/directional/east,
@@ -1071,7 +1071,7 @@
"dk" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/iron/cafeteria,
/area/shuttle/abandoned/bar)
@@ -1338,7 +1338,7 @@
/area/shuttle/abandoned/bar)
"ec" = (
/obj/structure/sign/warning/vacuum/external/directional/west,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/plating,
/area/shuttle/abandoned/bar)
"ed" = (
@@ -1374,12 +1374,12 @@
pixel_x = -3;
pixel_y = 6
},
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"ef" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/machinery/hydroponics/constructable,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/green/half/contrasted{
@@ -1463,7 +1463,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
"he" = (
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/west,
@@ -1618,7 +1618,7 @@
/turf/open/floor/iron,
/area/shuttle/abandoned/bar)
"uS" = (
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
@@ -1631,7 +1631,7 @@
},
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -1671,7 +1671,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/crew)
"Aa" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/cigarette,
/obj/effect/decal/cleanable/dirt,
@@ -1820,7 +1820,7 @@
},
/obj/machinery/airalarm/directional/north,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/cable,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine)
@@ -1852,7 +1852,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bridge)
"HJ" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/coffee,
/obj/effect/decal/cleanable/dirt,
@@ -1985,7 +1985,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned/bar)
"RV" = (
/obj/machinery/light/small/built/directional/south,
/obj/machinery/light/small/empty/directional/south,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/airalarm/directional/south,
/obj/effect/mapping_helpers/airalarm/all_access,
@@ -2018,7 +2018,7 @@
/obj/structure/bed{
dir = 4
},
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/item/bedsheet/brown{
dir = 4
},
_maps/shuttles/whiteship_pubby.dmm
+7 -7
View File
@@ -26,7 +26,7 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 8
},
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
@@ -207,7 +207,7 @@
/obj/effect/turf_decal/trimline/purple/filled/line{
dir = 1
},
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/structure/table,
/obj/effect/spawner/random/food_or_drink/donkpockets{
pixel_y = 5
@@ -303,7 +303,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
"na" = (
/obj/machinery/light/small/built/directional/east,
/obj/machinery/light/small/empty/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/cable,
@@ -532,7 +532,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
"vB" = (
@@ -850,7 +850,7 @@
"JI" = (
/obj/structure/sign/warning/vacuum/external/directional/west,
/obj/machinery/suit_storage_unit/standard_unit,
/obj/machinery/light/small/built/directional/north,
/obj/machinery/light/small/empty/directional/north,
/obj/effect/turf_decal/delivery/white,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
@@ -991,7 +991,7 @@
/turf/open/floor/iron/dark,
/area/shuttle/abandoned)
"Pu" = (
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/obj/effect/turf_decal/siding/purple{
dir = 10
},
@@ -1214,7 +1214,7 @@
pixel_x = -4
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small/built/directional/west,
/obj/machinery/light/small/empty/directional/west,
/turf/open/floor/pod/light,
/area/shuttle/abandoned)
"ZT" = (
_maps/virtual_domains/fredingtonfastingbear.dmm
+11 -11
View File
@@ -131,7 +131,7 @@
/obj/effect/decal/cleanable/blood/tracks{
dir = 4
},
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"hq" = (
@@ -187,7 +187,7 @@
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"kL" = (
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/obj/item/light/tube/broken,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
@@ -279,7 +279,7 @@
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"pr" = (
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"pK" = (
@@ -481,7 +481,7 @@
/area/virtual_domain)
"wM" = (
/obj/item/toy/balloon/heart,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/obj/structure/fake_stairs/wood{
dir = 1
},
@@ -585,7 +585,7 @@
"Ct" = (
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"Dx" = (
@@ -622,7 +622,7 @@
/area/virtual_domain/protected_space/fullbright)
"Fy" = (
/obj/effect/decal/cleanable/confetti,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/obj/structure/fake_stairs/wood,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
@@ -635,7 +635,7 @@
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"Gn" = (
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/obj/effect/decal/cleanable/food/tomato_smudge,
/obj/effect/landmark/bitrunning/cache_spawn,
/turf/open/floor/iron/kitchen/small,
@@ -851,13 +851,13 @@
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/effect/turf_decal/tile/blue/opposingcorners,
/obj/item/toy/balloon/heart,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"RB" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/obj/effect/decal/cleanable/glass/plastitanium,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
@@ -874,7 +874,7 @@
"SE" = (
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/effect/turf_decal/tile/bar/opposingcorners,
/obj/machinery/light/built/directional/east,
/obj/machinery/light/empty/directional/east,
/obj/effect/decal/cleanable/glass/plastitanium,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
@@ -947,7 +947,7 @@
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/effect/turf_decal/tile/dark_red/opposingcorners,
/obj/effect/decal/cleanable/blood/gibs/old,
/obj/machinery/light/built/directional/west,
/obj/machinery/light/empty/directional/west,
/turf/open/floor/iron/kitchen,
/area/virtual_domain)
"VS" = (
code/modules/power/lighting/light.dm
+12 -1
View File
@@ -424,6 +424,8 @@
frame = new /obj/item/wallframe/light_fixture(drop_point)
if("bulb")
frame = new /obj/item/wallframe/light_fixture/small(drop_point)
if("floor bulb")
frame = new /obj/item/wallframe/light_fixture/small(drop_point)
if(!disassembled)
frame.take_damage(frame.max_integrity * 0.5, sound_effect = FALSE)
if(status != LIGHT_BROKEN)
@@ -728,7 +730,7 @@
layer = BELOW_CATWALK_LAYER
plane = FLOOR_PLANE
light_type = /obj/item/light/bulb
fitting = "bulb"
fitting = "floor bulb"
nightshift_brightness = 4
fire_brightness = 4.5
@@ -739,6 +741,15 @@
status = LIGHT_BROKEN
icon_state = "floor-broken"
/obj/machinery/light/floor/burned
status = LIGHT_BURNED
icon_state = "floor-burned"
/obj/machinery/light/floor/empty
icon_state = "floor-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
/obj/machinery/light/floor/transport
name = "transport light"
break_if_moved = FALSE
code/modules/power/lighting/light_construct.dm
+10 -2
View File
@@ -141,9 +141,11 @@
tool.play_tool_sound(src, 75)
switch(fixture_type)
if("tube")
new_light = new /obj/machinery/light/built(loc)
new_light = new /obj/machinery/light/empty(loc)
if("bulb")
new_light = new /obj/machinery/light/small/built(loc)
new_light = new /obj/machinery/light/small/empty(loc)
if("floor")
new_light = new /obj/machinery/light/floor/empty(loc)
new_light.setDir(dir)
new_light.find_and_hang_on_wall()
transfer_fingerprints_to(new_light)
@@ -169,3 +171,9 @@
icon_state = "bulb-construct-stage1"
fixture_type = "bulb"
sheets_refunded = 1
/obj/structure/light_construct/floor
name = "floor light fixture frame"
icon_state = "floor-construct-stage1"
fixture_type = "floor"
sheets_refunded = 1
code/modules/power/lighting/light_mapping_helpers.dm
+12 -4
View File
@@ -2,7 +2,11 @@
status = LIGHT_BROKEN
icon_state = "tube-broken"
/obj/machinery/light/built
/obj/machinery/light/burned
status = LIGHT_BURNED
icon_state = "tube-burned"
/obj/machinery/light/empty
icon_state = "tube-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
@@ -68,7 +72,11 @@
status = LIGHT_BROKEN
icon_state = "bulb-broken"
/obj/machinery/light/small/built
/obj/machinery/light/small/burned
status = LIGHT_BURNED
icon_state = "bulb-burned"
/obj/machinery/light/small/empty
icon_state = "bulb-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
@@ -105,7 +113,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/broken, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_construct, 0)
// ---- Tube frames
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/built, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/empty, 0)
// ---- No nightlight tubes
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/no_nightlight, 0)
@@ -148,7 +156,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/light_construct/small, 0)
// ---- Bulb frames
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/built, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/empty, 0)
// ---- Broken bulbs
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/broken, 0)
code/modules/power/lighting/light_wallframes.dm
+32
View File
@@ -20,3 +20,35 @@
to_chat(user, span_warning("You cannot place [src] in this area!"))
return
return TRUE
/obj/item/wallframe/light_fixture/small/attack_self(mob/user)
var/turf/local_turf = get_turf(user)
var/area/local_area = get_area(user)
if(!isturf(user.loc) || !isfloorturf(local_turf))
balloon_alert(user, "cannot place here!")
return
if(local_area.always_unpowered || !local_area.static_lighting)
balloon_alert(user, "cannot place in this area!")
return
for(var/obj/object in local_turf)
if(object.density && !(object.obj_flags & IGNORE_DENSITY) || object.obj_flags & BLOCKS_CONSTRUCTION)
balloon_alert(user, "something is in the way!")
return
if(local_turf.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
balloon_alert(user, "remove the floor plating!")
return
if(locate(/obj/structure/light_construct/floor) in local_turf)
balloon_alert(user, "already has a light!")
return
if(locate(/obj/machinery/light/floor) in local_turf)
balloon_alert(user, "already has a light!")
return
playsound(src.loc, 'sound/machines/click.ogg', 75, TRUE)
user.visible_message(span_notice("[user.name] attaches [src] to the floor."),
span_notice("You attach [src] to the floor."),
span_hear("You hear clicking."))
new /obj/structure/light_construct/floor(local_turf)
qdel(src)
icons/obj/lighting.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 78 KiB

tools/UpdatePaths/Scripts/93537_replace_built_light.txt
+11
View File
@@ -0,0 +1,11 @@
/obj/machinery/light/built : /obj/machinery/light/empty{@OLD}
/obj/machinery/light/built/directional/north : /obj/machinery/light/empty/directional/north{@OLD}
/obj/machinery/light/built/directional/south : /obj/machinery/light/empty/directional/south{@OLD}
/obj/machinery/light/built/directional/east : /obj/machinery/light/empty/directional/east{@OLD}
/obj/machinery/light/built/directional/west : /obj/machinery/light/empty/directional/west{@OLD}
/obj/machinery/light/small/built : /obj/machinery/light/small/empty{@OLD}
/obj/machinery/light/small/built/directional/north : /obj/machinery/light/small/empty/directional/north{@OLD}
/obj/machinery/light/small/built/directional/south : /obj/machinery/light/small/empty/directional/south{@OLD}
/obj/machinery/light/small/built/directional/east : /obj/machinery/light/small/empty/directional/east{@OLD}
/obj/machinery/light/small/built/directional/west : /obj/machinery/light/small/empty/directional/west{@OLD}