Merge branch 'master' into abandonedcrates

code/game/atoms.dm

@@ -413,7 +413,7 @@ its easier to just keep the beam vertical.
 		return
 	src.germ_level = 0
 	if(istype(blood_DNA, /list))
-		del(blood_DNA)
+		blood_DNA.Cut()
 		return 1
 
 

code/game/machinery/portable_turret.dm

@@ -406,7 +406,6 @@ var/list/turret_icons
 /obj/machinery/porta_turret/ex_act(severity)
 	switch (severity)
 		if (1)
-			del(src)
 			qdel(src)
 		if (2)
 			if (prob(25))
@@ -701,7 +700,7 @@ var/list/turret_icons
 				playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
 				user << "<span class='notice'>You dismantle the turret construction.</span>"
 				new /obj/item/stack/material/steel( loc, 5)
-				qdel(src) // qdel
+				qdel(src)
 				return
 
 		if(1)

code/game/objects/items/devices/flashlight.dm

@@ -132,7 +132,8 @@
 	name = "flare"
 	desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
 	w_class = 2.0
-	brightness_on = 7 // Pretty bright.
+	brightness_on = 8 // Pretty bright.
+	light_power = 3
 	light_color = "#e58775"
 	icon_state = "flare"
 	item_state = "flare"

code/modules/mining/abandonedcrates.dm

@@ -167,7 +167,7 @@
 			user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
 			var/turf/T = get_turf(src.loc)
 			explosion(T, 0, 0, 1, 2)
-			del(src)
+			qdel(src)
 
 /obj/structure/closet/crate/secure/loot/proc/check_input(var/input)
 	if(length(input) != codelen)

code/modules/mob/living/silicon/ai/ai.dm

@@ -842,7 +842,7 @@ var/list/ai_verbs_default = list(
 // Cleaner proc for creating powersupply for an AI.
 /mob/living/silicon/ai/proc/create_powersupply()
 	if(psupply)
-		del(psupply)
+		qdel(psupply)
 	psupply = new/obj/machinery/ai_powersupply(src)
 
 #undef AI_CHECK_WIRELESS

code/modules/power/apc.dm

@@ -1170,7 +1170,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
 
 	switch(severity)
 		if(1.0)
-			//set_broken() //now Del() do what we need
+			//set_broken() //now qdel() do what we need
 			if (cell)
 				cell.ex_act(1.0) // more lags woohoo
 			qdel(src)

html/changelogs/HarpyEagle-flare-tweak.yml

@@ -0,0 +1,18 @@
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+
+author: HarpyEagle
+delete-after: True
+
+changes: 
+  - tweak: "Made flares brighter."