Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes orbital droppers use map_templates. #7996

Merged
merged 3 commits into from
Jan 12, 2020
Merged

Makes orbital droppers use map_templates. #7996

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0da3522
Makes orbital droppers use map_templates.
NonQueueingMatt Jan 12, 2020
2e831a3
fugg
NonQueueingMatt Jan 12, 2020
ebdedfa
final fix
NonQueueingMatt Jan 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fugg
  • Loading branch information
@NonQueueingMatt
NonQueueingMatt committed Jan 12, 2020
commit 2e831a34e7657c854aa4e41f9be53e35a925a0f3
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/drop_targeter/_droptargeter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/datum/map_template/map
var/datum/map_template/map = new

/obj/item/device/orbital_dropper/attack_self(mob/user)
zoom(user, tileoffset, viewsize)
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/devices/drop_targeter/orbital_drops.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."

map = new /datum/map_template/drill
map = /datum/map_template/drill

/obj/item/device/orbital_dropper/mecha
name = "mecha dropper"
Expand All @@ -18,7 +18,7 @@
announcer_name = "Respawn Mech Industries"
announcer_channel = "Common"

map = new /datum/map_template/mecha
map = /datum/map_template/mecha

/obj/item/device/orbital_dropper/armory
name = "armory dropper"
Expand All @@ -31,7 +31,7 @@
announcer_name = "GunCourier Industries Autodrone"
announcer_channel = "Common"

map = new /datum/map_template/armory
map = /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."
Expand Down
2 changes: 1 addition & 1 deletion maps/templates/orbital/orbital_templates.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

/datum/map_template/drill
name = "Drill Drop"
mappath = 'maps/templates/orbital/drill.dmm'
mappath = 'maps/templates/orbital/drill.dmm'