Makes orbital droppers use map_templates.

aurorastation.dme

@@ -2634,4 +2634,5 @@
 #include "maps\exodus\code\exodus_unittest.dm"
 #include "maps\runtime\code\runtime.dm"
 #include "maps\runtime\code\runtime_unittest.dm"
+#include "maps\templates\orbital\orbital_templates.dm"
 // END_INCLUDE

code/game/objects/items/devices/drop_targeter/_droptargeter.dm

@@ -21,7 +21,7 @@
 	var/announcer_name = "Mining Requests Console"
 	var/announcer_channel = "Supply" // If not emagged, will announce to this channel. If emagged, will always announce on the common channel.
 
-	var/template_name
+	var/datum/map_template/map
 
 /obj/item/device/orbital_dropper/attack_self(mob/user)
 	zoom(user, tileoffset, viewsize)
@@ -84,12 +84,11 @@
 	icon_state = "drillpointer"
 
 /obj/item/device/orbital_dropper/proc/orbital_drop(var/turf/target, var/user)
-	var/dmm_suite/maploader = new
-	if(!maploader)
-		log_debug("Error, unable to load maploader in proc orbital_drop!")
+	if(!map)
 		return
 	log_and_message_admins("[key_name_admin(src)] has used a [src] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[target.x];Y=[target.y];Z=[target.z]'>JMP</a>.")
-	maploader.load_map(file("maps/templates/orbital/" + template_name), target.x, target.y, target.z, no_changeturf = TRUE)
+	map.load(target, TRUE) //Target must be the center!
+
 
 /obj/item/device/orbital_dropper/emag_act(var/remaining_charges, var/mob/user)
 	if(!emagged)

code/game/objects/items/devices/drop_targeter/orbital_drops.dm

@@ -5,7 +5,7 @@
 	drop_message = "Stand by for drillfall, ETA ten seconds, clear the targetted area."
 	drop_message_emagged = "St%n^ b* for dr$llfa#l, ETA t@n s*c%&ds, RUN."
 
-	template_name = "drill.dmm"
+	map = new /datum/map_template/drill
 
 /obj/item/device/orbital_dropper/mecha
 	name = "mecha dropper"
@@ -18,7 +18,7 @@
 	announcer_name = "Respawn Mech Industries"
 	announcer_channel = "Common"
 
-	template_name = "combat-mecha.dmm"
+	map = new /datum/map_template/mecha
 
 /obj/item/device/orbital_dropper/armory
 	name = "armory dropper"
@@ -31,7 +31,7 @@
 	announcer_name = "GunCourier Industries Autodrone"
 	announcer_channel = "Common"
 
-	template_name = "mini-armory.dmm"
+	map = new /datum/map_template/armory
 
 /obj/item/device/orbital_dropper/armory/syndicate
 	description_antag = "This is a stealthy variant of the standard armory orbital drop. It will not report itself dropping on common, unless emagged."

html/changelogs/mattatlas-maploader.yml

@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Orbital drops now work properly."

maps/templates/orbital/orbital_templates.dm

@@ -0,0 +1,11 @@
+/datum/map_template/mecha
+	name = "Mecha Drop"
+	mappath = 'maps/templates/orbital/combat-mecha.dmm'
+
+/datum/map_template/armory
+	name = "Armory Drop"
+	mappath = 'maps/templates/orbital/mini-armory.dmm'
+
+/datum/map_template/drill
+	name = "Drill Drop"
+	mappath = 'maps/templates/orbital/drill.dmm'