cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-11 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Splits placeontop proc (#79702)

Browse Source 
## About The Pull Request
I find the proc hard to read honestly. There's no reason we can't split
this into two functions - the secondary functionality is used only once,
in reader.dmm.
## Why It's Good For The Game
Code improvement
Glorious snake case
## Changelog
N/A nothing player facing

---------

Co-authored-by: san7890 <34697715+san7890@users.noreply.github.com>
This commit is contained in:
Jeremiah
2023-11-18 19:58:31 -08:00
committed by GitHub
parent a396f3c129
commit 7a1b1fa9ad
31 changed files with 84 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/components/trapdoor.dm
View File

@@ -367,7 +367,7 @@
in_use = FALSE
if(!isopenspaceturf(target_turf)) // second check to make sure nothing changed during constructions
return
var/turf/new_turf = target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
var/turf/new_turf = target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
new_turf.AddComponent(/datum/component/trapdoor, starts_open = FALSE, conspicuous = TRUE)
balloon_alert(user, "trapdoor constructed")
qdel(src)

2
code/datums/elements/movement_turf_changer.dm
View File

@@ -29,4 +29,4 @@
if(!isturf(destination) || istype(destination, turf_type) || isgroundlessturf(destination))
return
destination.PlaceOnTop(turf_type)
destination.place_on_top(turf_type)

2
code/game/machinery/computer/arcade/orion_event.dm
View File

@@ -172,7 +172,7 @@
game.say("A new floor suddenly appears around [game]. What the hell?")
playsound(game, 'sound/weapons/genhit.ogg', 100, TRUE)
for(var/turf/open/space/fixed in orange(1, game))
fixed.PlaceOnTop(/turf/open/floor/plating)
fixed.place_on_top(/turf/open/floor/plating)
#define BUTTON_EXPLORE_SHIP "Explore Ship"
#define BUTTON_LEAVE_THE_DERELICT "Leave the Derelict"

2
code/game/machinery/deployable.dm
View File

@@ -80,7 +80,7 @@
if(do_after(user, 50, target=src))
W.use(5)
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall/mineral/wood/nonmetal)
T.place_on_top(/turf/closed/wall/mineral/wood/nonmetal)
qdel(src)
return
return ..()

4
code/game/objects/effects/effect_system/fluid_spread/effects_foam.dm
View File

@@ -361,7 +361,7 @@
return
to_chat(user, span_notice("You add the plating."))
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall/metal_foam_base)
T.place_on_top(/turf/closed/wall/metal_foam_base)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -393,7 +393,7 @@
/obj/effect/particle_effect/fluid/foam/metal/smart/make_result() //Smart foam adheres to area borders for walls
var/turf/open/location = loc
if(isspaceturf(location))
location.PlaceOnTop(/turf/open/floor/plating/foam)
location.place_on_top(/turf/open/floor/plating/foam)
for(var/cardinal in GLOB.cardinals)
var/turf/cardinal_turf = get_step(location, cardinal)

2
code/game/objects/items/stacks/stack.dm
View File

@@ -421,7 +421,7 @@
var/turf/covered_turf = builder.drop_location()
if(!isturf(covered_turf))
return
var/turf/created_turf = covered_turf.PlaceOnTop(recipe.result_type, flags = CHANGETURF_INHERIT_AIR)
var/turf/created_turf = covered_turf.place_on_top(recipe.result_type, flags = CHANGETURF_INHERIT_AIR)
builder.balloon_alert(builder, "placed [ispath(recipe.result_type, /turf/open) ? "floor" : "wall"]")
if(recipe.applies_mats && LAZYLEN(mats_per_unit))
created_turf.set_custom_materials(mats_per_unit, recipe.req_amount / recipe.res_amount)

