[s] sanity checks vv_edit_var() values (#52255)

cl ShizCalev
fix: Added some sanity checking for varedit values.
/cl
* sanity checks vv_edit_var() values

* this should be an or

* one more fix
This commit is contained in:
ShizCalev
2020-07-16 10:20:41 +12:00
committed by GitHub
parent 6baa3f6acf
commit 254536072e
22 changed files with 51 additions and 61 deletions
+1 -1
View File
@@ -108,7 +108,7 @@
. = ..()
if(.)
switch(var_name)
if("assignment","registered_name","registered_age")
if(NAMEOF(src, assignment),NAMEOF(src, registered_name),NAMEOF(src, registered_age))
update_label()
/obj/item/card/id/attackby(obj/item/W, mob/user, params)
+1 -5
View File
@@ -47,13 +47,9 @@
if("anchored")
setAnchored(vval)
return TRUE
if("obj_flags")
if(NAMEOF(src, obj_flags))
if ((obj_flags & DANGEROUS_POSSESSION) && !(vval & DANGEROUS_POSSESSION))
return FALSE
if("control_object")
var/obj/O = vval
if(istype(O) && (O.obj_flags & DANGEROUS_POSSESSION))
return FALSE
return ..()
/obj/Initialize()