cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

More lighting fixes

Browse Source
This commit is contained in:
Mark van Alphen
2019-05-04 03:06:10 +02:00
parent 9009cd443e
commit bbeb07abd2
31 changed files with 127 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/one_click_antag.dm
-11
View File
@@ -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)
code/modules/awaymissions/mission_code/UO71-terrorspiders.dm
+28 -23
View File
@@ -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'"
code/modules/awaymissions/mission_code/challenge.dm
+5 -3
View File
@@ -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
code/modules/awaymissions/mission_code/clownplanet.dm
-18
View File
@@ -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
code/modules/awaymissions/mission_code/ruins/oldstation.dm
+1
View File
@@ -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"
code/modules/awaymissions/mission_code/spacebattle.dm
+3 -2
View File
@@ -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"
code/modules/awaymissions/mission_code/spacehotel.dm
+2 -1
View File
@@ -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"
code/modules/awaymissions/mission_code/stationCollision.dm
+1 -1
View File
@@ -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()
code/modules/awaymissions/mission_code/wildwest.dm
+4
View File
@@ -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
code/modules/awaymissions/zvis.dm
+2 -2
View File
@@ -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
code/modules/clothing/under/accessories/accessory.dm
+1 -1
View File
@@ -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
code/modules/mining/mine_items.dm
+3 -2
View File
@@ -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"
code/modules/mob/mob.dm
+1 -1
View File
@@ -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
code/modules/mob/mob_defines.dm
+1 -1
View File
@@ -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
code/modules/reagents/chemistry/reagents/water.dm
+1 -1
View File
@@ -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()
code/modules/ruins/ruin_areas.dm
+6 -6
View File
@@ -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
code/modules/shuttle/on_move.dm
+2 -4
View File
@@ -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)
code/modules/shuttle/shuttle.dm
+4 -1
View File
@@ -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)
code/modules/shuttle/supply.dm
+1 -13
View File
@@ -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
code/modules/tram/tram.dm
+1 -1
View File
@@ -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()