https://github.com/tgstation/tgstation/pull/52255

2020-07-16 20:05:37 +08:00
parent e21d0b7a53
commit 2afab07b4a
22 changed files with 53 additions and 54 deletions
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -224,7 +224,7 @@
 	. = ..()
 	if(.)
 		switch(var_name)
-			if("assignment","registered_name")
+			if(NAMEOF(src, assignment),NAMEOF(src, registered_name)) //,NAMEOF(src, registered_age))
 				update_label()

 /obj/item/card/id/attack_self(mob/user)
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -37,13 +37,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()