2
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -81,7 +81,7 @@
if(!replace_plating)
if(!use(1))
return
target_plating = target_plating.PlaceOnTop(placed_turf_path, flags = CHANGETURF_INHERIT_AIR)
target_plating = target_plating.place_on_top(placed_turf_path, flags = CHANGETURF_INHERIT_AIR)
target_plating.setDir(turf_dir)
playsound(target_plating, 'sound/weapons/genhit.ogg', 50, TRUE)
return target_plating // Most executions should end here.

4
code/game/objects/structures/false_walls.dm
View File

@@ -78,7 +78,7 @@
/obj/structure/falsewall/proc/ChangeToWall(delete = 1)
var/turf/T = get_turf(src)
T.PlaceOnTop(walltype)
T.place_on_top(walltype)
if(delete)
qdel(src)
return T
@@ -404,7 +404,7 @@
/obj/structure/falsewall/material/ChangeToWall(delete = 1)
var/turf/current_turf = get_turf(src)
var/turf/closed/wall/material/new_wall = current_turf.PlaceOnTop(/turf/closed/wall/material)
var/turf/closed/wall/material/new_wall = current_turf.place_on_top(/turf/closed/wall/material)
new_wall.set_custom_materials(custom_materials)
if(delete)
qdel(src)

16
code/game/objects/structures/girders.dm
View File

@@ -99,7 +99,7 @@
return
rod.use(amount)
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall/mineral/iron)
T.place_on_top(/turf/closed/wall/mineral/iron)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -149,7 +149,7 @@
return
sheets.use(amount)
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall)
T.place_on_top(/turf/closed/wall)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -194,7 +194,7 @@
return
sheets.use(amount)
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall/r_wall)
T.place_on_top(/turf/closed/wall/r_wall)
transfer_fingerprints_to(T)
qdel(src)
return
@@ -271,9 +271,9 @@
sheets.use(amount)
var/turf/T = get_turf(src)
if(sheets.walltype)
T.PlaceOnTop(sheets.walltype)
T.place_on_top(sheets.walltype)
else
var/turf/newturf = T.PlaceOnTop(/turf/closed/wall/material)
var/turf/newturf = T.place_on_top(/turf/closed/wall/material)
var/list/material_list = list()
material_list[GET_MATERIAL_REF(sheets.material_type)] = SHEET_MATERIAL_AMOUNT * 2
if(material_list)
@@ -453,7 +453,7 @@
return
R.use(amount)
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall/mineral/cult)
T.place_on_top(/turf/closed/wall/mineral/cult)
qdel(src)
else
@@ -488,7 +488,7 @@
return FALSE
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall)
T.place_on_top(/turf/closed/wall)
qdel(src)
return TRUE
if(RCD_DECONSTRUCT)
@@ -525,7 +525,7 @@
return
B.use(amount)
var/turf/T = get_turf(src)
T.PlaceOnTop(/turf/closed/wall/mineral/bronze)
T.place_on_top(/turf/closed/wall/mineral/bronze)
qdel(src)
else

2
code/game/objects/structures/lattice.dm
View File

@@ -73,7 +73,7 @@
if(design_structure == /turf/open/floor/plating)
var/turf/T = src.loc
if(isgroundlessturf(T))
T.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
T.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
qdel(src)
return TRUE
if(design_structure == /obj/structure/lattice/catwalk)

68
code/game/turfs/baseturfs.dm
View File

