mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-17 22:01:40 +00:00
Purges Unsimulated Turfs: Touches Up CC Areas (#15527)
* Purges Unsimulated Turfs: Touches Up CC Areas * 2 additional turrets
This commit is contained in:
Fox McCloud
GitHub
File diff suppressed because it is too large
Load Diff
@@ -16,7 +16,7 @@
|
||||
/obj/machinery/atmospherics/pipe/New()
|
||||
..()
|
||||
//so pipes under walls are hidden
|
||||
if(istype(get_turf(src), /turf/simulated/wall) || istype(get_turf(src), /turf/unsimulated/wall))
|
||||
if(istype(get_turf(src), /turf/simulated/wall))
|
||||
level = 1
|
||||
|
||||
/obj/machinery/atmospherics/pipe/Destroy()
|
||||
|
||||
@@ -51,8 +51,6 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(
|
||||
|
||||
#define isfloorturf(A) istype(A, /turf/simulated/floor)
|
||||
|
||||
#define isunsimulatedturf(A) istype(A, /turf/unsimulated)
|
||||
|
||||
#define iswallturf(A) istype(A, /turf/simulated/wall)
|
||||
|
||||
#define isreinforcedwallturf(A) istype(A, /turf/simulated/wall/r_wall)
|
||||
|
||||
@@ -1818,8 +1818,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
|
||||
/datum = "D",
|
||||
/turf/simulated/floor = "SIM_FLOOR",
|
||||
/turf/simulated/wall = "SIM_WALL",
|
||||
/turf/unsimulated/floor = "UNSIM_FLOOR",
|
||||
/turf/unsimulated/wall = "UNSIM_WALL",
|
||||
/turf = "T",
|
||||
/mob/living/carbon/alien = "XENO",
|
||||
/mob/living/carbon/human = "HUMAN",
|
||||
|
||||
@@ -32,7 +32,7 @@ SUBSYSTEM_DEF(title)
|
||||
|
||||
var/icon/icon = new(fcopy_rsc(file_path))
|
||||
|
||||
for(var/turf/unsimulated/wall/splashscreen/splash in world)
|
||||
for(var/turf/simulated/wall/indestructible/splashscreen/splash in world)
|
||||
splash.icon = icon
|
||||
|
||||
return ..()
|
||||
|
||||
@@ -198,8 +198,7 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
|
||||
/turf/simulated/floor/plating/lava,
|
||||
/turf/simulated/floor/chasm,
|
||||
/turf/simulated/wall/cult,
|
||||
/turf/simulated/wall/cult/artificer,
|
||||
/turf/unsimulated/wall
|
||||
/turf/simulated/wall/cult/artificer
|
||||
)))
|
||||
|
||||
/obj/structure/cult/functional/pylon
|
||||
|
||||
@@ -70,12 +70,6 @@
|
||||
if("/turf/simulated/wall/r_wall")
|
||||
colour = rgb(128,96,96)
|
||||
|
||||
if("/turf/unsimulated/floor")
|
||||
colour = rgb(240,240,240)
|
||||
|
||||
if("/turf/unsimulated/wall")
|
||||
colour = rgb(140,140,140)
|
||||
|
||||
else
|
||||
colour = rgb(0,40,0)
|
||||
|
||||
@@ -226,12 +220,6 @@
|
||||
if("/turf/simulated/wall/r_wall")
|
||||
colour = rgb(128,96,96)
|
||||
|
||||
if("/turf/unsimulated/floor")
|
||||
colour = rgb(240,240,240)
|
||||
|
||||
if("/turf/unsimulated/wall")
|
||||
colour = rgb(140,140,140)
|
||||
|
||||
else
|
||||
colour = rgb(0,40,0)
|
||||
|
||||
|
||||
@@ -197,7 +197,7 @@
|
||||
walltype = /turf/simulated/wall/mineral/uranium
|
||||
var/active = null
|
||||
var/last_event = 0
|
||||
canSmoothWith = list(/obj/structure/falsewall/uranium, /turf/simulated/wall/mineral/uranium)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium)
|
||||
|
||||
/obj/structure/falsewall/uranium/attackby(obj/item/W as obj, mob/user as mob, params)
|
||||
radiate()
|
||||
@@ -286,7 +286,7 @@
|
||||
icon_state = "plasma"
|
||||
mineral = /obj/item/stack/sheet/mineral/abductor
|
||||
walltype = /turf/simulated/wall/mineral/abductor
|
||||
canSmoothWith = list(/obj/structure/falsewall/alien, /turf/simulated/wall/mineral/alien)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien)
|
||||
|
||||
|
||||
/obj/structure/falsewall/bananium
|
||||
@@ -350,7 +350,7 @@
|
||||
mineral = /obj/item/stack/sheet/mineral/plastitanium
|
||||
walltype = /turf/simulated/wall/mineral/plastitanium
|
||||
smooth = SMOOTH_MORE
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
|
||||
|
||||
/obj/structure/falsewall/brass
|
||||
name = "clockwork wall"
|
||||
|
||||
@@ -586,7 +586,7 @@
|
||||
icon_state = "window"
|
||||
max_integrity = 50
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
|
||||
|
||||
/obj/structure/window/full/plasmabasic
|
||||
name = "plasma window"
|
||||
@@ -599,7 +599,7 @@
|
||||
heat_resistance = 32000
|
||||
max_integrity = 300
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
|
||||
explosion_block = 1
|
||||
armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
|
||||
rad_insulation = RAD_NO_INSULATION
|
||||
@@ -613,6 +613,7 @@
|
||||
shardtype = /obj/item/shard/plasma
|
||||
glass_type = /obj/item/stack/sheet/plasmarglass
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
|
||||
reinf = TRUE
|
||||
max_integrity = 1000
|
||||
explosion_block = 2
|
||||
@@ -628,7 +629,7 @@
|
||||
icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
|
||||
icon_state = "r_window"
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
|
||||
max_integrity = 100
|
||||
reinf = TRUE
|
||||
heat_resistance = 1600
|
||||
@@ -683,6 +684,7 @@
|
||||
canSmoothWith = null
|
||||
explosion_block = 3
|
||||
glass_type = /obj/item/stack/sheet/plastitaniumglass
|
||||
canSmoothWith = list(/turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
|
||||
|
||||
/obj/structure/window/reinforced/clockwork
|
||||
name = "brass window"
|
||||
|
||||
@@ -46,6 +46,10 @@
|
||||
oxygen = 0
|
||||
temperature = 80
|
||||
|
||||
/turf/simulated/floor/plasteel/dark/nitrogen
|
||||
nitrogen = 100
|
||||
oxygen = 0
|
||||
|
||||
/turf/simulated/floor/plasteel/freezer
|
||||
icon_state = "freezerfloor"
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
for(var/F in RANGE_TURFS(1, src) - src)
|
||||
var/turf/T = F
|
||||
var/area/new_area = get_area(T)
|
||||
if(!T || (T.density && !ismineralturf(T)) || istype(T, /turf/unsimulated) || (whitelisted_area && !istype(new_area, whitelisted_area)) || (T.flags & NO_LAVA_GEN) )
|
||||
if(!T || (T.density && !ismineralturf(T)) || istype(T, /turf/simulated/floor/indestructible) || (whitelisted_area && !istype(new_area, whitelisted_area)) || (T.flags & NO_LAVA_GEN) )
|
||||
continue
|
||||
|
||||
if(!logged_turf_type && ismineralturf(T))
|
||||
|
||||
@@ -79,9 +79,68 @@
|
||||
icon_state = "sandstone"
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
|
||||
|
||||
/turf/simulated/wall/indestructible/splashscreen
|
||||
name = "Space Station 13"
|
||||
icon = 'config/title_screens/images/blank.png'
|
||||
icon_state = ""
|
||||
layer = FLY_LAYER
|
||||
|
||||
/turf/simulated/wall/indestructible/uranium
|
||||
icon = 'icons/turf/walls/uranium_wall.dmi'
|
||||
icon_state = "uranium"
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium)
|
||||
|
||||
/turf/simulated/wall/indestructible/wood
|
||||
icon = 'icons/turf/walls/wood_wall.dmi'
|
||||
icon_state = "wood"
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood)
|
||||
|
||||
/turf/simulated/wall/indestructible/alien
|
||||
name = "alien wall"
|
||||
desc = "A wall with alien alloy plating."
|
||||
icon = 'icons/turf/walls/abductor_wall.dmi'
|
||||
icon_state = "abductor"
|
||||
smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien)
|
||||
|
||||
/turf/simulated/wall/indestructible/abductor
|
||||
icon = 'icons/turf/walls.dmi'
|
||||
icon_state = "alien1"
|
||||
|
||||
/turf/simulated/wall/indestructible/fakedoor
|
||||
name = "CentCom Access"
|
||||
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
|
||||
icon_state = "fake_door"
|
||||
|
||||
/turf/simulated/wall/indestructible/fakeglass
|
||||
name = "window"
|
||||
icon = 'icons/obj/smooth_structures/reinforced_window.dmi'
|
||||
icon_state = "fake_window"
|
||||
opacity = FALSE
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced, /turf/simulated/wall/indestructible/fakeglass)
|
||||
|
||||
/turf/simulated/wall/indestructible/fakeglass/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = null
|
||||
underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay
|
||||
underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille
|
||||
|
||||
/turf/simulated/wall/indestructible/opsglass
|
||||
name = "window"
|
||||
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
|
||||
icon_state = "plastitanium_window"
|
||||
opacity = FALSE
|
||||
smooth = SMOOTH_TRUE
|
||||
canSmoothWith = list(/turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
|
||||
|
||||
/turf/simulated/wall/indestructible/opsglass/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = null
|
||||
underlays += mutable_appearance('icons/obj/structures.dmi', "grille")
|
||||
underlays += mutable_appearance('icons/turf/floors.dmi', "plating")
|
||||
|
||||
/turf/simulated/wall/indestructible/rock
|
||||
name = "dense rock"
|
||||
@@ -89,6 +148,12 @@
|
||||
icon = 'icons/turf/walls.dmi'
|
||||
icon_state = "rock"
|
||||
|
||||
/turf/simulated/wall/indestructible/rock/snow
|
||||
name = "mountainside"
|
||||
desc = "An extremely densely-packed rock, sheeted over with centuries worth of ice and snow."
|
||||
icon = 'icons/turf/walls.dmi'
|
||||
icon_state = "snowrock"
|
||||
|
||||
/turf/simulated/wall/indestructible/riveted
|
||||
icon = 'icons/turf/walls.dmi'
|
||||
icon_state = "riveted"
|
||||
@@ -97,4 +162,4 @@
|
||||
icon = 'icons/turf/walls/plastitanium_wall.dmi'
|
||||
icon_state = "map-shuttle"
|
||||
smooth = SMOOTH_MORE | SMOOTH_DIAGONAL
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
icon = 'icons/turf/walls/uranium_wall.dmi'
|
||||
icon_state = "uranium"
|
||||
sheet_type = /obj/item/stack/sheet/mineral/uranium
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/uranium, /obj/structure/falsewall/uranium, /turf/simulated/wall/indestructible/uranium)
|
||||
|
||||
/turf/simulated/wall/mineral/uranium/proc/radiate()
|
||||
if(!active)
|
||||
@@ -147,7 +147,7 @@
|
||||
sheet_type = /obj/item/stack/sheet/wood
|
||||
hardness = 70
|
||||
explosion_block = 0
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood)
|
||||
|
||||
/turf/simulated/wall/mineral/wood/attackby(obj/item/W, mob/user)
|
||||
if(W.sharp && W.force)
|
||||
@@ -163,7 +163,7 @@
|
||||
desc = "A solidly wooden wall. It's a bit weaker than a wall made with metal."
|
||||
girder_type = /obj/structure/barricade/wooden
|
||||
hardness = 50
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/wood, /obj/structure/falsewall/wood, /turf/simulated/wall/mineral/wood/nonmetal, /turf/simulated/wall/indestructible/wood)
|
||||
|
||||
/turf/simulated/wall/mineral/iron
|
||||
name = "rough metal wall"
|
||||
@@ -182,7 +182,7 @@
|
||||
smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL
|
||||
sheet_type = /obj/item/stack/sheet/mineral/abductor
|
||||
explosion_block = 3
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor, /turf/simulated/wall/indestructible/alien)
|
||||
|
||||
/////////////////////Titanium walls/////////////////////
|
||||
|
||||
@@ -288,7 +288,7 @@
|
||||
explosion_block = 4
|
||||
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
|
||||
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
|
||||
canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium, /turf/simulated/wall/indestructible/opsglass, /obj/structure/window/full/plastitanium)
|
||||
|
||||
/turf/simulated/wall/mineral/plastitanium/nodiagonal
|
||||
smooth = SMOOTH_MORE
|
||||
|
||||
@@ -407,7 +407,7 @@
|
||||
L.Add(T)
|
||||
return L
|
||||
|
||||
// check for all turfs, including unsimulated ones
|
||||
// check for all turfs, including space ones
|
||||
/turf/proc/AdjacentTurfsSpace(obj/item/card/id/ID = null, list/closed)//check access if one is passed
|
||||
var/list/L = new()
|
||||
var/turf/T
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
/turf/unsimulated // Sometimes....sometimes I have dreams of you dieing. Of you gasping for your last unsimulated breath, of you passing away and being a dirty memory of a bygone era. - Fox
|
||||
intact = 1
|
||||
name = "command"
|
||||
oxygen = MOLES_O2STANDARD
|
||||
nitrogen = MOLES_N2STANDARD
|
||||
|
||||
/turf/unsimulated/can_lay_cable()
|
||||
return 0
|
||||
|
||||
/turf/unsimulated/rpd_act()
|
||||
return
|
||||
|
||||
/turf/unsimulated/acid_act(acidpwr, acid_volume, acid_id)
|
||||
return 0
|
||||
@@ -1,28 +0,0 @@
|
||||
/turf/unsimulated/floor
|
||||
name = "floor"
|
||||
icon = 'icons/turf/floors.dmi'
|
||||
icon_state = "Floor3"
|
||||
|
||||
/turf/unsimulated/floor/plating/vox
|
||||
icon_state = "plating"
|
||||
name = "plating"
|
||||
nitrogen = 100
|
||||
oxygen = 0
|
||||
|
||||
/turf/unsimulated/floor/snow
|
||||
name = "snow"
|
||||
icon = 'icons/turf/snow.dmi'
|
||||
icon_state = "snow"
|
||||
|
||||
/turf/unsimulated/floor/abductor
|
||||
name = "alien floor"
|
||||
icon_state = "alienpod1"
|
||||
|
||||
/turf/unsimulated/floor/abductor/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = "alienpod[rand(1,9)]"
|
||||
|
||||
/turf/unsimulated/floor/vox
|
||||
icon_state = "dark"
|
||||
nitrogen = 100
|
||||
oxygen = 0
|
||||
@@ -1,29 +0,0 @@
|
||||
/turf/unsimulated/wall
|
||||
name = "wall"
|
||||
icon = 'icons/turf/walls.dmi'
|
||||
icon_state = "riveted"
|
||||
opacity = 1
|
||||
density = 1
|
||||
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
|
||||
rad_insulation = RAD_MEDIUM_INSULATION
|
||||
explosion_block = 2
|
||||
|
||||
/turf/unsimulated/wall/fakeglass
|
||||
name = "window"
|
||||
icon_state = "fakewindows"
|
||||
opacity = 0
|
||||
|
||||
/turf/unsimulated/wall/fakedoor
|
||||
name = "Centcom Access"
|
||||
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
|
||||
icon_state = "closed"
|
||||
|
||||
/turf/unsimulated/wall/splashscreen
|
||||
name = "Space Station 13"
|
||||
icon = 'config/title_screens/images/blank.png'
|
||||
icon_state = ""
|
||||
layer = FLY_LAYER
|
||||
|
||||
/turf/unsimulated/wall/abductor
|
||||
icon_state = "alien1"
|
||||
explosion_block = 50
|
||||
@@ -477,7 +477,7 @@
|
||||
/datum/syndicate_contract/proc/handle_target_return(mob/living/M)
|
||||
var/list/turf/possible_turfs = list()
|
||||
for(var/turf/T in contract.extraction_zone.contents)
|
||||
if(!isspaceturf(T) && !isunsimulatedturf(T) && !is_blocked_turf(T))
|
||||
if(!isspaceturf(T) && !is_blocked_turf(T))
|
||||
possible_turfs += T
|
||||
|
||||
var/turf/destination = length(possible_turfs) ? pick(possible_turfs) : pick(GLOB.latejoin)
|
||||
|
||||
@@ -13,7 +13,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
|
||||
* WORKING :
|
||||
*
|
||||
* 1) Makes an associative mapping of model_keys with model
|
||||
* e.g aa = /turf/unsimulated/wall{icon_state = "rock"}
|
||||
* e.g aa = /turf/simulated/wall{icon_state = "rock"}
|
||||
* 2) Read the map line by line, parsing the result (using parse_grid)
|
||||
*
|
||||
* If `measureOnly` is set, then no atoms will be created, and all this will do
|
||||
@@ -174,7 +174,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
|
||||
|
||||
/**
|
||||
* Fill a given tile with its area/turf/objects/mobs
|
||||
* Variable model is one full map line (e.g /turf/unsimulated/wall{icon_state = "rock"},/area/mine/dangerous/explored)
|
||||
* Variable model is one full map line (e.g /turf/simulated/wall{icon_state = "rock"},/area/mine/dangerous/explored)
|
||||
*
|
||||
* WORKING :
|
||||
*
|
||||
@@ -195,7 +195,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
|
||||
same construction as those contained in a .dmm file, and instantiates them.
|
||||
*/
|
||||
|
||||
var/list/members // will contain all members (paths) in model (in our example : /turf/unsimulated/wall and /area/mine/dangerous/explored)
|
||||
var/list/members // will contain all members (paths) in model (in our example : /turf/simulated/wall and /area/mine/dangerous/explored)
|
||||
var/list/members_attributes // will contain lists filled with corresponding variables, if any (in our example : list(icon_state = "rock") and list())
|
||||
var/list/cached = modelCache[model]
|
||||
var/index
|
||||
@@ -216,7 +216,7 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
|
||||
var/dpos
|
||||
|
||||
do
|
||||
// finding next member (e.g /turf/unsimulated/wall{icon_state = "rock"} or /area/mine/dangerous/explored)
|
||||
// finding next member (e.g /turf/simulated/wall{icon_state = "rock"} or /area/mine/dangerous/explored)
|
||||
dpos = find_next_delimiter_position(model, old_position, ",", "{", "}") // find next delimiter (comma here) that's not within {...}
|
||||
|
||||
var/full_def = trim_text(copytext(model, old_position, dpos)) // full definition, e.g : /obj/foo/bar{variables=derp}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
/datum/buildmode_mode/atmos/show_help(mob/user)
|
||||
to_chat(user, "<span class='notice'>***********************************************************</span>")
|
||||
to_chat(user, "<span class='notice'>Left Mouse Button on turf = Select corner</span>")
|
||||
to_chat(user, "<span class='notice'>Left Mouse Button + Ctrl on turf = Set 'base atmos conditions' for unsimulated turfs in region</span>")
|
||||
to_chat(user, "<span class='notice'>Left Mouse Button + Ctrl on turf = Set 'base atmos conditions' for space turfs in region</span>")
|
||||
to_chat(user, "<span class='notice'>Right Mouse Button on buildmode button = Adjust target atmos</span>")
|
||||
to_chat(user, "<span class='notice'><b>Notice:</b> Starts out with standard breathable/liveable defaults</span>")
|
||||
to_chat(user, "<span class='notice'>***********************************************************</span>")
|
||||
@@ -58,7 +58,7 @@
|
||||
S.air.agent_b = ppratio_to_moles(agentbx)
|
||||
S.update_visuals()
|
||||
S.air_update_turf()
|
||||
else if(ctrl_click) // overwrite "default" unsimulated air
|
||||
else if(ctrl_click) // overwrite "default" space air
|
||||
T.temperature = temperature
|
||||
T.oxygen = ppratio_to_moles(oxygen)
|
||||
T.nitrogen = ppratio_to_moles(nitrogen)
|
||||
@@ -69,4 +69,4 @@
|
||||
T.air_update_turf()
|
||||
|
||||
// admin log
|
||||
log_admin("Build Mode: [key_name(user)] changed the atmos of region [COORD(cornerA)] to [COORD(cornerB)]. T: [temperature], P: [pressure], Ox: [oxygen]%, N2: [nitrogen]%, Plsma: [plasma]%, CO2: [cdiox]%, N2O: [nitrox]%. [ctrl_click ? "Overwrote base unsimulated turf gases." : ""]")
|
||||
log_admin("Build Mode: [key_name(user)] changed the atmos of region [COORD(cornerA)] to [COORD(cornerB)]. T: [temperature], P: [pressure], Ox: [oxygen]%, N2: [nitrogen]%, Plsma: [plasma]%, CO2: [cdiox]%, N2O: [nitrox]%. [ctrl_click ? "Overwrote base space turf gases." : ""]")
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
|
||||
/obj/item/lava_staff/New()
|
||||
. = ..()
|
||||
banned_turfs = typecacheof(list(/turf/space/transit, /turf/unsimulated))
|
||||
banned_turfs = typecacheof(list(/turf/space/transit, /turf/simulated/wall, /turf/simulated/mineral))
|
||||
|
||||
/obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
|
||||
..()
|
||||
|
||||
@@ -121,7 +121,7 @@ Variable Breakdown (For Mappers):
|
||||
mapGeneratorModule
|
||||
mother - INTERNAL, do not touch
|
||||
spawnableAtoms - A list of typepaths and their probability to spawn, eg: spawnableAtoms = list(/obj/structure/flora/tree/pine = 30)
|
||||
spawnableTurfs - A list of typepaths and their probability to spawn, eg: spawnableTurfs = list(/turf/unsimulated/floor/grass = 100)
|
||||
spawnableTurfs - A list of typepaths and their probability to spawn, eg: spawnableTurfs = list(/turf/simulated/floor/grass = 100)
|
||||
clusterMax - The max range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
|
||||
clusterMin - The min range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
|
||||
clusterCheckFlags - A Bitfield that controls how the cluster checks work, All based on clusterMin and clusterMax guides
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 8.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 206 KiB After Width: | Height: | Size: 208 KiB |
@@ -1170,7 +1170,6 @@
|
||||
#include "code\game\objects\structures\transit_tubes\transit_tube_pod.dm"
|
||||
#include "code\game\turfs\simulated.dm"
|
||||
#include "code\game\turfs\turf.dm"
|
||||
#include "code\game\turfs\unsimulated.dm"
|
||||
#include "code\game\turfs\simulated\floor.dm"
|
||||
#include "code\game\turfs\simulated\minerals.dm"
|
||||
#include "code\game\turfs\simulated\river.dm"
|
||||
@@ -1191,8 +1190,6 @@
|
||||
#include "code\game\turfs\simulated\floor\plating.dm"
|
||||
#include "code\game\turfs\space\space.dm"
|
||||
#include "code\game\turfs\space\transit.dm"
|
||||
#include "code\game\turfs\unsimulated\floor.dm"
|
||||
#include "code\game\turfs\unsimulated\walls.dm"
|
||||
#include "code\game\verbs\ooc.dm"
|
||||
#include "code\game\verbs\randomtip.dm"
|
||||
#include "code\game\verbs\suicide.dm"
|
||||
|
||||
Reference in New Issue
Block a user