Fixes conflict in autolathe_designs.dm

2026-08-29 06:57:42 +01:00 · 2017-04-08 01:52:27 +01:00
parent 16688d7494 7844256143
commit c4bebd889d
352 changed files with 6288 additions and 5046 deletions
@@ -59,8 +59,7 @@ RCD
 	return

 /obj/item/weapon/rcd/Destroy()
-	qdel(spark_system)
-	spark_system = null
+	QDEL_NULL(spark_system)
 	rcd_list -= src
 	return ..()

@@ -62,9 +62,7 @@
 		to_chat(user, "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>")

 /obj/item/weapon/twohanded/rcl/Destroy()
-	if(loaded)
-		qdel(loaded)
-		loaded = null
+	QDEL_NULL(loaded)
 	last = null
 	active = 0
 	return ..()
@@ -12,6 +12,7 @@
 	burn_state = FLAMMABLE
 	singular_name = "credit"
 	max_amount = 1000000
+	merge_type = /obj/item/stack/spacecash

 /obj/item/stack/spacecash/New(loc, amt = null)
 	..()
@@ -46,8 +46,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	reagents.set_reacting(FALSE) // so it doesn't react until you light it

 /obj/item/clothing/mask/cigarette/Destroy()
-	if(reagents)
-		qdel(reagents)
+	QDEL_NULL(reagents)
 	processing_objects -= src
 	return ..()

@@ -94,6 +93,17 @@ LIGHTERS ARE IN LIGHTERS.DM
 	else if(istype(W, /obj/item/device/assembly/igniter))
 		light("<span class='notice'>[user] fiddles with [W], and manages to light their [name].</span>")

+	else if(istype(W, /obj/item/weapon/gun/magic/wand/fireball))
+		var/obj/item/weapon/gun/magic/wand/fireball/F = W
+		if(F.charges)
+			if(prob(50) || user.mind.assigned_role == "Wizard")
+				light("<span class='notice'>Holy shit, did [user] just manage to light their [name] with [W], with only moderate eyebrow singing?</span>")
+			else
+				to_chat(user, "<span class='warning'>Unsure which end of the wand is which, [user] fails to light [name] with [W].</span>")
+				explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+			F.charges--
+
+
 	//can't think of any other way to update the overlays :<
 	user.update_inv_wear_mask()
 	user.update_inv_l_hand()
@@ -172,12 +172,8 @@
 	if(on)
 		var/M = get(paddles, /mob)
 		remove_paddles(M)
-	if(paddles)
-		qdel(paddles)
-		paddles = null
-	if(bcell)
-		qdel(bcell)
-		bcell = null
+	QDEL_NULL(paddles)
+	QDEL_NULL(bcell)
 	return ..()

 /obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt)
@@ -5,7 +5,7 @@
 	icon_state = "dnainjector"
 	item_state = "dnainjector"
 	var/block = 0
-	var/datum/dna2/record/buf=null
+	var/datum/dna2/record/buf = null
 	throw_speed = 3
 	throw_range = 5
 	w_class = 1
@@ -26,6 +26,10 @@
 		buf.dna.ResetSE()
 		SetValue(value)

+/obj/item/weapon/dnainjector/Destroy()
+	QDEL_NULL(buf)
+	return ..()
+
 /obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock)
 	if(selblock==0)
 		return block
@@ -22,16 +22,22 @@
 		if(src.used)
 			return

+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(H.species.flags & NO_DNA)
+				to_chat(user, "<span class='warning'>You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.</span>")
+				return
+
 		if(M == user)
-			user.visible_message("<span class='danger'>[user.name] injects \himself with [src]!</span>")
+			user.visible_message("<span class='danger'>[user] injects \himself with [src]!</span>")
 			src.injected(user,user)
 		else
-			user.visible_message("<span class='danger'>[user.name] is trying to inject [M.name] with [src]!</span>")
+			user.visible_message("<span class='danger'>[user] is trying to inject [M] with [src]!</span>")
 			if(do_mob(user,M,30))