@@ -27,54 +27,42 @@
src
)
// Make a new turf and put it on top
// The args behave identical to PlaceOnBottom except they go on top
// Things placed on top of closed turfs will ignore the topmost closed turf
// Returns the new turf
/turf/proc/PlaceOnTop(list/new_baseturfs, turf/fake_turf_type, flags)
var/area/turf_area = loc
if(new_baseturfs && !length(new_baseturfs))
new_baseturfs = list(new_baseturfs)
flags = turf_area.PlaceOnTopReact(new_baseturfs, fake_turf_type, flags) // A hook so areas can modify the incoming args
/// Places a turf at the top of the stack
/turf/proc/place_on_top(turf/added_layer, flags)
var/list/turf/new_baseturfs = list()
new_baseturfs.Add(baseturfs)
if(isopenturf(src))
new_baseturfs.Add(type)
return ChangeTurf(added_layer, new_baseturfs, flags)
/// Places a turf on top - for map loading
/turf/proc/load_on_top(turf/added_layer, flags)
var/area/our_area = get_area(src)
flags = our_area.PlaceOnTopReact(list(baseturfs), added_layer, flags)
var/turf/newT
if(flags & CHANGETURF_SKIP) // We haven't been initialized
if(flags_1 & INITIALIZED_1)
stack_trace("CHANGETURF_SKIP was used in a PlaceOnTop call for a turf that's initialized. This is a mistake. [src]([type])")
assemble_baseturfs()
if(fake_turf_type)
if(!new_baseturfs) // If no baseturfs list then we want to create one from the turf type
if(!length(baseturfs))
baseturfs = list(baseturfs)
var/list/old_baseturfs = baseturfs.Copy()
if(!isclosedturf(src))
old_baseturfs += type
newT = ChangeTurf(fake_turf_type, null, flags)
newT.assemble_baseturfs(initial(fake_turf_type.baseturfs)) // The baseturfs list is created like roundstart
if(!length(newT.baseturfs))
newT.baseturfs = list(baseturfs)
// The old baseturfs are put underneath, and we sort out the unwanted ones
newT.baseturfs = baseturfs_string_list(old_baseturfs + (newT.baseturfs - GLOB.blacklisted_automated_baseturfs), newT)
return newT
if(!length(baseturfs))
baseturfs = list(baseturfs)
if(!isclosedturf(src))
new_baseturfs = list(type) + new_baseturfs
baseturfs = baseturfs_string_list(baseturfs + new_baseturfs, src)
return ChangeTurf(fake_turf_type, null, flags)
var/turf/new_turf
if(!length(baseturfs))
baseturfs = list(baseturfs)
var/list/old_baseturfs = baseturfs.Copy()
if(!isclosedturf(src))
baseturfs = baseturfs_string_list(baseturfs + type, src)
var/turf/change_type
if(length(new_baseturfs))
change_type = new_baseturfs[new_baseturfs.len]
new_baseturfs.len--
if(new_baseturfs.len)
baseturfs = baseturfs_string_list(baseturfs + new_baseturfs, src)
else
change_type = new_baseturfs
return ChangeTurf(change_type, null, flags)
old_baseturfs += type
new_turf = ChangeTurf(added_layer, null, flags)
new_turf.assemble_baseturfs(initial(added_layer.baseturfs)) // The baseturfs list is created like roundstart
if(!length(new_turf.baseturfs))
new_turf.baseturfs = list(baseturfs)
// The old baseturfs are put underneath, and we sort out the unwanted ones
new_turf.baseturfs = baseturfs_string_list(old_baseturfs + (new_turf.baseturfs - GLOB.blacklisted_automated_baseturfs), new_turf)
return new_turf
// Copy an existing turf and put it on top
// Returns the new turf

4
code/game/turfs/open/_open.dm
View File

@@ -90,7 +90,7 @@
*/
/turf/open/proc/replace_floor(turf/open/new_floor_path, flags)
if (!overfloor_placed && initial(new_floor_path.overfloor_placed))
PlaceOnTop(new_floor_path, flags = flags)
place_on_top(new_floor_path, flags = flags)
return
ChangeTurf(new_floor_path, flags = flags)
@@ -400,7 +400,7 @@
return
playsound(src, 'sound/weapons/genhit.ogg', 50, TRUE)
var/turf/open/floor/plating/new_plating = PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
var/turf/open/floor/plating/new_plating = place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
if(lattice)
qdel(lattice)
else

2
code/game/turfs/open/chasm.dm
View File

@@ -42,7 +42,7 @@
/turf/open/chasm/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE

2
code/game/turfs/open/floor.dm
View File

