mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 03:02:54 +00:00
Few more outdoors fixes
This commit is contained in:
@@ -18,7 +18,13 @@
|
|||||||
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar/action_checks(atom/target)
|
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar/action_checks(atom/target)
|
||||||
var/turf/MT = get_turf(chassis)
|
var/turf/MT = get_turf(chassis)
|
||||||
var/turf/TT = get_turf(target)
|
var/turf/TT = get_turf(target)
|
||||||
|
<<<<<<< HEAD
|
||||||
if(!MT.outdoors || !TT.outdoors)
|
if(!MT.outdoors || !TT.outdoors)
|
||||||
|
||||||| parent of 7bd2f9ada6... Merge pull request #11324 from VOREStation/Arokha/fewmoreoutdoors
|
||||||
|
if(!MT.outdoors || !TT.is_outdoors())
|
||||||
|
=======
|
||||||
|
if(!MT.is_outdoors() || !TT.is_outdoors())
|
||||||
|
>>>>>>> 7bd2f9ada6... Merge pull request #11324 from VOREStation/Arokha/fewmoreoutdoors
|
||||||
to_chat(chassis.occupant, "<span class='notice'>\The [src]'s control system prevents you from firing due to a blocked firing arc.</span>")
|
to_chat(chassis.occupant, "<span class='notice'>\The [src]'s control system prevents you from firing due to a blocked firing arc.</span>")
|
||||||
return 0
|
return 0
|
||||||
return ..()
|
return ..()
|
||||||
@@ -1378,7 +1378,7 @@
|
|||||||
spawn_nothing_percentage = 20
|
spawn_nothing_percentage = 20
|
||||||
|
|
||||||
var/override_outdoors = FALSE // Do we override our chosen turf's outdoors?
|
var/override_outdoors = FALSE // Do we override our chosen turf's outdoors?
|
||||||
var/turf_outdoors = TRUE // Will our turf be outdoors?
|
var/turf_outdoors = OUTDOORS_AREA // Will our turf be outdoors?
|
||||||
|
|
||||||
/obj/random/turf/spawn_item()
|
/obj/random/turf/spawn_item()
|
||||||
var/build_path = item_to_spawn()
|
var/build_path = item_to_spawn()
|
||||||
@@ -1400,7 +1400,7 @@
|
|||||||
desc = "This is a random lava spawn."
|
desc = "This is a random lava spawn."
|
||||||
|
|
||||||
override_outdoors = TRUE
|
override_outdoors = TRUE
|
||||||
turf_outdoors = FALSE
|
turf_outdoors = OUTDOORS_NO
|
||||||
|
|
||||||
/obj/random/turf/lava/item_to_spawn()
|
/obj/random/turf/lava/item_to_spawn()
|
||||||
return pick(prob(5);/turf/simulated/floor/lava,
|
return pick(prob(5);/turf/simulated/floor/lava,
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ var/list/turf_edge_cache = list()
|
|||||||
edge_blending_priority = 1
|
edge_blending_priority = 1
|
||||||
|
|
||||||
/turf/simulated/floor/outdoors/rocks/caves
|
/turf/simulated/floor/outdoors/rocks/caves
|
||||||
outdoors = FALSE
|
outdoors = OUTDOORS_NO
|
||||||
|
|
||||||
// This proc adds a 'layer' on top of the turf.
|
// This proc adds a 'layer' on top of the turf.
|
||||||
/turf/simulated/floor/outdoors/proc/promote(var/new_turf_type)
|
/turf/simulated/floor/outdoors/proc/promote(var/new_turf_type)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/turf/simulated/floor/tiled/asteroid_steel/outdoors
|
/turf/simulated/floor/tiled/asteroid_steel/outdoors
|
||||||
name = "weathered tiles"
|
name = "weathered tiles"
|
||||||
desc = "Old tiles left out in the elements."
|
desc = "Old tiles left out in the elements."
|
||||||
outdoors = 1
|
outdoors = OUTDOORS_YES
|
||||||
edge_blending_priority = 1
|
edge_blending_priority = 1
|
||||||
|
|
||||||
/turf/simulated/floor/outdoors/newdirt
|
/turf/simulated/floor/outdoors/newdirt
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas.
|
/turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas.
|
||||||
outdoors = FALSE
|
outdoors = OUTDOORS_NO
|
||||||
|
|
||||||
/turf/simulated/floor/water/deep/indoors
|
/turf/simulated/floor/water/deep/indoors
|
||||||
outdoors = FALSE
|
outdoors = OUTDOORS_NO
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/turf/simulated/floor/beach/sand/outdoors
|
/turf/simulated/floor/beach/sand/outdoors
|
||||||
outdoors = TRUE
|
outdoors = OUTDOORS_YES
|
||||||
|
|
||||||
/turf/simulated/floor/beach/sand/desert/outdoors
|
/turf/simulated/floor/beach/sand/desert/outdoors
|
||||||
outdoors = TRUE
|
outdoors = OUTDOORS_YES
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
///Setter for the byond luminosity var
|
///Setter for the byond luminosity var
|
||||||
/turf/proc/set_luminosity(new_luminosity, force)
|
/turf/proc/set_luminosity(new_luminosity, force)
|
||||||
// SSplanets handles outdoor turfs
|
// SSplanets handles outdoor turfs
|
||||||
if(outdoors && !force)
|
if(is_outdoors() && !force)
|
||||||
return
|
return
|
||||||
|
|
||||||
luminosity = new_luminosity
|
luminosity = new_luminosity
|
||||||
|
|||||||
@@ -117,15 +117,15 @@
|
|||||||
// Test for corners
|
// Test for corners
|
||||||
for(var/direction in cornerdirs)
|
for(var/direction in cornerdirs)
|
||||||
var/turf/dirturf = get_step(T, direction)
|
var/turf/dirturf = get_step(T, direction)
|
||||||
if(dirturf && !dirturf.outdoors)
|
if(dirturf && !dirturf.is_outdoors())
|
||||||
var/turf/TL = get_step(T, turn(direction, -45))
|
var/turf/TL = get_step(T, turn(direction, -45))
|
||||||
var/turf/TR = get_step(T, turn(direction, 45))
|
var/turf/TR = get_step(T, turn(direction, 45))
|
||||||
|
|
||||||
// If outdoors at 45 degrees are the same, then this is a corner
|
// If outdoors at 45 degrees are the same, then this is a corner
|
||||||
if(TL && TR && TL.outdoors == TR.outdoors)
|
if(TL && TR && TL.is_outdoors() == TR.is_outdoors())
|
||||||
var/atom/movable/sun_visuals_overlap/OL
|
var/atom/movable/sun_visuals_overlap/OL
|
||||||
// Outer corner
|
// Outer corner
|
||||||
if(TL.outdoors)
|
if(TL.is_outdoors())
|
||||||
OL = spreads["o[direction]"]
|
OL = spreads["o[direction]"]
|
||||||
// Inner corner
|
// Inner corner
|
||||||
else
|
else
|
||||||
@@ -139,11 +139,11 @@
|
|||||||
// Take all orthagonals
|
// Take all orthagonals
|
||||||
for(var/direction in cardinal)
|
for(var/direction in cardinal)
|
||||||
var/turf/dirturf = get_step(T, direction)
|
var/turf/dirturf = get_step(T, direction)
|
||||||
if(dirturf && !dirturf.outdoors)
|
if(dirturf && !dirturf.is_outdoors())
|
||||||
var/turf/TL = get_step(T, turn(direction, -45))
|
var/turf/TL = get_step(T, turn(direction, -45))
|
||||||
var/turf/TR = get_step(T, turn(direction, 45))
|
var/turf/TR = get_step(T, turn(direction, 45))
|
||||||
// End of a wall, the corner will handle it
|
// End of a wall, the corner will handle it
|
||||||
if(TL && TR && TL.outdoors != TR.outdoors)
|
if(TL && TR && TL.is_outdoors() != TR.is_outdoors())
|
||||||
continue
|
continue
|
||||||
var/atom/movable/sun_visuals_overlap/OL = spreads["[direction]"]
|
var/atom/movable/sun_visuals_overlap/OL = spreads["[direction]"]
|
||||||
dirturf.vis_contents += OL
|
dirturf.vis_contents += OL
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right."
|
desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right."
|
||||||
description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy."
|
description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy."
|
||||||
color = "#222222"
|
color = "#222222"
|
||||||
outdoors = FALSE
|
outdoors = OUTDOORS_NO
|
||||||
reagent_type = "liquid_protean"
|
reagent_type = "liquid_protean"
|
||||||
|
|
||||||
// The 'ship'
|
// The 'ship'
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right."
|
desc = "A pool of inky-black fluid that shimmers oddly in the light if hit just right."
|
||||||
description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy."
|
description_info = "Surfluid is KHI's main method of production, using swarms of nanites to process raw materials into finished products at the cost of immense amounts of energy."
|
||||||
color = "#222222"
|
color = "#222222"
|
||||||
outdoors = FALSE
|
outdoors = OUTDOORS_NO
|
||||||
reagent_type = "liquid_protean"
|
reagent_type = "liquid_protean"
|
||||||
|
|
||||||
// The 'ship'
|
// The 'ship'
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/open)
|
|||||||
edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf
|
edge_blending_priority = 0.5 //Turfs which also have e_b_p and higher than this will plop decorative edges onto this turf
|
||||||
/turf/simulated/open/virgo3b/Initialize(mapload)
|
/turf/simulated/open/virgo3b/Initialize(mapload)
|
||||||
. = ..()
|
. = ..()
|
||||||
if(outdoors)
|
if(is_outdoors())
|
||||||
SSplanets.addTurf(src)
|
SSplanets.addTurf(src)
|
||||||
|
|
||||||
VIRGO3B_TURF_CREATE(/turf/simulated/floor)
|
VIRGO3B_TURF_CREATE(/turf/simulated/floor)
|
||||||
|
|||||||
Reference in New Issue
Block a user