replaces atom.initialized with ATOM_INITIALIZED

refactors atom/var/flags to atom_flags and area_flags moves NOBLOODY, NOBLUDGEON, and PHORONGUARD to item_flags instead of atom_flags corrects various misapplied flags
2026-08-29 08:09:34 +01:00 · 2022-10-18 09:36:36 +01:00
parent 650ee09942
commit 3abdbbaa1c
150 changed files with 414 additions and 431 deletions
@@ -7,7 +7,7 @@
 	item_state = "rcd"
 	drop_sound = 'sound/items/drop/gun.ogg'
 	pickup_sound = 'sound/items/pickup/gun.ogg'
-	flags = NOBLUDGEON
+	item_flags = NOBLUDGEON
 	force = 10
 	throwforce = 10
 	throw_speed = 1
@@ -16,8 +16,8 @@
 	item_icons = list(
 		slot_l_hand_str = 'icons/mob/items/lefthand.dmi',
 		slot_r_hand_str = 'icons/mob/items/righthand.dmi',
-	)	
-	flags = NOBLUDGEON
+	)
+	item_flags = NOBLUDGEON
 	force = 10
 	throwforce = 10
 	throw_speed = 1
@@ -183,7 +183,7 @@
 			activate()
 			animate_deletion(A)
 		return
-	
+
 	if((mode & PAINT_MODE)) //Paint pipes
 		if(istype(A, /obj/machinery/atmospherics/pipe))
 			var/obj/machinery/atmospherics/pipe/P = A
@@ -291,4 +291,4 @@
 #undef BUILD_MODE
 #undef WRENCH_MODE
 #undef DESTROY_MODE
-#undef PAINT_MODE
+#undef PAINT_MODE
@@ -27,7 +27,7 @@

 /obj/item/clothing/mask/chewable/Initialize()
 	. = ..()
-	flags |= NOREACT // so it doesn't react until you light it
+	atom_flags |= NOREACT // so it doesn't react until you light it
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
 	for(var/R in filling)
 		reagents.add_reagent(R, filling[R])
@@ -262,4 +262,4 @@
 	if(chewtime < 1)
 		if(ismob(loc))
 			to_chat(loc, SPAN_NOTICE("There's no more of \the [name] left!"))
-		spitout(0)
+		spitout(0)
@@ -105,7 +105,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM

 /obj/item/clothing/mask/smokable/Initialize()
 	. = ..()
-	flags |= NOREACT // so it doesn't react until you light it
+	atom_flags |= NOREACT // so it doesn't react until you light it
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
 	if(smoketime && !max_smoketime)
 		max_smoketime = smoketime
@@ -118,7 +118,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(ishuman(loc))
 			var/mob/living/carbon/human/C = loc
 			if (src == C.wear_mask && C.check_has_mouth()) // if it's in the human/monkey mouth, transfer reagents to the mob
-				reagents.trans_to_mob(C, amount, CHEM_INGEST, 1.5) // I don't predict significant balance issues by letting blunts actually WORK. 
+				reagents.trans_to_mob(C, amount, CHEM_INGEST, 1.5) // I don't predict significant balance issues by letting blunts actually WORK.
 		else // else just remove some of the reagents
 			reagents.remove_any(REM)

@@ -183,7 +183,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			e.start()
 			qdel(src)
 			return
-		flags &= ~NOREACT // allowing reagents to react after being lit
+		atom_flags &= ~NOREACT // allowing reagents to react after being lit
 		reagents.handle_reactions()
 		var/turf/T = get_turf(src)
 		T.visible_message(flavor_text)
@@ -705,4 +705,4 @@ CIGARETTE PACKETS ARE IN FANCY.DM

 /obj/item/flame/lighter/zippo/rainbow
 	name = "\improper rainbow Zippo lighter"
-	icon_state = "rainbowzippo"
+	icon_state = "rainbowzippo"
@@ -153,7 +153,7 @@
 	icon_state = "ecartridge"
 	matter = list("metal" = 50, "glass" = 10)
 	volume = 20
-	flags = OPENCONTAINER
+	atom_flags = OPENCONTAINER

 /obj/item/reagent_containers/ecig_cartridge/Initialize()
 	. = ..()
@@ -5,7 +5,7 @@
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "plastic-explosive0"
 	item_state = "plasticx"
-	flags = NOBLUDGEON
+	item_flags = NOBLUDGEON
 	w_class = ITEMSIZE_SMALL
 	origin_tech = list(TECH_ILLEGAL = 2)
 	var/datum/wires/explosive/c4/wires = null
@@ -81,7 +81,7 @@
 		target = get_atom_on_turf(src)
 	if(!target)
 		target = src
-	
+
 	var/turf/T = get_turf(target)
 	if (!T && length(location))
 		T = locate(location[1], location[2], location[3])
@@ -126,4 +126,4 @@
 				blast_flash = blast_light + round(new_blast_power * 0.75)
 			else
 				to_chat(user, "<span class='notice'>The [I] is not any better than the component already installed into this charge!</span>")
-	return .
+	return .
@@ -44,7 +44,7 @@
 				matter[material_type] *= force_divisor // May require a new var instead.

 	if(!(material.conductive))
