cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Size tweaks, less snowflakey syndieborg radio

Browse Source
This commit is contained in:
Tigercat2000
2015-10-05 09:31:11 -07:00
parent 9a6b5c2749
commit ec747b9f04
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -107,7 +107,7 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if(!ui)
ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 550, 500)
ui = new(user, src, ui_key, "radio_electro.tmpl", "[name]", 400, 500)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
code/game/objects/items/devices/radio/radio.dm
+7 -2
View File
@@ -128,7 +128,7 @@ var/global/list/default_medbay_channels = list(
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if(!ui)
ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 550, 500)
ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 400, 550)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
@@ -583,6 +583,11 @@ var/global/list/default_medbay_channels = list(
syndie = 1
keyslot = new /obj/item/device/encryptionkey/syndicate
/obj/item/device/radio/borg/syndicate/CanUseTopic(mob/user, datum/topic_state/state)
. = ..()
if(. == STATUS_UPDATE && istype(user, /mob/living/silicon/robot/syndicate))
. = STATUS_INTERACTIVE
/obj/item/device/radio/borg/Destroy()
myborg = null
return ..()
@@ -740,7 +745,7 @@ var/global/list/default_medbay_channels = list(
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if(!ui)
ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 550, 500)
ui = new(user, src, ui_key, "radio_basic.tmpl", "[name]", 430, 500)
ui.set_initial_data(data)
ui.open()
ui.set_auto_update(1)
code/modules/nano/interaction/default.dm
-2
View File
@@ -43,8 +43,6 @@
var/obj/machinery/Machine = src_object
if(Machine.emagged)
return STATUS_INTERACTIVE
if(istype(src_object, /obj/item/device/radio/borg/syndicate)) //Not ideal, but they can't access their own radio otherwise.
return STATUS_INTERACTIVE
return STATUS_UPDATE
/mob/living/silicon/ai/default_can_use_topic(var/src_object)