From c087647cce7ed1ebedf1f16acbe65b494740fc6c Mon Sep 17 00:00:00 2001 From: Brian McGillivray Date: Fri, 10 Feb 2017 18:57:04 +0000 Subject: [PATCH 1/2] Allows RCD to set constructed Airlocks name Adds a new section of the Airlock menu of the Rapid Construction Device so as to allow the user to specify the name the newly constructed Airlock should have. --- code/game/objects/items/weapons/RCD.dm | 10 +++++++++- nano/templates/rcd.tmpl | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 0bacbaa161e..56bda3d908c 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -28,6 +28,7 @@ RCD var/canRwall = 0 var/menu = 1 var/door_type = /obj/machinery/door/airlock + var/door_name = "Airlock" req_access = list(access_engine) var/list/door_accesses = list() var/list/door_accesses_list = list() @@ -85,7 +86,7 @@ RCD /obj/item/weapon/rcd/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = inventory_state) ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 400, 400, state = state) + ui = new(user, src, ui_key, "rcd.tmpl", "[name]", 450, 400, state = state) ui.open() ui.set_auto_update(1) @@ -93,6 +94,7 @@ RCD var/data[0] data["mode"] = mode data["door_type"] = door_type + data["door_name"] = door_name data["menu"] = menu data["matter"] = matter data["max_matter"] = max_matter @@ -164,6 +166,11 @@ RCD door_accesses_list[++door_accesses_list.len] = list("name" = get_access_desc(access), "id" = access, "enabled" = (access in door_accesses)) . = 1 + if(href_list["choice"] && !locked) + var/temp_t = sanitize(copytext(input("Enter a custom Airlock Name.","Airlock Name"),1,MAX_MESSAGE_LEN)) + if(temp_t) + door_name = temp_t + /obj/item/weapon/rcd/proc/activate() playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -207,6 +214,7 @@ RCD if(!useResource(10, user)) return 0 activate() var/obj/machinery/door/airlock/T = new door_type(A) + T.name = door_name T.autoclose = 1 if(one_access) T.req_one_access = door_accesses.Copy() diff --git a/nano/templates/rcd.tmpl b/nano/templates/rcd.tmpl index 073171a4ba7..ea96e555ef7 100644 --- a/nano/templates/rcd.tmpl +++ b/nano/templates/rcd.tmpl @@ -12,6 +12,12 @@ {{else data.menu == 2}}
{{:helper.link('Back', 'reply', {'menu': 1})}}
+
+ {{:data.door_name}} +
+ + +

Type

{{for data.allowed_door_types}} From d0f5525ba151f6497c59a1c88b8a73e564a32347 Mon Sep 17 00:00:00 2001 From: Brian McGillivray Date: Fri, 10 Feb 2017 19:00:30 +0000 Subject: [PATCH 2/2] Correction to the RCD Template --- nano/templates/rcd.tmpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nano/templates/rcd.tmpl b/nano/templates/rcd.tmpl index ea96e555ef7..e72b6253a17 100644 --- a/nano/templates/rcd.tmpl +++ b/nano/templates/rcd.tmpl @@ -13,6 +13,15 @@ {{else data.menu == 2}}
{{:helper.link('Back', 'reply', {'menu': 1})}}
+
+
+
+ {{if !data.locked}}{{:helper.link("Rename", '', {'choice' : 'airlock_name'})}}{{else}}LOCKED{{/if}} +
+
+ Airlock Name: +
+
{{:data.door_name}}