cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into many_hands_make_light_work

Browse Source
This commit is contained in:
Remie Richards
2016-09-10 20:28:23 +01:00
parent f145a05f49 424be04026
commit c50fa5729c
216 changed files with 4331 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/massmodvar.dm
+4 -4
View File
@@ -83,6 +83,10 @@
var_value = "\icon[var_value]"
default = "icon"
else if(istype(var_value,/client))
usr << "Variable appears to be <b>CLIENT</b>."
default = "cancel"
else if(istype(var_value,/atom) || istype(var_value,/datum))
usr << "Variable appears to be <b>TYPE</b>."
default = "type"
@@ -91,10 +95,6 @@
usr << "Variable appears to be <b>LIST</b>."
default = "list"
else if(istype(var_value,/client))
usr << "Variable appears to be <b>CLIENT</b>."
default = "cancel"
else
usr << "Variable appears to be <b>FILE</b>."
default = "file"
code/modules/admin/verbs/modifyvariables.dm
+16 -16
View File
@@ -77,7 +77,7 @@ var/list/VVckey_edit = list("key", "ckey")
var_value = new type()
if("new datum")
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf))
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf,/client))
var_value = new type()
if(!var_value) return
@@ -142,7 +142,7 @@ var/list/VVckey_edit = list("key", "ckey")
var_value = new type()
if("new datum")
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf))
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf,/client))
var_value = new type()
if(!var_value) return
@@ -243,6 +243,10 @@ var/list/VVckey_edit = list("key", "ckey")
variable = "\icon[variable]"
default = "icon"
else if(istype(variable,/client))
usr << "Variable appears to be <b>CLIENT</b>."
default = "cancel"
else if(istype(variable,/atom) || istype(variable,/datum))
usr << "Variable appears to be <b>TYPE</b>."
default = "type"
@@ -251,10 +255,6 @@ var/list/VVckey_edit = list("key", "ckey")
usr << "Variable appears to be <b>LIST</b>."
default = "list"
else if(istype(variable,/client))
usr << "Variable appears to be <b>CLIENT</b>."
default = "cancel"
else
usr << "Variable appears to be <b>FILE</b>."
default = "file"
@@ -401,7 +401,7 @@ var/list/VVckey_edit = list("key", "ckey")
L[L.Find(variable)] = new_var
if("new datum")
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf))
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf,/client))
new_var = new type()
if(assoc)
L[assoc_key] = new_var
@@ -471,6 +471,10 @@ var/list/VVckey_edit = list("key", "ckey")
var_value = "\icon[var_value]"
class = "icon"
else if(istype(var_value,/client))
usr << "Variable appears to be <b>CLIENT</b>."
class = "cancel"
else if(istype(var_value,/atom) || istype(var_value,/datum))
usr << "Variable appears to be <b>TYPE</b>."
class = "type"
@@ -479,10 +483,6 @@ var/list/VVckey_edit = list("key", "ckey")
usr << "Variable appears to be <b>LIST</b>."
class = "list"
else if(istype(var_value,/client))
usr << "Variable appears to be <b>CLIENT</b>."
class = "cancel"
else
usr << "Variable appears to be <b>FILE</b>."
class = "file"
@@ -535,6 +535,10 @@ var/list/VVckey_edit = list("key", "ckey")
var_value = "\icon[var_value]"
default = "icon"
else if(istype(var_value,/client))
usr << "Variable appears to be <b>CLIENT</b>."
default = "cancel"
else if(istype(var_value,/atom) || istype(var_value,/datum))
usr << "Variable appears to be <b>TYPE</b>."
default = "type"
@@ -543,10 +547,6 @@ var/list/VVckey_edit = list("key", "ckey")
usr << "Variable appears to be <b>LIST</b>."
default = "list"
else if(istype(var_value,/client))
usr << "Variable appears to be <b>CLIENT</b>."
default = "cancel"
else
usr << "Variable appears to be <b>FILE</b>."
default = "file"
@@ -685,7 +685,7 @@ var/list/VVckey_edit = list("key", "ckey")
O.vars[variable] = var_new
if("new datum")
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf))
var/type = input("Enter type:","Type") as null|anything in (typesof(/datum)-typesof(/obj,/mob,/area,/turf,/client))
var/var_new = new type()
if(var_new==null) return
O.vars[variable] = var_new
code/modules/admin/verbs/randomverbs.dm
+16
View File
@@ -1137,3 +1137,19 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
H.regenerate_icons()
#undef ON_PURRBATION
/client/proc/modify_goals()
set category = "Debug"
set name = "Modify station goals"
if(!check_rights(R_ADMIN))
return
holder.modify_goals()
/datum/admins/proc/modify_goals()
var/dat = ""
for(var/datum/station_goal/S in ticker.mode.station_goals)
dat += "[S.name] - <a href='?src=\ref[S];announce=1'>Announce</a> | <a href='?src=\ref[S];remove=1'>Remove</a><br>"
dat += "<br><a href='?src=\ref[src];add_station_goal=1'>Add New Goal</a>"
usr << browse(dat, "window=goals;size=400x400")