mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-30 07:27:57 +01:00
Fix nanomap dragging & supply console
Nanomap coordinates are fucked, I'm not even going to think of touching the calculations for that shit.
This commit is contained in:
@@ -365,8 +365,7 @@ var/list/mechtoys = list(
|
||||
return attack_hand(user)
|
||||
|
||||
/obj/machinery/computer/ordercomp/attack_hand(var/mob/user as mob)
|
||||
ui_interact(usr)
|
||||
return
|
||||
ui_interact(user)
|
||||
|
||||
/obj/machinery/computer/ordercomp/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
|
||||
// data to send to ui
|
||||
@@ -424,7 +423,7 @@ var/list/mechtoys = list(
|
||||
|
||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
|
||||
if(!ui)
|
||||
ui = new(user, src, ui_key, "order_console.tmpl", name, COMP_SCREEN_WIDTH, COMP_SCREEN_HEIGHT)
|
||||
ui = new(user, src, ui_key, "order_console.tmpl", name, COMP_SCREEN_WIDTH+10, COMP_SCREEN_HEIGHT) //plus 10 because the default is *just* small enough to cause ugly wrapping effects
|
||||
ui.set_initial_data(data)
|
||||
ui.open()
|
||||
|
||||
@@ -596,7 +595,7 @@ var/list/mechtoys = list(
|
||||
|
||||
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data)
|
||||
if(!ui)
|
||||
ui = new(user, src, ui_key, "supply_console.tmpl", name, COMP_SCREEN_WIDTH, COMP_SCREEN_HEIGHT)
|
||||
ui = new(user, src, ui_key, "supply_console.tmpl", name, COMP_SCREEN_WIDTH+10, COMP_SCREEN_HEIGHT) //plus 10 because the default is *just* small enough to cause ugly wrapping effects
|
||||
ui.set_initial_data(data)
|
||||
ui.open()
|
||||
|
||||
|
||||
+1
-1
@@ -298,7 +298,7 @@ div.notice {
|
||||
border: 1px solid #40628a;
|
||||
padding: 4px;
|
||||
margin: 3px 0;
|
||||
overflow: hidden;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.statusDisplayRecords {
|
||||
|
||||
@@ -63,9 +63,7 @@ NanoStateClass.prototype.onUpdate = function (data) {
|
||||
if (!this.mapInitialised)
|
||||
{
|
||||
// Add drag functionality to the map ui
|
||||
$('#uiMap').draggable({
|
||||
handle : '#uiMapImage'
|
||||
});
|
||||
$('#uiMap').draggable();
|
||||
|
||||
$('#uiMapTooltip')
|
||||
.off('click')
|
||||
|
||||
@@ -55,7 +55,7 @@ Used In File(s): \code\game\supplyshuttle.dm
|
||||
<div class="itemLabel">
|
||||
Supply Crates
|
||||
</div>
|
||||
<div class="itemContentWide" style="width: 95%;">
|
||||
<div class="itemContentWide" style="width: 100%;">
|
||||
<div class="statusDisplay">
|
||||
<div class="line" style="overflow-y: auto; overflow-x: hidden; scrollbar-base-color: #336699; scrollbar-arrow-color: #ffffff; height: 184px">
|
||||
{{if !data.contents}}
|
||||
|
||||
Reference in New Issue
Block a user