Merge branch 'master' of https://github.com/goonstation/goonstation

amylizzle · Oct 18, 2023 · c891c48 · c891c48
2 parents e831563 + 215f3e1
commit c891c48
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/code/modules/events/radiation.dm b/code/modules/events/radiation.dm
@@ -70,7 +70,6 @@
 				animate_flash_color_fill_inherit(T,"#FFDD00",1,5)
 				return
 		animate_flash_color_fill_inherit(T,"#00FF00",1,5)
-		T.AddComponent(/datum/component/radioactive, 40, TRUE, FALSE, 1)
 		for (var/mob/living/carbon/M in T.contents)
 			M.take_radiation_dose(rad_strength)
 			if (prob(mutate_prob) && M.bioHolder)
@@ -102,6 +101,7 @@
 		sleep(lifespan)
 		playsound(src,pulse_sound,50,TRUE)
 		irradiate_turf(get_turf(src))
+		shoot_projectile_ST_pixel_spread(get_turf(src), new/datum/projectile/neutron{shot_number = 10}(10), get_step_rand(get_turf(src)), spread_angle = 360)
 		for (var/turf/T in circular_range(src,pulse_range))
 			irradiate_turf(T)
 		SPAWN(0)
@@ -123,7 +123,7 @@
 				animate_flash_color_fill_inherit(T,"#FFDD00",1,5)
 				return
 		animate_flash_color_fill_inherit(T,"#0084ff",1,5)
-		T.AddComponent(/datum/component/radioactive, 40, TRUE, TRUE, 1)
+		T.AddComponent(/datum/component/radioactive, 25, TRUE, FALSE, 1)
 		for (var/mob/A in T.contents)
 			A.take_radiation_dose(rad_strength)
 			if(iscarbon(A))

diff --git a/code/obj/item.dm b/code/obj/item.dm
@@ -606,28 +606,29 @@ ABSTRACT_TYPE(/obj/item)
 	var/added = 0
 	var/imrobot
 	var/imdrone
+	var/obj/item/stacker
+	var/obj/item/stackee
 	if(QDELETED(other))
 		return added
+
 	if((imrobot = isrobot(other.loc)) || (imdrone = isghostdrone(other.loc)) || istype(other.loc, /obj/item/magtractor))
 		if (imrobot)
 			max_stack = 300
 		else if (imdrone)
 			max_stack = 1000
-		if (other != src && check_valid_stack(src))
-			if (src.amount + other.amount > max_stack)
-				added = max_stack - other.amount
-			else
-				added = src.amount
-			src.change_stack_amount(-added)
-			other.change_stack_amount(added)
+		stacker = other
+		stackee = src
 	else
-		if (other != src && check_valid_stack(other))
-			if (src.amount + other.amount > max_stack)
-				added = max_stack - src.amount
-			else
-				added = other.amount
-			src.change_stack_amount(added)
-			other.change_stack_amount(-added)
+		stacker = src
+		stackee = other
+
+	if (stacker == stackee || !check_valid_stack(stackee))
+		return added
+
+	added = clamp(stackee.amount, 0, max_stack - stacker.amount)
+
+	stacker.change_stack_amount(added)
+	stackee.change_stack_amount(-added)
 
 	return added