-				user.visible_message("<span class='danger'>[user.name] injects [M.name] with [src].</span>")
+				user.visible_message("<span class='danger'>[user] injects [M] with [src].</span>")
 				src.injected(M, user)
 			else
-				to_chat(user, "\red You failed to inject [M.name].")
+				to_chat(user, "<span class='warning'>You failed to inject [M].</span>")

 	proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user)
 		scramble(1, target, 100)
@@ -18,10 +18,9 @@
 	..()

 /obj/item/weapon/grenade/plastic/Destroy()
-	qdel(nadeassembly)
-	nadeassembly = null
+	QDEL_NULL(nadeassembly)
 	target = null
-	..()
+	return ..()

 /obj/item/weapon/grenade/plastic/attackby(obj/item/I, mob/user, params)
 	if(!nadeassembly && istype(I, /obj/item/device/assembly_holder))
@@ -25,15 +25,10 @@


 /obj/item/weapon/flamethrower/Destroy()
-	if(weldtool)
-		qdel(weldtool)
-		weldtool = null
-	if(igniter)
-		qdel(igniter)
-		igniter = null
-	if(ptank)
-		qdel(ptank)
-		ptank = null
+	QDEL_NULL(weldtool)
+	QDEL_NULL(igniter)
+	QDEL_NULL(ptank)
+	previousturf = null
 	return ..()


@@ -13,6 +13,10 @@
 	var/improvised = 0
 	var/garrote_time

+/obj/item/weapon/twohanded/garrote/Destroy()
+	strangling = null
+	return ..()
+
 /obj/item/weapon/twohanded/garrote/update_icon()
 	if(strangling) // If we're strangling someone we want our icon to stay wielded
 		icon_state = "garrot_unwrap"
@@ -26,6 +26,12 @@
 		payload_name += " " // formatting, ignore me
 	update_icon()

+/obj/item/weapon/grenade/chem_grenade/Destroy()
+	QDEL_NULL(nadeassembly)
+	for(var/thing in beakers)
+		qdel(thing)
+	beakers.Cut()
+	return ..()

 /obj/item/weapon/grenade/chem_grenade/examine(mob/user)
 	..(user)
@@ -12,7 +12,7 @@
 	for(var/mob/living/M in hearers(7, flashbang_turf))
 		bang(get_turf(M), M)

-	for(var/obj/effect/blob/B in hear(8,flashbang_turf))     		//Blob damage here
+	for(var/obj/structure/blob/B in hear(8,flashbang_turf))     		//Blob damage here
 		var/damage = round(30/(get_dist(B,get_turf(src))+1))
 		B.health -= damage
 		B.update_icon()
@@ -30,7 +30,7 @@
 			sleep(10)
 			src.smoke.start()

-		for(var/obj/effect/blob/B in view(8,src))
+		for(var/obj/structure/blob/B in view(8,src))
 			var/damage = round(30/(get_dist(B,src)+1))
 			B.health -= damage
 			B.update_icon()
@@ -13,6 +13,12 @@
 	var/list/signs = list()
 	var/max_signs = 20

+/obj/item/weapon/holosign_creator/Destroy()
+	for(var/sign in signs)
+		qdel(sign)
+	signs.Cut()
+	return ..()
+
 /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
 	if(flag)
 		var/turf/T = get_turf(target)
@@ -27,12 +27,8 @@
 	icon_state = "[initial(icon_state)][armed]"

 /obj/item/weapon/restraints/legcuffs/beartrap/Destroy()
-	if(IED)
-		qdel(IED)
-		IED = null
-	if(sig)
-		qdel(sig)
-		sig = null
+	QDEL_NULL(IED)
+	QDEL_NULL(sig)
 	return ..()

 /obj/item/weapon/restraints/legcuffs/beartrap/suicide_act(mob/user)
@@ -18,6 +18,7 @@
 	var/mopspeed = 30

 /obj/item/weapon/mop/New()
