mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
Fix UI syringes not setting UI flag correctly.
This commit is contained in:
@@ -404,7 +404,23 @@ client
|
||||
|
||||
else
|
||||
html += "[name] = <span class='value'>[value]</span>"
|
||||
|
||||
/*
|
||||
// Bitfield stuff
|
||||
if(round(value)==value) // Require integers.
|
||||
var/idx=0
|
||||
var/bit=0
|
||||
var/bv=0
|
||||
html += "<div class='value binary'>"
|
||||
for(var/block=0;block<8;block++)
|
||||
html += " <span class='block'>"
|
||||
for(var/i=0;i<4;i++)
|
||||
idx=(block*4)+i
|
||||
bit=1 << idx
|
||||
bv=value & bit
|
||||
html += "<a href='?_src_=vars;togbit=[idx];var=[name];subject=\ref[DA]' title='bit [idx] ([bit])'>[bv?1:0]</a>"
|
||||
html += "</span>"
|
||||
html += "</div>"
|
||||
*/
|
||||
html += "</li>"
|
||||
|
||||
return html
|
||||
@@ -442,6 +458,20 @@ client
|
||||
|
||||
modify_variables(D, href_list["varnameedit"], 1)
|
||||
|
||||
else if(href_list["togbit"])
|
||||
if(!check_rights(R_VAREDIT)) return
|
||||
|
||||
var/atom/D = locate(href_list["subject"])
|
||||
if(!istype(D,/datum) && !istype(D,/client))
|
||||
usr << "This can only be used on instances of types /client or /datum"
|
||||
return
|
||||
if(!(href_list["var"] in D.vars))
|
||||
usr << "Unable to find variable specified."
|
||||
return
|
||||
var/value = D.vars[href_list["var"]]
|
||||
value ^= 1 << text2num(href_list["togbit"])
|
||||
D.vars[href_list["var"]] = value
|
||||
|
||||
else if(href_list["varnamechange"] && href_list["datumchange"])
|
||||
if(!check_rights(R_VAREDIT)) return
|
||||
|
||||
|
||||
@@ -801,7 +801,7 @@
|
||||
if (bufferOption == "saveUI")
|
||||
if(src.connected.occupant && src.connected.occupant.dna)
|
||||
var/datum/dna2/record/databuf=new
|
||||
databuf.types = DNA2_BUF_UE
|
||||
databuf.types = DNA2_BUF_UI // DNA2_BUF_UE
|
||||
databuf.dna = src.connected.occupant.dna.Clone()
|
||||
if(ishuman(connected.occupant))
|
||||
databuf.dna.real_name=connected.occupant.name
|
||||
@@ -851,7 +851,7 @@
|
||||
src.connected.locked = 1//lock it
|
||||
nanomanager.update_uis(src) // update all UIs attached to src
|
||||
|
||||
sleep(10*2) // sleep for 2 seconds
|
||||
sleep(2 SECONDS)
|
||||
|
||||
irradiating = 0
|
||||
src.connected.locked = lock_state
|
||||
@@ -891,14 +891,9 @@
|
||||
if(success)
|
||||
I.loc = src.loc
|
||||
I.name += " ([buf.name])"
|
||||
//src.temphtml = "Injector created."
|
||||
src.injector_ready = 0
|
||||
spawn(300)
|
||||
src.injector_ready = 1
|
||||
//else
|
||||
//src.temphtml = "Error in injector creation."
|
||||
//else
|
||||
//src.temphtml = "Replicator not ready yet."
|
||||
return 1
|
||||
|
||||
if (bufferOption == "loadDisk")
|
||||
|
||||
@@ -64,6 +64,7 @@
|
||||
M.radiation += rand(5,20)
|
||||
|
||||
if (!(M_NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
|
||||
// UI in syringe.
|
||||
if (buf.types & DNA2_BUF_UI)
|
||||
if (!block) //isolated block?
|
||||
M.UpdateAppearance(buf.dna.UI.Copy())
|
||||
|
||||
Reference in New Issue
Block a user