cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

Browse Source 
This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
This commit is contained in:
SinTwo
2016-08-15 12:58:00 -04:00
parent 6bb5409349
commit eabefc538a
325 changed files with 3375 additions and 41824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/callproc/callproc.dm
View File

@@ -125,7 +125,7 @@
return
if("marked datum")
current = holder.marked_datum()
current = holder.marked_datum
if(!current)
switch(alert("You do not currently have a marked datum; do you want to pass null instead?",, "Yes", "Cancel"))
if("Yes")

5
code/modules/admin/holder2.dm
View File

@@ -6,16 +6,13 @@ var/list/admin_datums = list()
var/rights = 0
var/fakekey = null
var/datum/weakref/marked_datum_weak
var/datum/marked_datum
var/admincaster_screen = 0 //See newscaster.dm under machinery for a full description
var/datum/feed_message/admincaster_feed_message = new /datum/feed_message //These two will act as holders.
var/datum/feed_channel/admincaster_feed_channel = new /datum/feed_channel
var/admincaster_signature //What you'll sign the newsfeeds as
/datum/admins/proc/marked_datum()
if(marked_datum_weak)
return marked_datum_weak.resolve()
/datum/admins/New(initial_rank = "Temporary Admin", initial_rights = 0, ckey)
if(!ckey)

3
code/modules/admin/topic.dm
View File

@@ -1538,7 +1538,6 @@
where = "onfloor"
if ( where == "inmarked" )
var/marked_datum = marked_datum()
if ( !marked_datum )
usr << "You don't have any object marked. Abandoning spawn."
return
@@ -1556,7 +1555,7 @@
if ("relative")
target = locate(loc.x + X,loc.y + Y,loc.z + Z)
if ( "inmarked" )
target = marked_datum()
target = marked_datum
if(target)
for (var/path in paths)

15
code/modules/admin/verbs/debug.dm
View File

@@ -959,18 +959,3 @@
log_admin("[key_name(src)] has toggled [M.key]'s [blockname] block [state]!")
else
alert("Invalid mob")
/client/proc/reload_nanoui_resources()
set category = "Debug"
set name = "Reload NanoUI Resources"
set desc = "Force the client to redownload NanoUI Resources"
// Close open NanoUIs.
nanomanager.close_user_uis(usr)
// Re-load the assets.
var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui)
assets.register()
// Clear the user's cache so they get resent.
usr.client.cache = list()

1
code/modules/admin/verbs/mapping.dm
View File

@@ -162,7 +162,6 @@ var/list/debug_verbs = list (
,/client/proc/setup_supermatter_engine
,/client/proc/atmos_toggle_debug
,/client/proc/spawn_tanktransferbomb
,/client/proc/reload_nanoui_resources
)

78
code/modules/admin/verbs/modifyvariables.dm
View File