+	..()
 	create_reagents(mopcap)
 	janitorial_equipment += src

@@ -17,9 +17,7 @@
 	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws

 /obj/item/weapon/pneumatic_cannon/Destroy()
-	if(tank)
-		qdel(tank)
-		tank = null
+	QDEL_NULL(tank)
 	for(var/obj/item/I in loadedItems)
 		qdel(I)
 	loadedItems.Cut()
@@ -17,9 +17,7 @@


 /obj/item/weapon/melee/powerfist/Destroy()
-	if(tank)
-		qdel(tank)
-		tank = null
+	QDEL_NULL(tank)
 	return ..()

 /obj/item/weapon/melee/powerfist/examine(mob/user)
@@ -423,11 +423,15 @@
 	desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station."
 	icon_state = "id"

-/obj/item/weapon/storage/box/permits/New() //There's only a few, so blueprints are still useful beyond setting every room's name to PRIMARY FART STORAGE
+/obj/item/weapon/storage/box/permits/New()
 	..()
 	new /obj/item/areaeditor/permit(src)
 	new /obj/item/areaeditor/permit(src)
 	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)


 /obj/item/weapon/storage/box/ids
@@ -186,7 +186,7 @@


 /obj/item/weapon/storage/fancy/cigarettes/Destroy()
-	qdel(reagents)
+	QDEL_NULL(reagents)
 	return ..()


@@ -454,8 +454,8 @@
 	for(var/obj/O in contents)
 		O.mouse_opacity = initial(O.mouse_opacity)

-	qdel(boxes)
-	qdel(closer)
+	QDEL_NULL(boxes)
+	QDEL_NULL(closer)
 	return ..()

 /obj/item/weapon/storage/emp_act(severity)
@@ -24,9 +24,7 @@
 	return

 /obj/item/weapon/melee/baton/Destroy()
-	if(bcell)
-		qdel(bcell)
-		bcell = null
+	QDEL_NULL(bcell)
 	return ..()

 /obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
@@ -201,11 +199,15 @@
 	stunforce = 5
 	hitcost = 3750
 	slot_flags = SLOT_BACK
-	var/obj/item/device/assembly/igniter/sparkler = 0
+	var/obj/item/device/assembly/igniter/sparkler = null

 /obj/item/weapon/melee/baton/cattleprod/New()
 	..()
-	sparkler = new (src)
+	sparkler = new(src)
+
+/obj/item/weapon/melee/baton/cattleprod/Destroy()
+	QDEL_NULL(sparkler)
+	return ..()

 /obj/item/weapon/melee/baton/cattleprod/baton_stun()
 	if(sparkler.activate())
@@ -19,8 +19,7 @@
 	ion_trail.set_up(src)

 /obj/item/weapon/tank/jetpack/Destroy()
-	qdel(ion_trail)
-	ion_trail = null
+	QDEL_NULL(ion_trail)
 	return ..()

 /obj/item/weapon/tank/jetpack/ui_action_click(mob/user, actiontype)
@@ -82,7 +81,7 @@

 	var/datum/gas_mixture/removed = air_contents.remove(num)
 	if(removed.total_moles() < 0.005)
-		turn_off()
+		turn_off()
 		return 0

 	var/turf/T = get_turf(user)
@@ -33,9 +33,7 @@
 	return

 /obj/item/weapon/tank/Destroy()
-	if(air_contents)
-		qdel(air_contents)
-		air_contents = null
+	QDEL_NULL(air_contents)

 	processing_objects.Remove(src)

@@ -301,7 +301,7 @@
 		if(!Adj|| !istype(target, /turf))
 			return
 		if(metal_synthesis_cooldown < 5)
-			var/obj/effect/effect/foam/F = new /obj/effect/effect/foam(get_turf(target), 1)
+			var/obj/structure/foam/F = new /obj/structure/foam(get_turf(target), 1)
 			F.amount = 0
 			metal_synthesis_cooldown++
 			spawn(100)