diff --git a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm
index 4d85744738..f1f9624380 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughterevent.dm
@@ -32,7 +32,7 @@
return MAP_ERROR
var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter((pick(spawn_locs)))
- var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
+ var/mob/living/simple_animal/slaughter/S = new (holder)
S.holder = holder
player_mind.transfer_to(S)
player_mind.assigned_role = "Slaughter Demon"
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 6c9e11ffa4..198d368d59 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -175,7 +175,7 @@
return
if(beaker)
- beaker.forceMove(get_turf(src))
+ beaker.forceMove(drop_location())
beaker = null
update_icon()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 4e83a709b9..520c739e55 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -6,7 +6,7 @@
/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
..()
new /obj/item/clothing/neck/cloak/qm(src)
- new /obj/item/storage/lockbox/medal/cargo/(src)
+ new /obj/item/storage/lockbox/medal/cargo(src)
new /obj/item/clothing/under/rank/cargo(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
new /obj/item/device/radio/headset/headset_cargo(src)
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 3061a9d258..594dba355d 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -408,7 +408,7 @@
/obj/structure/girder/cult/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
- new/obj/item/stack/sheet/runed_metal/(get_turf(src), 1)
+ new /obj/item/stack/sheet/runed_metal(drop_location(), 1)
qdel(src)
/obj/structure/girder/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index cbd5b23bf3..2a0147c82a 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -451,7 +451,7 @@
stage = GIBTONITE_DETONATE
explosion(bombturf,1,2,5, adminlog = 0)
if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
- var/obj/item/twohanded/required/gibtonite/G = new /obj/item/twohanded/required/gibtonite/(src)
+ var/obj/item/twohanded/required/gibtonite/G = new (src)
if(det_time <= 0)
G.quality = 3
G.icon_state = "Gibtonite ore 3"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 11bd241437..b395dad6bd 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -78,7 +78,7 @@
/obj/machinery/atmospherics/components/unary/cryo_cell/on_deconstruction()
if(beaker)
- beaker.forceMove(loc)
+ beaker.forceMove(drop_location())
beaker = null
/obj/machinery/atmospherics/components/unary/cryo_cell/update_icon()
@@ -381,7 +381,7 @@
. = TRUE
if("ejectbeaker")
if(beaker)
- beaker.forceMove(loc)
+ beaker.forceMove(drop_location())
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker)
beaker = null
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 0aa53ee126..5af834955f 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -230,7 +230,7 @@
user.throw_at(throw_target, 200, 4)
if(8)
//Fueltank Explosion
- explosion(src.loc,-1,0,2, flame_range = 2)
+ explosion(loc,-1,0,2, flame_range = 2)
if(9)
//Cold
var/datum/disease/D = new /datum/disease/cold
@@ -240,7 +240,7 @@
visible_message("[src] roll perfectly.")
if(11)
//Cookie
- var/obj/item/reagent_containers/food/snacks/cookie/C = new(get_turf(src))
+ var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location())
C.name = "Cookie of Fate"
if(12)
//Healing
@@ -258,13 +258,13 @@
new /obj/item/coin/gold(M)
if(14)
//Free Gun
- new /obj/item/gun/ballistic/revolver/mateba(get_turf(src))
+ new /obj/item/gun/ballistic/revolver/mateba(drop_location())
if(15)
//Random One-use spellbook
- new /obj/item/spellbook/oneuse/random(get_turf(src))
+ new /obj/item/spellbook/oneuse/random(drop_location())
if(16)
//Servant & Servant Summon
- var/mob/living/carbon/human/H = new(get_turf(src))
+ var/mob/living/carbon/human/H = new(drop_location())
H.equipOutfit(/datum/outfit/butler)
var/datum/mind/servant_mind = new /datum/mind()
var/datum/objective/O = new("Serve [user.real_name].")
@@ -285,10 +285,10 @@
if(17)
//Tator Kit
- new /obj/item/storage/box/syndicate/(get_turf(src))
+ new /obj/item/storage/box/syndicate(drop_location())
if(18)
//Captain ID
- new /obj/item/card/id/captains_spare(get_turf(src))
+ new /obj/item/card/id/captains_spare(drop_location())
if(19)
//Instrinct Resistance
to_chat(user, "You feel robust.")
diff --git a/code/modules/food_and_drinks/food/snacks/meat.dm b/code/modules/food_and_drinks/food/snacks/meat.dm
index 5b9148d16c..e43309892d 100644
--- a/code/modules/food_and_drinks/food/snacks/meat.dm
+++ b/code/modules/food_and_drinks/food/snacks/meat.dm
@@ -212,7 +212,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/goliath/burn()
visible_message("[src] finishes cooking!")
- new /obj/item/reagent_containers/food/snacks/meat/steak/goliath/(loc)
+ new /obj/item/reagent_containers/food/snacks/meat/steak/goliath(loc)
qdel(src)
/obj/item/reagent_containers/food/snacks/meat/slab/meatwheat
diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
index 0e6a7e9034..08120cc6e4 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
@@ -135,7 +135,7 @@
if (!beaker)
return
src.verbs -= /obj/machinery/juicer/verb/detach
- beaker.loc = src.loc
+ beaker.forceMove(drop_location())
beaker = null
update_icon()
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index d46875eb00..3f992d711a 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -294,7 +294,7 @@
/obj/machinery/biogenerator/proc/detach()
if(beaker)
- beaker.loc = src.loc
+ beaker.forceMove(drop_location())
beaker = null
update_icon()
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 61c34b0466..4eb225360a 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -257,7 +257,7 @@
/mob/living/simple_animal/bot/cleanbot/explode()
on = FALSE
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
new /obj/item/reagent_containers/glass/bucket(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index f2b30a0a3c..62fb2e772c 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -371,24 +371,24 @@ Auto Patrol[]"},
/mob/living/simple_animal/bot/ed209/explode()
walk_to(src,0)
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
- var/obj/item/ed209_assembly/Sa = new /obj/item/ed209_assembly(Tsec)
+ var/obj/item/ed209_assembly/Sa = new (Tsec)
Sa.build_step = 1
Sa.add_overlay("hs_hole")
Sa.created_name = name
new /obj/item/device/assembly/prox_sensor(Tsec)
if(!lasercolor)
- var/obj/item/gun/energy/e_gun/advtaser/G = new /obj/item/gun/energy/e_gun/advtaser(Tsec)
+ var/obj/item/gun/energy/e_gun/advtaser/G = new (Tsec)
G.cell.charge = 0
G.update_icon()
else if(lasercolor == "b")
- var/obj/item/gun/energy/laser/bluetag/G = new /obj/item/gun/energy/laser/bluetag(Tsec)
+ var/obj/item/gun/energy/laser/bluetag/G = new (Tsec)
G.cell.charge = 0
G.update_icon()
else if(lasercolor == "r")
- var/obj/item/gun/energy/laser/redtag/G = new /obj/item/gun/energy/laser/redtag(Tsec)
+ var/obj/item/gun/energy/laser/redtag/G = new (Tsec)
G.cell.charge = 0
G.update_icon()
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 1ae1c7d3a6..28a64838f7 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -162,7 +162,7 @@
update_controls()
/mob/living/simple_animal/bot/floorbot/proc/empty_tiles()
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
while(specialtiles > initial(tiletype.max_amount))
new tiletype(Tsec,initial(tiletype.max_amount))
@@ -363,9 +363,9 @@
/mob/living/simple_animal/bot/floorbot/explode()
on = FALSE
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
- var/obj/item/storage/toolbox/mechanical/N = new /obj/item/storage/toolbox/mechanical(Tsec)
+ var/obj/item/storage/toolbox/mechanical/N = new (Tsec)
N.contents = list()
new /obj/item/device/assembly/prox_sensor(Tsec)
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index f41a6138cb..3e15adbfe0 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -327,14 +327,14 @@ Maintenance panel panel is [open ? "opened" : "closed"]"},
walk_to(src,0)
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
//doesn't drop cardboard nor its assembly, since its a very frail material.
if(prob(50))
- new /obj/item/bodypart/l_arm/robot/(Tsec)
+ new /obj/item/bodypart/l_arm/robot(Tsec)
new /obj/item/bikehorn(Tsec)
new /obj/item/device/assembly/prox_sensor(Tsec)
- var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+ var/datum/effect_system/spark_spread/s = new
s.set_up(3, 1, src)
s.start()
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 06c953a2da..57cad4570f 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -194,7 +194,7 @@
use_beaker = !use_beaker
else if(href_list["eject"] && (!isnull(reagent_glass)))
- reagent_glass.loc = get_turf(src)
+ reagent_glass.forceMove(drop_location())
reagent_glass = null
else if(href_list["togglevoice"])
@@ -516,7 +516,7 @@
/mob/living/simple_animal/bot/medbot/explode()
on = FALSE
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
new /obj/item/storage/firstaid(Tsec)
@@ -525,7 +525,7 @@
new /obj/item/device/healthanalyzer(Tsec)
if(reagent_glass)
- reagent_glass.loc = Tsec
+ reagent_glass.forceMove(Tsec)
reagent_glass = null
if(prob(50))
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index b602e19125..170659ef29 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -697,14 +697,14 @@
/mob/living/simple_animal/bot/mulebot/explode()
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
new /obj/item/device/assembly/prox_sensor(Tsec)
new /obj/item/stack/rods(Tsec)
new /obj/item/stack/rods(Tsec)
new /obj/item/stack/cable_coil/cut(Tsec)
if(cell)
- cell.loc = Tsec
+ cell.forceMove(Tsec)
cell.update_icon()
cell = null
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 4300746901..acef65f545 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -50,7 +50,7 @@
/mob/living/simple_animal/bot/secbot/beepsky/explode()
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
new /obj/item/stock_parts/cell/potato(Tsec)
var/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/S = new(Tsec)
S.reagents.add_reagent("whiskey", 15)
@@ -399,9 +399,9 @@ Auto Patrol: []"},
walk_to(src,0)
visible_message("[src] blows apart!")
- var/turf/Tsec = get_turf(src)
+ var/atom/Tsec = drop_location()
- var/obj/item/secbot_assembly/Sa = new /obj/item/secbot_assembly(Tsec)
+ var/obj/item/secbot_assembly/Sa = new (Tsec)
Sa.build_step = 1
Sa.add_overlay("hs_hole")
Sa.created_name = name
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index af5597d790..654b9e0e69 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -170,7 +170,7 @@
. = TRUE
if("eject")
if(beaker)
- beaker.forceMove(loc)
+ beaker.forceMove(drop_location())
beaker = null
cut_overlays()
. = TRUE
@@ -301,7 +301,7 @@
/obj/machinery/chem_dispenser/constructable/on_deconstruction()
if(beaker)
- beaker.loc = loc
+ beaker.forceMove(drop_location())
beaker = null
/obj/machinery/chem_dispenser/drinks
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index abe58cb79d..f8d2a66247 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -111,7 +111,7 @@
/obj/machinery/chem_heater/proc/eject_beaker()
if(beaker)
- beaker.loc = get_turf(src)
+ beaker.forceMove(drop_location())
beaker.reagents.handle_reactions()
beaker = null
icon_state = "mixer0b"
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 64731319b6..ae0f4a008a 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -121,7 +121,7 @@
add_overlay("waitlight")
/obj/machinery/computer/pandemic/proc/eject_beaker()
- beaker.forceMove(get_turf(src))
+ beaker.forceMove(drop_location())
beaker = null
update_icon()
@@ -186,7 +186,7 @@
var/id = get_virus_id_by_index(text2num(params["index"]))
var/datum/disease/advance/A = new(FALSE, SSdisease.archive_diseases[id])
var/list/data = list("viruses" = list(A))
- var/obj/item/reagent_containers/glass/bottle/B = new(get_turf(src))
+ var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
B.name = "[A.name] culture bottle"
B.desc = "A small bottle. Contains [A.agent] culture in synthblood medium."
B.reagents.add_reagent("blood", 20, data)
@@ -195,9 +195,15 @@
addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 50)
. = TRUE
if("create_vaccine_bottle")
+<<<<<<< HEAD
var/index = text2num(params["index"])
var/datum/disease/D = SSdisease.archive_diseases[get_virus_id_by_index(index)]
var/obj/item/reagent_containers/glass/bottle/B = new(get_turf(src))
+=======
+ var/id = params["index"]
+ var/datum/disease/D = SSdisease.archive_diseases[id]
+ var/obj/item/reagent_containers/glass/bottle/B = new(drop_location())
+>>>>>>> ed12ad4... Updates some item drops to use drop_location() (#32994)
B.name = "[D.name] vaccine bottle"
B.reagents.add_reagent("vaccine", 15, list(index))
wait = TRUE
@@ -237,6 +243,6 @@
/obj/machinery/computer/pandemic/on_deconstruction()
if(beaker)
- beaker.forceMove(get_turf(src))
+ beaker.forceMove(drop_location())
beaker = null
. = ..()