cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 00:55:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

more istype fixes

Browse Source
This commit is contained in:
MrStonedOne
2016-09-08 22:08:20 -07:00
parent 0bf4641f50
commit 7cc19cb5ef
3 changed files with 15 additions and 18 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
+8 -8
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
@@ -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