@@ -274,7 +274,7 @@
if(girder)
return girder.rcd_act(user, the_rcd, rcd_data)
PlaceOnTop(/turf/closed/wall)
place_on_top(/turf/closed/wall)
return TRUE
if(RCD_WINDOWGRILLE)
//check if we are building a window

4
code/game/turfs/open/floor/plating.dm
View File

@@ -64,7 +64,7 @@
to_chat(user, span_notice("You begin reinforcing the floor..."))
if(do_after(user, 30, target = src))
if (R.get_amount() >= 2 && !istype(src, /turf/open/floor/engine))
PlaceOnTop(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR)
place_on_top(/turf/open/floor/engine, flags = CHANGETURF_INHERIT_AIR)
playsound(src, 'sound/items/deconstruct.ogg', 80, TRUE)
R.use(2)
to_chat(user, span_notice("You reinforce the floor."))
@@ -100,7 +100,7 @@
return
sheets.use(PLATE_REINFORCE_COST)
playsound(src, 'sound/machines/creak.ogg', 100, vary = TRUE)
PlaceOnTop(/turf/open/floor/plating/reinforced)
place_on_top(/turf/open/floor/plating/reinforced)
else
if(!iscyborg(user))
balloon_alert(user, "too damaged, use a welding tool!")

2
code/game/turfs/open/lava.dm
View File

@@ -160,7 +160,7 @@
/turf/open/lava/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE

2
code/game/turfs/open/misc.dm
View File

@@ -144,7 +144,7 @@
if(girder)
return girder.rcd_act(user, the_rcd, rcd_data)
PlaceOnTop(/turf/closed/wall)
place_on_top(/turf/closed/wall)
return TRUE
if(RCD_WINDOWGRILLE)
//check if we are building a window

6
code/game/turfs/open/openspace.dm
View File

