mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
More lighting fixes
This commit is contained in:
Mark van Alphen
@@ -12,7 +12,7 @@
|
||||
/area/space)
|
||||
"ad" = (
|
||||
/turf/space/transit,
|
||||
/area/syndicate_station/transit)
|
||||
/area/space)
|
||||
"ae" = (
|
||||
/turf/unsimulated/wall{
|
||||
tag = "icon-iron6";
|
||||
@@ -1284,7 +1284,7 @@
|
||||
width = 18
|
||||
},
|
||||
/turf/space/transit,
|
||||
/area/syndicate_station/transit)
|
||||
/area/space)
|
||||
"dy" = (
|
||||
/obj/docking_port/stationary/transit{
|
||||
dir = 8;
|
||||
|
||||
@@ -104,7 +104,7 @@
|
||||
icon_state = "pwall";
|
||||
dir = 1
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"ar" = (
|
||||
/turf/simulated/floor/plating/airless,
|
||||
/turf/simulated/shuttle/wall{
|
||||
@@ -143,7 +143,7 @@
|
||||
tag = "icon-floor2";
|
||||
icon_state = "floor2"
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"aw" = (
|
||||
/obj/structure/shuttle/engine/propulsion{
|
||||
dir = 8;
|
||||
@@ -156,7 +156,7 @@
|
||||
tag = ""
|
||||
},
|
||||
/turf/simulated/floor/plating/airless,
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"ax" = (
|
||||
/obj/machinery/door/airlock/hatch,
|
||||
/turf/simulated/shuttle/floor{
|
||||
@@ -172,7 +172,7 @@
|
||||
tag = "icon-floor2";
|
||||
icon_state = "floor2"
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"az" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -223,7 +223,7 @@
|
||||
icon_state = "pwall";
|
||||
dir = 5
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"aH" = (
|
||||
/obj/structure/alien/weeds,
|
||||
/turf/simulated/floor/plating/airless{
|
||||
@@ -252,7 +252,7 @@
|
||||
icon_state = "pwall";
|
||||
dir = 6
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"aL" = (
|
||||
/turf/space,
|
||||
/turf/simulated/shuttle/wall{
|
||||
@@ -260,7 +260,7 @@
|
||||
icon_state = "pwall";
|
||||
dir = 9
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/abandoned)
|
||||
"aM" = (
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced{
|
||||
@@ -4315,12 +4315,6 @@
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/mine/eva)
|
||||
"kh" = (
|
||||
/turf/simulated/floor/plating/airless{
|
||||
icon_state = "asteroidwarning";
|
||||
dir = 5
|
||||
},
|
||||
/area/space)
|
||||
"ki" = (
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/plating/airless/asteroid,
|
||||
@@ -4598,7 +4592,7 @@
|
||||
icon_state = "asteroidwarning";
|
||||
dir = 4
|
||||
},
|
||||
/area/space)
|
||||
/area/mine/dangerous/explored)
|
||||
"kR" = (
|
||||
/obj/machinery/door/airlock/external{
|
||||
frequency = 1379;
|
||||
@@ -5368,12 +5362,6 @@
|
||||
},
|
||||
/turf/simulated/floor/plasteel,
|
||||
/area/mine/eva)
|
||||
"mx" = (
|
||||
/turf/simulated/floor/plating/airless{
|
||||
icon_state = "asteroidwarning";
|
||||
dir = 6
|
||||
},
|
||||
/area/space)
|
||||
"my" = (
|
||||
/obj/structure/disposalpipe/segment,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden,
|
||||
@@ -52246,11 +52234,11 @@ bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
ll
|
||||
kh
|
||||
bV
|
||||
dP
|
||||
kQ
|
||||
mx
|
||||
ll
|
||||
dK
|
||||
bV
|
||||
mQ
|
||||
nj
|
||||
nj
|
||||
@@ -52503,11 +52491,11 @@ bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
ll
|
||||
ll
|
||||
ll
|
||||
ll
|
||||
ll
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
bV
|
||||
|
||||
@@ -24,18 +24,21 @@
|
||||
match_tag = "arrivals"
|
||||
match_width = 5
|
||||
match_height = 4
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/dynamic/source/lobby_russian
|
||||
name = "\improper Russian Lounge"
|
||||
match_tag = "arrivals"
|
||||
match_width = 5
|
||||
match_height = 4
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/dynamic/source/lobby_disco
|
||||
name = "\improper Disco Lounge"
|
||||
match_tag = "arrivals"
|
||||
match_width = 5
|
||||
match_height = 4
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
@@ -6,7 +6,7 @@
|
||||
name = "NICE NAME" (not required but makes things really nice)
|
||||
icon = "ICON FILENAME" (defaults to areas.dmi)
|
||||
icon_state = "NAME OF ICON" (defaults to "unknown" (blank))
|
||||
requires_power = 0 (defaults to 1)
|
||||
requires_power = FALSE (defaults to TRUE)
|
||||
music = "music/music.ogg" (defaults to "music/music.ogg")
|
||||
|
||||
NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0
|
||||
@@ -44,29 +44,19 @@ var/list/ghostteleportlocs = list()
|
||||
|
||||
/*-----------------------------------------------------------------------------*/
|
||||
|
||||
/area/engine/
|
||||
|
||||
/area/turret_protected/
|
||||
|
||||
/area/arrival
|
||||
requires_power = 0
|
||||
|
||||
/area/arrival/start
|
||||
name = "\improper Arrival Area"
|
||||
icon_state = "start"
|
||||
|
||||
/area/admin
|
||||
name = "\improper Admin Room"
|
||||
icon_state = "start"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
|
||||
/area/adminconstruction
|
||||
name = "\improper Admin Testing Area"
|
||||
icon_state = "start"
|
||||
requires_power = 0
|
||||
dynamic_lighting = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/space
|
||||
icon_state = "space"
|
||||
@@ -77,7 +67,7 @@ var/list/ghostteleportlocs = list()
|
||||
power_equip = FALSE
|
||||
power_environ = FALSE
|
||||
valid_territory = FALSE
|
||||
outdoors = 1
|
||||
outdoors = TRUE
|
||||
ambientsounds = list('sound/ambience/ambispace.ogg','sound/music/title2.ogg','sound/music/space.ogg','sound/music/traitor.ogg')
|
||||
|
||||
/area/space/nearstation
|
||||
@@ -107,6 +97,7 @@ var/list/ghostteleportlocs = list()
|
||||
no_teleportlocs = TRUE
|
||||
requires_power = FALSE
|
||||
valid_territory = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/shuttle/arrival
|
||||
name = "\improper Arrival Shuttle"
|
||||
@@ -232,12 +223,10 @@ var/list/ghostteleportlocs = list()
|
||||
/area/shuttle/gamma/space
|
||||
icon_state = "shuttle"
|
||||
name = "\improper Gamma Armory"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/gamma/station
|
||||
icon_state = "shuttle"
|
||||
name = "\improper Gamma Armory Station"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/prison/
|
||||
name = "\improper Prison Shuttle"
|
||||
@@ -341,17 +330,14 @@ var/list/ghostteleportlocs = list()
|
||||
/area/shuttle/vox
|
||||
name = "\improper Vox Skipjack"
|
||||
icon_state = "shuttle"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/vox/station
|
||||
name = "\improper Vox Skipjack"
|
||||
icon_state = "yellow"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/salvage
|
||||
name = "\improper Salvage Ship"
|
||||
icon_state = "yellow"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/salvage/start
|
||||
name = "\improper Middle of Nowhere"
|
||||
@@ -408,7 +394,6 @@ var/list/ghostteleportlocs = list()
|
||||
/area/shuttle/supply
|
||||
name = "Supply Shuttle"
|
||||
icon_state = "shuttle3"
|
||||
requires_power = 0
|
||||
|
||||
/area/shuttle/abandoned
|
||||
name = "Abandoned Ship"
|
||||
@@ -422,7 +407,6 @@ var/list/ghostteleportlocs = list()
|
||||
/area/shuttle/trade
|
||||
name = "Trade Shuttle"
|
||||
icon_state = "shuttle"
|
||||
requires_power = FALSE
|
||||
|
||||
/area/shuttle/trade/sol
|
||||
name = "Sol Freighter"
|
||||
@@ -445,11 +429,6 @@ var/list/ghostteleportlocs = list()
|
||||
|
||||
// === end remove
|
||||
|
||||
/area/alien
|
||||
name = "\improper Alien base"
|
||||
icon_state = "yellow"
|
||||
requires_power = FALSE
|
||||
|
||||
// CENTCOM
|
||||
|
||||
/area/centcom
|
||||
@@ -503,7 +482,8 @@ var/list/ghostteleportlocs = list()
|
||||
/area/syndicate_mothership
|
||||
name = "\improper Syndicate Forward Base"
|
||||
icon_state = "syndie-ship"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
nad_allowed = TRUE
|
||||
|
||||
/area/syndicate_mothership/control
|
||||
@@ -525,6 +505,7 @@ var/list/ghostteleportlocs = list()
|
||||
icon_state = "asteroid"
|
||||
requires_power = FALSE
|
||||
valid_territory = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/asteroid/cave // -- TLE
|
||||
name = "\improper Asteroid - Underground"
|
||||
@@ -571,72 +552,25 @@ var/list/ghostteleportlocs = list()
|
||||
name = "\improper Abandoned Drug Lab"
|
||||
icon_state = "green"
|
||||
|
||||
//ENEMY
|
||||
|
||||
//names are used
|
||||
/area/syndicate_station
|
||||
name = "\improper Syndicate Station"
|
||||
icon_state = "yellow"
|
||||
requires_power = 0
|
||||
|
||||
/area/syndicate_station/start
|
||||
name = "\improper Syndicate Forward Operating Base"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/syndicate_station/southwest
|
||||
name = "\improper South-West of SS13"
|
||||
icon_state = "southwest"
|
||||
|
||||
/area/syndicate_station/northwest
|
||||
name = "\improper North-West of SS13"
|
||||
icon_state = "northwest"
|
||||
|
||||
/area/syndicate_station/northeast
|
||||
name = "\improper North-East of SS13"
|
||||
icon_state = "northeast"
|
||||
|
||||
/area/syndicate_station/southeast
|
||||
name = "\improper South-East of SS13"
|
||||
icon_state = "southeast"
|
||||
|
||||
/area/syndicate_station/north
|
||||
name = "\improper North of SS13"
|
||||
icon_state = "north"
|
||||
|
||||
/area/syndicate_station/south
|
||||
name = "\improper South of SS13"
|
||||
icon_state = "south"
|
||||
|
||||
/area/syndicate_station/commssat
|
||||
name = "\improper South of the Communication Satellite"
|
||||
icon_state = "south"
|
||||
|
||||
/area/syndicate_station/mining
|
||||
name = "\improper North-East of the Mining Asteroid"
|
||||
icon_state = "north"
|
||||
|
||||
/area/syndicate_station/transit
|
||||
name = "\improper Hyperspace"
|
||||
icon_state = "shuttle"
|
||||
|
||||
//Abductors
|
||||
/area/abductor_ship
|
||||
name = "\improper Abductor Ship"
|
||||
icon_state = "yellow"
|
||||
requires_power = FALSE
|
||||
has_gravity = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/wizard_station
|
||||
name = "\improper Wizard's Den"
|
||||
icon_state = "yellow"
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/ninja
|
||||
name = "\improper Ninja Area Parent"
|
||||
icon_state = "ninjabase"
|
||||
requires_power = FALSE
|
||||
no_teleportlocs = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/ninja/outpost
|
||||
name = "\improper SpiderClan Outpost"
|
||||
@@ -651,183 +585,15 @@ var/list/ghostteleportlocs = list()
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
no_teleportlocs = TRUE
|
||||
|
||||
/area/vox_station/transit
|
||||
name = "\improper Hyperspace"
|
||||
icon_state = "shuttle"
|
||||
requires_power = 0
|
||||
|
||||
/area/vox_station/southwest_solars
|
||||
name = "\improper Aft Port Solars"
|
||||
icon_state = "southwest"
|
||||
requires_power = 0
|
||||
|
||||
/area/vox_station/northwest_solars
|
||||
name = "\improper Fore Port Solars"
|
||||
icon_state = "northwest"
|
||||
requires_power = 0
|
||||
|
||||
/area/vox_station/northeast_solars
|
||||
name = "\improper Fore Starboard Solars"
|
||||
icon_state = "northeast"
|
||||
requires_power = 0
|
||||
|
||||
/area/vox_station/southeast_solars
|
||||
name = "\improper Aft Starboard Solars"
|
||||
icon_state = "southeast"
|
||||
requires_power = 0
|
||||
|
||||
/area/trader_station
|
||||
name = "Trade Base"
|
||||
icon_state = "yellow"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/trader_station/sol
|
||||
name = "Jupiter Station 6"
|
||||
|
||||
/area/vox_station/mining
|
||||
name = "\improper Nearby Mining Asteroid"
|
||||
icon_state = "north"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/start
|
||||
name = "\improper Alien Shuttle"
|
||||
icon_state = "north"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/transit
|
||||
name = "\improper Hyperspace"
|
||||
icon_state = "shuttle"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/southwest
|
||||
name = "\improper Aft Port Solars Landing Area"
|
||||
icon_state = "southwest"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/northwest
|
||||
name = "\improper Fore Port Solars Landing Area"
|
||||
icon_state = "northwest"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/northeast
|
||||
name = "\improper Fore Starboard Solars Landing Area"
|
||||
icon_state = "northeast"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/southeast
|
||||
name = "\improper Aft Starboard Solars Landing Area"
|
||||
icon_state = "southeast"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/east
|
||||
name = "\improper East Landing Area"
|
||||
icon_state = "east"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/west
|
||||
name = "\improper West Landing Area"
|
||||
icon_state = "west"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/researchoutpost
|
||||
name = "\improper Research Outpost Landing Area"
|
||||
icon_state = "north"
|
||||
requires_power = 0
|
||||
|
||||
/area/xenos_station/miningoutpost
|
||||
name = "\improper Mining Outpost Landing Area"
|
||||
icon_state = "south"
|
||||
requires_power = 0
|
||||
|
||||
//PRISON
|
||||
/area/prison
|
||||
name = "\improper Prison Station"
|
||||
icon_state = "brig"
|
||||
|
||||
/area/prison/arrival_airlock
|
||||
name = "\improper Prison Station Airlock"
|
||||
icon_state = "green"
|
||||
requires_power = 0
|
||||
|
||||
/area/prison/control
|
||||
name = "\improper Prison Security Checkpoint"
|
||||
icon_state = "security"
|
||||
|
||||
/area/prison/crew_quarters
|
||||
name = "\improper Prison Security Quarters"
|
||||
icon_state = "security"
|
||||
|
||||
/area/prison/rec_room
|
||||
name = "\improper Prison Rec Room"
|
||||
icon_state = "green"
|
||||
|
||||
/area/prison/closet
|
||||
name = "\improper Prison Supply Closet"
|
||||
icon_state = "dk_yellow"
|
||||
|
||||
/area/prison/hallway/fore
|
||||
name = "\improper Prison Fore Hallway"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/prison/hallway/aft
|
||||
name = "\improper Prison Aft Hallway"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/prison/hallway/port
|
||||
name = "\improper Prison Port Hallway"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/prison/hallway/starboard
|
||||
name = "\improper Prison Starboard Hallway"
|
||||
icon_state = "yellow"
|
||||
|
||||
/area/prison/morgue
|
||||
name = "\improper Prison Morgue"
|
||||
icon_state = "morgue"
|
||||
|
||||
/area/prison/medical_research
|
||||
name = "\improper Prison Genetic Research"
|
||||
icon_state = "medresearch"
|
||||
|
||||
/area/prison/medical
|
||||
name = "\improper Prison Medbay"
|
||||
icon_state = "medbay"
|
||||
|
||||
/area/prison/solar
|
||||
name = "\improper Prison Solar Array"
|
||||
icon_state = "storage"
|
||||
requires_power = 0
|
||||
|
||||
/area/prison/podbay
|
||||
name = "\improper Prison Podbay"
|
||||
icon_state = "dk_yellow"
|
||||
|
||||
/area/prison/solar_control
|
||||
name = "\improper Prison Solar Array Control"
|
||||
icon_state = "dk_yellow"
|
||||
|
||||
/area/prison/solitary
|
||||
name = "\improper Solitary Confinement"
|
||||
icon_state = "brig"
|
||||
fast_despawn = TRUE
|
||||
|
||||
/area/prison/cell_block
|
||||
name = "\improper Prison Cell Block"
|
||||
icon_state = "brig"
|
||||
fast_despawn = TRUE
|
||||
|
||||
/area/prison/cell_block/A
|
||||
name = "\improper Prison Cell Block A"
|
||||
icon_state = "brig"
|
||||
|
||||
/area/prison/cell_block/B
|
||||
name = "\improper Prison Cell Block B"
|
||||
icon_state = "brig"
|
||||
|
||||
/area/prison/cell_block/C
|
||||
name = "\improper Prison Cell Block C"
|
||||
icon_state = "brig"
|
||||
|
||||
//Labor camp
|
||||
/area/mine/laborcamp
|
||||
name = "Labor Camp"
|
||||
@@ -1332,7 +1098,8 @@ var/list/ghostteleportlocs = list()
|
||||
/area/engine/engine_smes
|
||||
name = "\improper Engineering SMES"
|
||||
icon_state = "engine_smes"
|
||||
requires_power = 0//This area only covers the batteries and they deal with their own power
|
||||
requires_power = FALSE //This area only covers the batteries and they deal with their own power
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/engine/engineering
|
||||
name = "Engineering"
|
||||
@@ -1377,8 +1144,7 @@ var/list/ghostteleportlocs = list()
|
||||
//Solars
|
||||
|
||||
/area/solar
|
||||
requires_power = 0
|
||||
dynamic_lighting = 0
|
||||
requires_power = FALSE
|
||||
valid_territory = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_IFSTARLIGHT
|
||||
|
||||
@@ -1719,11 +1485,6 @@ var/list/ghostteleportlocs = list()
|
||||
name = "\improper Secure Armory"
|
||||
icon_state = "secarmory"
|
||||
|
||||
/area/security/armoury/gamma
|
||||
name = "\improper Gamma Armory"
|
||||
icon_state = "Warden"
|
||||
requires_power = 0
|
||||
|
||||
/area/security/securehallway
|
||||
name = "\improper Security Secure Hallway"
|
||||
icon_state = "securehall"
|
||||
@@ -1946,11 +1707,6 @@ var/list/ghostteleportlocs = list()
|
||||
name = "Technical Storage"
|
||||
icon_state = "auxstorage"
|
||||
|
||||
/area/storage/testroom
|
||||
requires_power = 0
|
||||
name = "\improper Test Room"
|
||||
icon_state = "storage"
|
||||
|
||||
/area/storage/office
|
||||
name = "\improper Office Supplies"
|
||||
icon_state = "office_supplies"
|
||||
@@ -2300,31 +2056,6 @@ var/list/ghostteleportlocs = list()
|
||||
name = "\improper AI Satellite Antechamber"
|
||||
icon_state = "ai"
|
||||
|
||||
/area/turret_protected/AIsatextFP
|
||||
name = "\improper AI Sat Ext"
|
||||
icon_state = "storage"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/turret_protected/AIsatextFS
|
||||
name = "\improper AI Sat Ext"
|
||||
icon_state = "storage"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/turret_protected/AIsatextAS
|
||||
name = "\improper AI Sat Ext"
|
||||
icon_state = "storage"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/turret_protected/AIsatextAP
|
||||
name = "\improper AI Sat Ext"
|
||||
icon_state = "storage"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/turret_protected/NewAIMain
|
||||
name = "\improper AI Main New"
|
||||
icon_state = "storage"
|
||||
|
||||
|
||||
|
||||
//Misc
|
||||
|
||||
@@ -2409,78 +2140,10 @@ var/list/ghostteleportlocs = list()
|
||||
name = "\improper Strange Station"
|
||||
icon_state = "away"
|
||||
|
||||
/area/awaymission/wwmines
|
||||
name = "\improper Wild West Mines"
|
||||
icon_state = "away1"
|
||||
requires_power = FALSE
|
||||
|
||||
/area/awaymission/wwgov
|
||||
name = "\improper Wild West Mansion"
|
||||
icon_state = "away2"
|
||||
requires_power = FALSE
|
||||
|
||||
/area/awaymission/wwrefine
|
||||
name = "\improper Wild West Refinery"
|
||||
icon_state = "away3"
|
||||
requires_power = FALSE
|
||||
|
||||
/area/awaymission/wwvault
|
||||
name = "\improper Wild West Vault"
|
||||
icon_state = "away3"
|
||||
|
||||
/area/awaymission/wwvaultdoors
|
||||
name = "\improper Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power
|
||||
icon_state = "away2"
|
||||
requires_power = FALSE
|
||||
|
||||
/area/awaymission/desert
|
||||
name = "Mars"
|
||||
icon_state = "away"
|
||||
|
||||
/area/awaymission/BMPship1
|
||||
name = "\improper Aft Block"
|
||||
icon_state = "away1"
|
||||
|
||||
/area/awaymission/BMPship2
|
||||
name = "\improper Midship Block"
|
||||
icon_state = "away2"
|
||||
|
||||
/area/awaymission/BMPship3
|
||||
name = "\improper Fore Block"
|
||||
icon_state = "away3"
|
||||
|
||||
/area/awaymission/spacebattle
|
||||
name = "\improper Space Battle"
|
||||
icon_state = "away"
|
||||
requires_power = 0
|
||||
|
||||
/area/awaymission/spacebattle/cruiser
|
||||
name = "\improper Nanotrasen Cruiser"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate1
|
||||
name = "\improper Syndicate Assault Ship 1"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate2
|
||||
name = "\improper Syndicate Assault Ship 2"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate3
|
||||
name = "\improper Syndicate Assault Ship 3"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate4
|
||||
name = "\improper Syndicate War Sphere 1"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate5
|
||||
name = "\improper Syndicate War Sphere 2"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate6
|
||||
name = "\improper Syndicate War Sphere 3"
|
||||
|
||||
/area/awaymission/spacebattle/syndicate7
|
||||
name = "\improper Syndicate Fighter"
|
||||
|
||||
/area/awaymission/spacebattle/secret
|
||||
name = "\improper Hidden Chamber"
|
||||
|
||||
/area/awaymission/beach
|
||||
name = "Beach"
|
||||
icon_state = "beach"
|
||||
@@ -2596,10 +2259,9 @@ var/list/ghostteleportlocs = list()
|
||||
|
||||
/area/vr
|
||||
name = "VR"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
no_teleportlocs = 1
|
||||
|
||||
no_teleportlocs = TRUE
|
||||
|
||||
/area/vr/lobby
|
||||
name = "VR Lobby"
|
||||
@@ -2662,7 +2324,6 @@ var/list/the_station_areas = list (
|
||||
/area/teleporter,
|
||||
/area/medical,
|
||||
/area/security,
|
||||
/area/prison,
|
||||
/area/quartermaster,
|
||||
/area/janitor,
|
||||
/area/hydroponics,
|
||||
|
||||
@@ -30,7 +30,9 @@ var/global/max_secret_rooms = 6
|
||||
T.ChangeTurf(floor)
|
||||
room_turfs["floors"] += T
|
||||
|
||||
var/old_area = T.loc
|
||||
A.contents += T
|
||||
T.change_area(old_area, A)
|
||||
|
||||
return room_turfs
|
||||
|
||||
|
||||
@@ -457,7 +457,7 @@ proc/issyndicate(mob/living/M as mob)
|
||||
var/turf/T = get_turf(nuke)
|
||||
var/area/A = T.loc
|
||||
|
||||
var/list/thousand_penalty = list(/area/syndicate_station, /area/wizard_station, /area/solar, /area)
|
||||
var/list/thousand_penalty = list(/area/wizard_station, /area/solar, /area)
|
||||
var/list/fiftythousand_penalty = list(/area/security/main, /area/security/brig, /area/security/armoury, /area/security/checkpoint2)
|
||||
|
||||
if(is_type_in_list(A, thousand_penalty))
|
||||
|
||||
@@ -438,9 +438,6 @@
|
||||
steam.start()
|
||||
sleep(jaunt_duration)
|
||||
var/mobloc = get_turf(user.loc)
|
||||
if(get_area(mobloc) == /area/security/armoury/gamma)
|
||||
to_chat(user, "A strange energy repels you!")
|
||||
mobloc = originalloc
|
||||
animation.loc = mobloc
|
||||
steam.location = mobloc
|
||||
steam.start()
|
||||
|
||||
@@ -174,14 +174,10 @@
|
||||
var/list/SPECIALS = list(
|
||||
/area/shuttle,
|
||||
/area/admin,
|
||||
/area/arrival,
|
||||
/area/centcom,
|
||||
/area/asteroid,
|
||||
/area/tdome,
|
||||
/area/syndicate_station,
|
||||
/area/wizard_station,
|
||||
/area/prison
|
||||
// /area/derelict //commented out, all hail derelict-rebuilders!
|
||||
/area/wizard_station
|
||||
)
|
||||
for(var/type in SPECIALS)
|
||||
if( istype(A,type) )
|
||||
@@ -211,23 +207,21 @@
|
||||
return
|
||||
var/area/A = new
|
||||
A.name = str
|
||||
//var/ma
|
||||
//ma = A.master ? "[A.master]" : "(null)"
|
||||
// to_chat(world, "DEBUG: create_area: <br>A.name=[A.name]<br>A.tag=[A.tag]<br>A.master=[ma]")
|
||||
A.power_equip = 0
|
||||
A.power_light = 0
|
||||
A.power_environ = 0
|
||||
A.always_unpowered = 0
|
||||
move_turfs_to_area(turfs, A)
|
||||
A.power_equip = FALSE
|
||||
A.power_light = FALSE
|
||||
A.power_environ = FALSE
|
||||
A.always_unpowered = FALSE
|
||||
A.set_dynamic_lighting()
|
||||
|
||||
for(var/i in 1 to turfs.len)
|
||||
var/turf/thing = turfs[i]
|
||||
var/area/old_area = thing.loc
|
||||
A.contents += thing
|
||||
thing.change_area(old_area, A)
|
||||
|
||||
interact()
|
||||
return
|
||||
|
||||
|
||||
/obj/item/areaeditor/proc/move_turfs_to_area(var/list/turf/turfs, var/area/A)
|
||||
A.contents.Add(turfs)
|
||||
|
||||
|
||||
/obj/item/areaeditor/proc/edit_area()
|
||||
var/area/A = get_area()
|
||||
var/prevname = "[sanitize(A.name)]"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "An alarm which monitors host vital signs and transmits a radio message upon death."
|
||||
var/mobname = "Will Robinson"
|
||||
activated = 0
|
||||
var/static/list/stealth_areas = typecacheof(list(/area/syndicate_station, /area/syndicate_mothership, /area/shuttle/syndicate_elite))
|
||||
var/static/list/stealth_areas = typecacheof(list(/area/syndicate_mothership, /area/shuttle/syndicate_elite))
|
||||
|
||||
/obj/item/implant/death_alarm/get_data()
|
||||
var/dat = {"<b>Implant Specifications:</b><BR>
|
||||
|
||||
@@ -4,7 +4,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
|
||||
|
||||
/obj/proc/color_windows(obj/W)
|
||||
var/list/wcBarAreas = list(/area/crew_quarters/bar)
|
||||
var/list/wcBrigAreas = list(/area/security,/area/prison,/area/shuttle/gamma)
|
||||
var/list/wcBrigAreas = list(/area/security, /area/shuttle/gamma)
|
||||
|
||||
var/newcolor
|
||||
var/turf/T = get_turf(W)
|
||||
|
||||
@@ -247,17 +247,6 @@ client/proc/one_click_antag()
|
||||
if(closet_spawn)
|
||||
new /obj/structure/closet/syndicate/nuclear(closet_spawn.loc)
|
||||
|
||||
for(var/obj/effect/landmark/A in /area/syndicate_station/start)//Because that's the only place it can BE -Sieve
|
||||
if(A.name == "Syndicate-Gear-Closet")
|
||||
new /obj/structure/closet/syndicate/personal(A.loc)
|
||||
qdel(A)
|
||||
continue
|
||||
|
||||
if(A.name == "Syndicate-Bomb")
|
||||
new /obj/effect/spawner/newbomb/timer/syndicate(A.loc)
|
||||
qdel(A)
|
||||
continue
|
||||
|
||||
for(var/datum/mind/synd_mind in ticker.mode.syndicates)
|
||||
if(synd_mind.current)
|
||||
if(synd_mind.current.client)
|
||||
|
||||
@@ -1,44 +1,44 @@
|
||||
/area/awaymission/UO71
|
||||
name = "UO71"
|
||||
icon_state = "away"
|
||||
report_alerts = 0
|
||||
tele_proof = 1
|
||||
report_alerts = FALSE
|
||||
tele_proof = TRUE
|
||||
|
||||
|
||||
/area/awaymission/UO71/plaza
|
||||
name = "UO71 Plaza"
|
||||
icon_state = "awaycontent1"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/centralhall
|
||||
name = "UO71 Central"
|
||||
icon_state = "awaycontent2"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/eng
|
||||
name = "UO71 Engineering"
|
||||
icon_state = "awaycontent3"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/mining
|
||||
name = "UO71 Mining"
|
||||
icon_state = "awaycontent4"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/science
|
||||
name = "UO71 Science"
|
||||
icon_state = "awaycontent5"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/medical
|
||||
name = "UO71 Medical"
|
||||
icon_state = "awaycontent6"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/gateway
|
||||
name = "UO71 Gateway"
|
||||
icon_state = "awaycontent7"
|
||||
fire = 1
|
||||
fire = TRUE
|
||||
|
||||
/area/awaymission/UO71/outside
|
||||
name = "UO71 Outside"
|
||||
@@ -47,36 +47,41 @@
|
||||
/area/awaymission/UO71/bridge
|
||||
name = "UO71 Bridge"
|
||||
icon_state = "awaycontent21"
|
||||
fire = 1
|
||||
requires_power = 0
|
||||
tele_proof = 1
|
||||
fire = TRUE
|
||||
requires_power = FALSE
|
||||
tele_proof = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/UO71/queen
|
||||
name = "UO71 Queen Lair"
|
||||
icon_state = "awaycontent9"
|
||||
fire = 1
|
||||
requires_power = 0
|
||||
tele_proof = 1
|
||||
fire = TRUE
|
||||
requires_power = FALSE
|
||||
tele_proof = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/UO71/prince
|
||||
name = "UO71 Prince Containment"
|
||||
icon_state = "awaycontent10"
|
||||
fire = 1
|
||||
requires_power = 0
|
||||
tele_proof = 1
|
||||
fire = TRUE
|
||||
requires_power = FALSE
|
||||
tele_proof = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/UO71/mother
|
||||
name = "UO71 Mother Containment"
|
||||
icon_state = "awaycontent10"
|
||||
fire = 1
|
||||
requires_power = 0
|
||||
tele_proof = 1
|
||||
fire = TRUE
|
||||
requires_power = FALSE
|
||||
tele_proof = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/UO71/loot
|
||||
name = "UO71 Loot Vault"
|
||||
icon_state = "awaycontent11"
|
||||
requires_power = 0
|
||||
tele_proof = 1
|
||||
requires_power = FALSE
|
||||
tele_proof = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/obj/item/paper/terrorspiders1
|
||||
name = "paper - 'Sealed Facility'"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
/area/awaymission/challenge
|
||||
name = "Challenge"
|
||||
icon_state = "away"
|
||||
report_alerts = 0
|
||||
report_alerts = FALSE
|
||||
|
||||
/area/awaymission/challenge/start
|
||||
name = "Where Am I?"
|
||||
@@ -12,12 +12,14 @@
|
||||
/area/awaymission/challenge/main
|
||||
name = "\improper Danger Room"
|
||||
icon_state = "away1"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/awaymission/challenge/end
|
||||
name = "Administration"
|
||||
icon_state = "away2"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
|
||||
/obj/machinery/power/emitter/energycannon
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
//Clown Planet Areas
|
||||
|
||||
/area/planet/clown
|
||||
name = "\improper Clown Planet"
|
||||
icon_state = "honk"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
requires_power = FALSE
|
||||
report_alerts = FALSE
|
||||
|
||||
/area/awaymission/clownplanet/miningtown
|
||||
name = "\improper Clown Planet - Bananium-o-Rama"
|
||||
icon_state = "away1"
|
||||
requires_power = FALSE
|
||||
|
||||
/area/awaymission/clownplanet/mine
|
||||
name = "\improper Clown Planet - Bananium-o-Rama Mines"
|
||||
icon_state = "away2"
|
||||
requires_power = FALSE
|
||||
@@ -307,6 +307,7 @@
|
||||
name = "Powered Tile"
|
||||
icon_state = "teleporter"
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/ruin/space/ancientstation/space
|
||||
name = "Exposed To Space"
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
/area/awaymission/spacebattle
|
||||
name = "\improper Space Battle"
|
||||
icon_state = "away"
|
||||
requires_power = 0
|
||||
report_alerts = 0
|
||||
requires_power = FALSE
|
||||
report_alerts = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
|
||||
|
||||
/area/awaymission/spacebattle/cruiser
|
||||
name = "\improper Nanotrasen Cruiser"
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
|
||||
/area/awaymission/spacehotel
|
||||
name = "Deep Space Hotel 419"
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/spacehotel/kitchen
|
||||
name = "Hotel Kitchen"
|
||||
|
||||
@@ -161,7 +161,7 @@ var/sc_safecode5 = "[rand(0,9)]"
|
||||
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
|
||||
move_self = 0 //Contianed narsie does not move!
|
||||
grav_pull = 0 //Contained narsie does not pull stuff in!
|
||||
var/uneatable = list(/turf/space, /obj/effect/overlay, /atom/movable/lighting_overlay, /mob/living/simple_animal/hostile/construct)
|
||||
var/uneatable = list(/turf/space, /obj/effect/overlay, /atom/movable/lighting_object, /mob/living/simple_animal/hostile/construct)
|
||||
|
||||
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
|
||||
/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
|
||||
|
||||
@@ -10,16 +10,19 @@
|
||||
name = "\improper Wild West Mines"
|
||||
icon_state = "away1"
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/wwgov
|
||||
name = "\improper Wild West Mansion"
|
||||
icon_state = "away2"
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/wwrefine
|
||||
name = "\improper Wild West Refinery"
|
||||
icon_state = "away3"
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/awaymission/wwvault
|
||||
name = "\improper Wild West Vault"
|
||||
@@ -29,6 +32,7 @@
|
||||
name = "\improper Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power
|
||||
icon_state = "away2"
|
||||
requires_power = FALSE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/*
|
||||
* Wish Granter
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/area/awaymission/upperlevel
|
||||
name = "Open Space"
|
||||
color = "#888"
|
||||
dynamic_lighting = 0
|
||||
requires_power = 0
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
requires_power = FALSE
|
||||
|
||||
// Used by /turf/unsimulated/floor/upperlevel as a reference for where the other floor is
|
||||
/obj/effect/levelref
|
||||
|
||||
@@ -630,7 +630,7 @@
|
||||
|
||||
var/area/t = get_area(M)
|
||||
var/obj/item/radio/headset/a = new /obj/item/radio/headset(src)
|
||||
if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
|
||||
if(istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite))
|
||||
//give the syndicats a bit of stealth
|
||||
a.autosay("[M] has been vandalized in Space!", "[M]'s Death Alarm")
|
||||
else
|
||||
|
||||
@@ -273,8 +273,9 @@
|
||||
/area/survivalpod
|
||||
name = "\improper Emergency Shelter"
|
||||
icon_state = "away"
|
||||
requires_power = 0
|
||||
has_gravity = 1
|
||||
requires_power = FALSE
|
||||
has_gravity = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/obj/item/survivalcapsule
|
||||
name = "bluespace shelter capsule"
|
||||
|
||||
@@ -930,7 +930,7 @@ var/list/slot_equipment_priority = list( \
|
||||
|
||||
// They should be in a cell or the Brig portion of the shuttle.
|
||||
var/area/A = loc.loc
|
||||
if(!istype(A, /area/security/prison) && !istype(A, /area/prison))
|
||||
if(!istype(A, /area/security/prison))
|
||||
if(!istype(A, /area/shuttle/escape) || loc.name != "Brig floor")
|
||||
return 0
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
var/player_ghosted = 0
|
||||
|
||||
var/turf/listed_turf = null //the current turf being examined in the stat panel
|
||||
var/list/shouldnt_see = list(/atom/movable/lighting_overlay) //list of objects that this mob shouldn't see in the stat panel. this silliness is needed because of AI alt+click and cult blood runes
|
||||
var/list/shouldnt_see = list(/atom/movable/lighting_object) //list of objects that this mob shouldn't see in the stat panel. this silliness is needed because of AI alt+click and cult blood runes
|
||||
|
||||
var/kills = 0
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
if(!(istype(B) && B.off_floor))
|
||||
qdel(O)
|
||||
else
|
||||
if(!istype(O, /atom/movable/lighting_overlay))
|
||||
if(!istype(O, /atom/movable/lighting_object))
|
||||
O.color = initial(O.color)
|
||||
O.clean_blood()
|
||||
|
||||
|
||||
@@ -3,18 +3,18 @@
|
||||
/area/ruin/
|
||||
name = "\improper Unexplored Location"
|
||||
icon_state = "away"
|
||||
has_gravity = 1
|
||||
there_can_be_many = 1
|
||||
|
||||
has_gravity = TRUE
|
||||
there_can_be_many = TRUE
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/ruin/unpowered
|
||||
always_unpowered = 0
|
||||
always_unpowered = FALSE
|
||||
|
||||
/area/ruin/unpowered/no_grav
|
||||
has_gravity = 0
|
||||
has_gravity = FALSE
|
||||
|
||||
/area/ruin/powered
|
||||
requires_power = 0
|
||||
requires_power = FALSE
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -8,9 +8,6 @@
|
||||
forceMove(T1)
|
||||
return 1
|
||||
|
||||
/atom/movable/lighting_overlay/onShuttleMove()
|
||||
return 0
|
||||
|
||||
/obj/effect/landmark/shuttle_import/onShuttleMove()
|
||||
// Used for marking where to preview/load shuttles
|
||||
return 0
|
||||
@@ -60,4 +57,5 @@
|
||||
/obj/machinery/door/airlock/postDock(obj/docking_port/stationary/S1)
|
||||
. = ..()
|
||||
if(!S1.lock_shuttle_doors && id_tag == "s_docking_airlock")
|
||||
INVOKE_ASYNC(src, .proc/unlock)
|
||||
INVOKE_ASYNC(src, .proc/unlock)
|
||||
|
||||
|
||||
@@ -382,8 +382,9 @@
|
||||
var/list/L0 = return_ordered_turfs(x, y, z, dir, areaInstance)
|
||||
|
||||
//remove area surrounding docking port
|
||||
var/area/A0
|
||||
if(areaInstance.contents.len)
|
||||
var/area/A0 = locate("[area_type]")
|
||||
A0 = locate("[area_type]")
|
||||
if(!A0)
|
||||
A0 = new area_type(null)
|
||||
for(var/turf/T0 in L0)
|
||||
@@ -393,6 +394,8 @@
|
||||
var/turf/T0 = i
|
||||
if(!T0)
|
||||
continue
|
||||
if(A0)
|
||||
T0.change_area(T0.loc, A0)
|
||||
T0.empty(turf_type)
|
||||
|
||||
qdel(src, force=TRUE)
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
var/contcount
|
||||
for(var/atom/A in T.contents)
|
||||
if(istype(A,/atom/movable/lighting_overlay))
|
||||
if(istype(A,/atom/movable/lighting_object))
|
||||
continue
|
||||
if(istype(A,/obj/machinery/light))
|
||||
continue //hacky but whatever, shuttles need three spots each for this shit
|
||||
@@ -750,18 +750,6 @@
|
||||
|
||||
frequency.post_signal(src, status_signal)
|
||||
|
||||
/**********
|
||||
MISC
|
||||
**********/
|
||||
/area/supply/station
|
||||
name = "Supply Shuttle"
|
||||
icon_state = "shuttle3"
|
||||
requires_power = 0
|
||||
|
||||
/area/supply/dock
|
||||
name = "Supply Shuttle"
|
||||
icon_state = "shuttle3"
|
||||
requires_power = 0
|
||||
|
||||
#undef ORDER_SCREEN_WIDTH
|
||||
#undef ORDER_SCREEN_HEIGHT
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
var/delay_timer = null
|
||||
|
||||
var/list/blacklist = list(/obj/tram/rail,/atom/movable/lighting_overlay)
|
||||
var/list/blacklist = list(/obj/tram/rail,/atom/movable/lighting_object)
|
||||
var/list/ancwhitelist = list(/obj/tram, /obj/vehicle, /obj/structure/chair, /obj/structure/grille, /obj/structure/window)
|
||||
|
||||
/obj/tram/tram_controller/New()
|
||||
|
||||
@@ -1247,7 +1247,6 @@
|
||||
#include "code\modules\awaymissions\mission_code\blackmarketpackers.dm"
|
||||
#include "code\modules\awaymissions\mission_code\centcomAway.dm"
|
||||
#include "code\modules\awaymissions\mission_code\challenge.dm"
|
||||
#include "code\modules\awaymissions\mission_code\clownplanet.dm"
|
||||
#include "code\modules\awaymissions\mission_code\evil_santa.dm"
|
||||
#include "code\modules\awaymissions\mission_code\spacebattle.dm"
|
||||
#include "code\modules\awaymissions\mission_code\spacehotel.dm"
|
||||
|
||||
Reference in New Issue
Block a user