-		src.flags |= NOCONDUCT
+		atom_flags |= NOCONDUCT

 /obj/item/material/get_material()
 	return material
@@ -7,7 +7,8 @@
 	sharp = 0
 	edge = 0
 	armor_penetration = 50
-	flags = NOCONDUCT | NOBLOODY
+	atom_flags = NOCONDUCT
+	item_flags = NOBLOODY
 	var/lrange = 2
 	var/lpower = 2
 	var/lcolor = "#0099FF"
@@ -267,7 +268,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEMSIZE_SMALL
-	flags = NOBLOODY
+	item_flags = NOBLOODY
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	sharp = 1
 	edge = 1
@@ -354,7 +355,7 @@
 	sharp = 1
 	edge = 1
 	armor_penetration = 0
-	flags = NOBLOODY
+	item_flags = NOBLOODY
 	lrange = 2
 	lpower = 2
 	lcolor = "#0000FF"
@@ -427,7 +428,7 @@
 	throw_speed = 1
 	throw_range = 1
 	w_class = ITEMSIZE_LARGE//So you can't hide it in your pocket or some such.
-	flags = NOBLOODY
+	item_flags = NOBLOODY
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	var/mob/living/creator
 	var/datum/effect_system/spark_spread/spark_system
@@ -10,7 +10,7 @@ GLOBAL_LIST_BOILERPLATE(all_mops, /obj/item/mop)
 	throw_speed = 5
 	throw_range = 10
 	w_class = ITEMSIZE_NORMAL
-	flags = NOCONDUCT
+	atom_flags = NOCONDUCT
 	attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
 	var/mopping = 0
 	var/mopcount = 0
@@ -15,7 +15,7 @@ var/global/list/cached_icons = list()
 	possible_transfer_amounts = list(10,20,30,60)
 	volume = 60
 	unacidable = 0
-	flags = OPENCONTAINER
+	atom_flags = OPENCONTAINER
 	var/paint_type = "red"

 /obj/item/reagent_containers/glass/paint/afterattack(turf/simulated/target, mob/user, proximity)
@@ -67,4 +67,3 @@ var/global/list/cached_icons = list()
 /obj/item/reagent_containers/glass/paint/white
 	icon_state = "paint_white"
 	paint_type = "white"
-
@@ -118,7 +118,7 @@
 	icon_state = "eshield"
 	item_state = "eshield"
 	slot_flags = SLOT_EARS
-	flags = NOCONDUCT
+	atom_flags = NOCONDUCT
 	force = 3.0
 	throwforce = 5.0
 	throw_speed = 1
@@ -219,9 +219,9 @@

 /obj/item/storage/fancy/cigarettes/Initialize()
 	. = ..()
-	flags |= NOREACT
+	atom_flags |= NOREACT
 	create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
-	flags |= OPENCONTAINER
+	atom_flags |= OPENCONTAINER
 	if(brand)
 		for(var/obj/item/clothing/mask/smokable/cigarette/C in src)
 			C.brand = brand
@@ -333,7 +333,7 @@

 /obj/item/storage/fancy/cigar/Initialize()
 	. = ..()
-	flags |= NOREACT
+	atom_flags |= NOREACT
 	create_reagents(15 * storage_slots)

 /obj/item/storage/fancy/cigar/update_icon()
@@ -9,7 +9,7 @@
 	sharp = 0
 	edge = 0
 	throwforce = 7
-	flags = NOCONDUCT
+	atom_flags = NOCONDUCT
 	w_class = ITEMSIZE_NORMAL
 	drop_sound = 'sound/items/drop/metalweapon.ogg'
 	pickup_sound = 'sound/items/pickup/metalweapon.ogg'
@@ -264,4 +264,4 @@

 // Borg version, for the lost module.
 /obj/item/melee/baton/shocker/robot
-	use_external_power = TRUE
+	use_external_power = TRUE
@@ -16,7 +16,7 @@
 	for (var/obj/item/grab/G in H.grabbed_by)
 		if (G.loc == user && G.state >= GRAB_AGGRESSIVE)
 			return TRUE
-			
+
 	return FALSE

 /obj/item/tape_roll/attack(var/mob/living/carbon/human/H, var/mob/user)
@@ -116,15 +116,13 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "tape"
 	w_class = ITEMSIZE_TINY
+	item_flags = NOBLUDGEON
 	plane = MOB_PLANE
 	anchored = FALSE
 	drop_sound = null

 	var/obj/item/stuck = null

-/obj/item/ducttape/Initialize()
-	. = ..()
-	flags |= NOBLUDGEON

 /obj/item/ducttape/examine(mob/user)
 	return stuck.examine(user)
@@ -237,7 +237,7 @@
 	if(!istype(W))
 		return

-	if((W.flags & NOCONDUCT) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND)))
+	if((W.atom_flags & NOCONDUCT) || !shock(user, 70, pick(BP_L_HAND, BP_R_HAND)))
 		user.setClickCooldown(user.get_attack_speed(W))
 		user.do_attack_animation(src)
 		playsound(src, 'sound/effects/grillehit.ogg', 40, 1)