Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45

code/modules/events/immovable_rod.dm

@@ -100,6 +100,9 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 /obj/effect/immovablerod/ex_act(severity, target)
 	return 0
 
+/obj/structure/closet/supplypod/prevent_content_explosion()
+	return TRUE
+
 /obj/effect/immovablerod/singularity_act()
 	return
 

code/modules/events/mice_migration.dm

@@ -32,4 +32,4 @@
 				P.update_icon()
 
 /datum/round_event/mice_migration/start()
-	SSsqueak.trigger_migration(rand(minimum_mice, maximum_mice))
+	SSminor_mapping.trigger_migration(rand(minimum_mice, maximum_mice))

code/modules/events/spontaneous_appendicitis.dm

@@ -17,6 +17,8 @@
 			continue
 		if(!H.getorgan(/obj/item/organ/appendix)) //Don't give the disease to some who lacks it, only for it to be auto-cured
 			continue
+		if(!(MOB_ORGANIC in H.mob_biotypes)) //biotype sleeper bugs strike again, once again making appendicitis pick a target that can't take it
+			continue
 		var/foundAlready = FALSE	//don't infect someone that already has appendicitis
 		for(var/datum/disease/appendicitis/A in H.diseases)
 			foundAlready = TRUE

code/modules/events/wizard/curseditems.dm

@@ -50,7 +50,8 @@
 				var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
 				H.dropItemToGround(H.get_item_by_slot(i), TRUE)
 				H.equip_to_slot_or_del(I, i)
-				I.item_flags |= NODROP | DROPDEL
+				ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT)
+				I.item_flags |= DROPDEL
 				I.name = "cursed " + I.name
 
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)