@@ -27,20 +27,20 @@ var/list/VVckey_edit = list("key", "ckey")
src.modify_variables(ticker)
feedback_add_details("admin_verb","ETV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/mod_list_add_ass()
var/class = "text"
var/list/class_input = list("text","num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
if(src.holder)
var/datum/marked_datum = holder.marked_datum()
if(marked_datum)
class_input += "marked datum ([marked_datum.type])"
/client/proc/mod_list_add_ass() //haha
var/class = "text"
if(src.holder && src.holder.marked_datum)
class = input("What kind of variable?","Variable Type") as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default","marked datum ([holder.marked_datum.type])")
else
class = input("What kind of variable?","Variable Type") as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
class = input("What kind of variable?","Variable Type") as null|anything in class_input
if(!class)
return
var/datum/marked_datum = holder.marked_datum()
if(marked_datum && class == "marked datum ([marked_datum.type])")
if(holder.marked_datum && class == "marked datum ([holder.marked_datum.type])")
class = "marked datum"
var/var_value = null
@@ -69,7 +69,7 @@ var/list/VVckey_edit = list("key", "ckey")
var_value = input("Pick icon:","Icon") as null|icon
if("marked datum")
var_value = holder.marked_datum()
var_value = holder.marked_datum
if(!var_value) return
@@ -79,18 +79,17 @@ var/list/VVckey_edit = list("key", "ckey")
/client/proc/mod_list_add(var/list/L, atom/O, original_name, objectvar)
var/class = "text"
var/list/class_input = list("text","num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
if(src.holder)
var/datum/marked_datum = holder.marked_datum()
if(marked_datum)
class_input += "marked datum ([marked_datum.type])"
if(src.holder && src.holder.marked_datum)
class = input("What kind of variable?","Variable Type") as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default","marked datum ([holder.marked_datum.type])")
else
class = input("What kind of variable?","Variable Type") as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
class = input("What kind of variable?","Variable Type") as null|anything in class_input
if(!class)
return
var/datum/marked_datum = holder.marked_datum()
if(marked_datum && class == "marked datum ([marked_datum.type])")
if(holder.marked_datum && class == "marked datum ([holder.marked_datum.type])")
class = "marked datum"
var/var_value = null
@@ -119,7 +118,7 @@ var/list/VVckey_edit = list("key", "ckey")
var_value = input("Pick icon:","Icon") as icon
if("marked datum")
var_value = holder.marked_datum()
var_value = holder.marked_datum
if(!var_value) return
@@ -245,21 +244,17 @@ var/list/VVckey_edit = list("key", "ckey")
usr << "If a direction, direction is: [dir]"
var/class = "text"
var/list/class_input = list("text","num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
if(src.holder)
var/datum/marked_datum = holder.marked_datum()
if(marked_datum)
class_input += "marked datum ([marked_datum.type])"
class_input += "DELETE FROM LIST"
class = input("What kind of variable?","Variable Type",default) as null|anything in class_input
if(src.holder && src.holder.marked_datum)
class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default","marked datum ([holder.marked_datum.type])", "DELETE FROM LIST")
else
class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default", "DELETE FROM LIST")
if(!class)
return
var/datum/marked_datum = holder.marked_datum()
if(marked_datum && class == "marked datum ([marked_datum.type])")
if(holder.marked_datum && class == "marked datum ([holder.marked_datum.type])")
class = "marked datum"
var/original_var
@@ -341,9 +336,7 @@ var/list/VVckey_edit = list("key", "ckey")
L[L.Find(variable)] = new_var
if("marked datum")
new_var = holder.marked_datum()
if(!new_var)
return
new_var = holder.marked_datum
if(assoc)
L[assoc_key] = new_var
else
@@ -508,12 +501,12 @@ var/list/VVckey_edit = list("key", "ckey")
if(dir)
usr << "If a direction, direction is: [dir]"
var/list/class_input = list("text","num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
if(src.holder)
var/datum/marked_datum = holder.marked_datum()
if(marked_datum)
class_input += "marked datum ([marked_datum.type])"
class = input("What kind of variable?","Variable Type",default) as null|anything in class_input
if(src.holder && src.holder.marked_datum)
class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default","marked datum ([holder.marked_datum.type])")
else
class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
"num","type","reference","mob reference", "icon","file","list","edit referenced object","restore to default")
if(!class)
return
@@ -525,8 +518,7 @@ var/list/VVckey_edit = list("key", "ckey")
else
original_name = O:name
var/datum/marked_datum = holder.marked_datum()
if(marked_datum && class == "marked datum ([marked_datum.type])")
if(holder.marked_datum && class == "marked datum ([holder.marked_datum.type])")
class = "marked datum"
switch(class)
@@ -592,7 +584,7 @@ var/list/VVckey_edit = list("key", "ckey")
O.vars[variable] = var_new
if("marked datum")
O.vars[variable] = holder.marked_datum()
O.vars[variable] = holder.marked_datum
world.log << "### VarEdit by [src]: [O.type] [variable]=[html_encode("[O.vars[variable]]")]"
log_admin("[key_name(src)] modified [original_name]'s [variable] to [O.vars[variable]]")

7
code/modules/admin/view_variables/topic.dm
View File

@@ -223,7 +223,7 @@
usr << "This can only be done to instances of type /datum"
return
src.holder.marked_datum_weak = weakref(D)
src.holder.marked_datum = D
href_list["datumrefresh"] = href_list["mark_object"]
else if(href_list["rotatedatum"])
@@ -476,10 +476,7 @@
usr << "This can only be done on mobs with clients"
return
nanomanager.close_uis(H)
H.client.cache.Cut()
var/datum/asset/assets = get_asset_datum(/datum/asset/nanoui)
assets.send(H)
nanomanager.send_resources(H.client)
usr << "Resource files sent"
H << "Your NanoUI Resource files have been refreshed"

2
code/modules/admin/view_variables/view_variables.dm
View File

@@ -45,7 +45,7 @@
</tr></table>
<div align='center'>
<b><font size='1'>[replacetext("[D.type]", "/", "/<wbr>")]</font></b>
[holder.marked_datum() == D ? "<br/><font size='1' color='red'><b>Marked Object</b></font>" : ""]
[holder.marked_datum == D ? "<br/><font size='1' color='red'><b>Marked Object</b></font>" : ""]
</div>
</td>
<td width='50%'>