@@ -145,7 +145,7 @@
/turf/open/openspace/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
if(rcd_data["[RCD_DESIGN_MODE]"] == RCD_TURF && rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
return FALSE
@@ -163,8 +163,8 @@
ChangeTurf(new_floor_path, flags = flags)
return
// Create plating under tiled floor we try to create directly onto the air
PlaceOnTop(/turf/open/floor/plating, flags = flags)
PlaceOnTop(new_floor_path, flags = flags)
place_on_top(/turf/open/floor/plating, flags = flags)
place_on_top(new_floor_path, flags = flags)
/turf/open/openspace/can_cross_safely(atom/movable/crossing)
return HAS_TRAIT(crossing, TRAIT_MOVE_FLYING)

6
code/game/turfs/open/space/space.dm
View File

@@ -229,7 +229,7 @@ GLOBAL_LIST_EMPTY(starlight)
/turf/open/space/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
if(the_rcd.mode == RCD_TURF)
if(rcd_data["[RCD_DESIGN_PATH]"] == /turf/open/floor/plating/rcd)
PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
return TRUE
else if(rcd_data["[RCD_DESIGN_PATH]"] == /obj/structure/lattice/catwalk)
var/obj/structure/lattice/lattice = locate(/obj/structure/lattice, src)
@@ -346,5 +346,5 @@ GLOBAL_LIST_EMPTY(starlight)
ChangeTurf(new_floor_path, flags = flags)
return
// Create plating under tiled floor we try to create directly onto space
PlaceOnTop(/turf/open/floor/plating, flags = flags)
PlaceOnTop(new_floor_path, flags = flags)
place_on_top(/turf/open/floor/plating, flags = flags)
place_on_top(new_floor_path, flags = flags)

2
code/modules/antagonists/cult/cult_structure_pylon.dm
View File

@@ -60,7 +60,7 @@
if(length(validturfs))
var/turf/converted_turf = pick(validturfs)
if(isplatingturf(converted_turf))
converted_turf.PlaceOnTop(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
converted_turf.place_on_top(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)
else
converted_turf.ChangeTurf(/turf/open/floor/engine/cult, flags = CHANGETURF_INHERIT_AIR)

2
code/modules/antagonists/heretic/magic/rust_construction.dm
View File

@@ -46,7 +46,7 @@
/datum/action/cooldown/spell/pointed/rust_construction/cast(turf/open/cast_on)
. = ..()
var/rises_message = "rises out of [cast_on]"
var/turf/closed/wall/new_wall = cast_on.PlaceOnTop(/turf/closed/wall)
var/turf/closed/wall/new_wall = cast_on.place_on_top(/turf/closed/wall)
if(!istype(new_wall))
return

8
code/modules/buildmode/submodes/basic.dm
View File

@@ -22,13 +22,13 @@
if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
var/turf/clicked_turf = object
if(isplatingturf(object))
clicked_turf.PlaceOnTop(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
clicked_turf.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
else if(isfloorturf(object))
clicked_turf.PlaceOnTop(/turf/closed/wall)
clicked_turf.place_on_top(/turf/closed/wall)
else if(iswallturf(object))
clicked_turf.PlaceOnTop(/turf/closed/wall/r_wall)
clicked_turf.place_on_top(/turf/closed/wall/r_wall)
else
clicked_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) // Gotta do something
clicked_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) // Gotta do something
log_admin("Build Mode: [key_name(c)] built [clicked_turf] at [AREACOORD(clicked_turf)]")
return
else if(right_click)

2
code/modules/cargo/supplypod.dm
View File

@@ -314,7 +314,7 @@
if (openingSound)
playsound(get_turf(holder), openingSound, soundVolume, FALSE, FALSE) //Special admin sound to play
for (var/turf_type in turfs_in_cargo)
turf_underneath.PlaceOnTop(turf_type)
turf_underneath.place_on_top(turf_type)
for (var/cargo in holder.contents)
var/atom/movable/movable_cargo = cargo
movable_cargo.forceMove(turf_underneath)

4
code/modules/mapfluff/ruins/lavalandruin_code/puzzle.dm
View File

@@ -173,7 +173,7 @@
//Setup random empty tile
empty_tile_id = pick_n_take(left_ids)
var/turf/empty_tile_turf = get_turf_for_id(empty_tile_id)
empty_tile_turf.PlaceOnTop(floor_type,null,CHANGETURF_INHERIT_AIR)
empty_tile_turf.place_on_top(floor_type, CHANGETURF_INHERIT_AIR)
var/mutable_appearance/MA = new(puzzle_pieces["[empty_tile_id]"])
MA.layer = empty_tile_turf.layer + 0.1
empty_tile_turf.add_overlay(MA)
@@ -182,7 +182,7 @@
var/list/empty_spots = left_ids.Copy()
for(var/spot_id in empty_spots)
var/turf/T = get_turf_for_id(spot_id)
T = T.PlaceOnTop(floor_type,null,CHANGETURF_INHERIT_AIR)
T = T.place_on_top(floor_type, CHANGETURF_INHERIT_AIR)
var/obj/structure/puzzle_element/E = new element_type(T)
elements += E
var/chosen_id = pick_n_take(left_ids)

4
code/modules/mapping/mapping_helpers.dm
View File

@@ -153,11 +153,11 @@
if(1 to 9)
var/turf/here = get_turf(src)
for(var/turf/closed/T in range(2, src))
here.PlaceOnTop(T.type)
here.place_on_top(T.type)
qdel(airlock)
qdel(src)
return
here.PlaceOnTop(/turf/closed/wall)
here.place_on_top(/turf/closed/wall)
qdel(airlock)
qdel(src)
return

2
code/modules/mapping/reader.dm
View File

@@ -950,7 +950,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
// Note: we make the assertion that the last path WILL be a turf. if it isn't, this will fail.
if(placeOnTop)
instance = crds.PlaceOnTop(null, members[index], CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE))
instance = crds.load_on_top(members[index], CHANGETURF_DEFER_CHANGE | (no_changeturf ? CHANGETURF_SKIP : NONE))
else if(no_changeturf)
instance = create_atom(members[index], crds)//first preloader pass
else

12
code/modules/mob/living/simple_animal/bot/floorbot.dm
View File

@@ -329,15 +329,15 @@
if(do_after(src, 50, target = target_turf) && mode == BOT_REPAIRING)
if(autotile) //Build the floor and include a tile.
if(replacetiles && tilestack)
target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
tilestack.place_tile(target_turf, src)
if(!tilestack)
speak("Requesting refill of custom floor tiles to continue replacing.")
else
target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
target_turf.PlaceOnTop(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
target_turf.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
else //Build a hull plating without a floor tile.
target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
else
var/turf/open/floor/F = target_turf
@@ -370,10 +370,10 @@
F.burnt = FALSE
F.update_appearance()
else if(istype(is_this_maints, /area/station/maintenance)) //place catwalk if it's plating and we're in maints
F.PlaceOnTop(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
F.place_on_top(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
else //place normal tile if it's plating anywhere else
F = F.make_plating(TRUE) || F
F.PlaceOnTop(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
F.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
if(!QDELETED(src))
go_idle()

2
code/modules/reagents/chemistry/reagents/other_reagents.dm
View File

@@ -1853,7 +1853,7 @@
/datum/reagent/carpet/expose_turf(turf/exposed_turf, reac_volume)
if(isopenturf(exposed_turf) && exposed_turf.turf_flags & IS_SOLID && !istype(exposed_turf, /turf/open/floor/carpet))
exposed_turf.PlaceOnTop(carpet_type, flags = CHANGETURF_INHERIT_AIR)
exposed_turf.place_on_top(carpet_type, flags = CHANGETURF_INHERIT_AIR)
..()
/datum/reagent/carpet/black

2
code/modules/spells/spell_types/conjure/_conjure.dm
View File

@@ -44,7 +44,7 @@
if (spawn_place.overfloor_placed)
spawn_place.ChangeTurf(summoned_object_type, flags = CHANGETURF_INHERIT_AIR)
else
spawn_place.PlaceOnTop(summoned_object_type, flags = CHANGETURF_INHERIT_AIR)
spawn_place.place_on_top(summoned_object_type, flags = CHANGETURF_INHERIT_AIR)
return
var/turf/open/open_turf = spawn_place
open_turf.replace_floor(summoned_object_type, flags = CHANGETURF_INHERIT_AIR)

2
code/modules/unit_tests/baseturfs.dm
View File

@@ -34,7 +34,7 @@
// Do this instead of just ChangeTurf to guarantee that baseturfs is completely default on-init behavior
RESET_TO_EXPECTED(run_loc_floor_bottom_left)
run_loc_floor_bottom_left.PlaceOnTop(/turf/closed/wall/rock)
run_loc_floor_bottom_left.place_on_top(/turf/closed/wall/rock)
TEST_ASSERT_EQUAL(run_loc_floor_bottom_left.type, /turf/closed/wall/rock, "Rock wall should've been placed on top")
run_loc_floor_bottom_left.ScrapeAway()

4
code/modules/vehicles/mecha/equipment/tools/work_tools.dm
View File

@@ -303,13 +303,13 @@
to_chat(source, "[icon2html(src, source)][span_notice("Building Wall...")]")
if(!do_after_cooldown(floor_turf, source))
return
floor_turf.PlaceOnTop(/turf/closed/wall)
floor_turf.place_on_top(/turf/closed/wall)
else if(isopenturf(target))
var/turf/open/open_turf = target
to_chat(source, "[icon2html(src, source)][span_notice("Building Floor...")]")
if(!do_after_cooldown(open_turf, source))
return
open_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
open_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
if(MODE_AIRLOCK)
if(isfloorturf(target))
to_chat(source, "[icon2html(src, source)][span_notice("Building Airlock...")]")