[MIRROR] A variety of smaller fixes (#6808)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>

code/datums/supplypacks/vending_refills_vr.dm

@@ -58,11 +58,6 @@
 	name = "Robust Softdrinks Vendor Refill Cartridge"
 	cost = 10
 
-/datum/supply_pack/vending_refills/cola_soft
-	contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/cola_soft)
-	name = "Soft Robustdrinks Vendor Refill Cartridge"
-	cost = 10
-
 /datum/supply_pack/vending_refills/sovietsoda
 	contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda)
 	name = "BODA Vendor Refill Cartridge"
@@ -124,7 +119,6 @@
 					/obj/item/weapon/refill_cartridge/autoname/food/sovietvend,
 					/obj/item/weapon/refill_cartridge/autoname/drink/coffee,
 					/obj/item/weapon/refill_cartridge/autoname/drink/cola,
-					/obj/item/weapon/refill_cartridge/autoname/drink/cola_soft,
 					/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda,
 					/obj/item/weapon/refill_cartridge/autoname/drink/bepis,
 					/obj/item/weapon/refill_cartridge/autoname/cigarette,

code/game/objects/micro_structures.dm

@@ -340,6 +340,8 @@
 				to_chat(usr,"<span class = 'notice'>You begin moving...</span>")
 				if(!do_after(usr, 10 SECONDS, exclusive = TRUE))
 					return
+				if(QDELETED(src))
+					return
 				var/obj/our_choice = choice
 
 				var/list/new_contained_mobs = list()

code/modules/economy/Accounts.dm

@@ -35,7 +35,7 @@
 	T.amount = starting_funds
 	if(!source_db)
 		//set a random date, time and location some time over the past few decades
-		T.date = "[num2text(rand(1,28))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 23[rand(12,19)]"		// VOREStation Edit: lore-compliant dates
+		T.date = "[num2text(rand(1,28))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 23[rand(12,19)]"
 		T.time = "[rand(0,24)]:[rand(11,59)]"
 		T.source_terminal = "NTGalaxyNet Terminal #[rand(111,1111)]"
 

code/modules/economy/vending_refills.dm

@@ -5,10 +5,15 @@
 	icon_state = "rc_generic"
 	item_state = "syringe_kit"
 	var/refill_type
+	var/exact_type = TRUE
 
 /obj/item/weapon/refill_cartridge/proc/can_refill(obj/machinery/vending/V as obj)
-	if(V.type == refill_type)
-		return TRUE
+	if(exact_type)
+		if(V.type == refill_type)
+			return TRUE
+	else
+		if(istype(V, refill_type))
+			return TRUE
 	return FALSE
 
 /obj/item/weapon/refill_cartridge/multitype
@@ -129,9 +134,7 @@
 
 /obj/item/weapon/refill_cartridge/autoname/drink/cola
 	refill_type = /obj/machinery/vending/cola
-
-/obj/item/weapon/refill_cartridge/autoname/drink/cola_soft
-	refill_type = /obj/machinery/vending/cola/soft
+	exact_type = FALSE
 
 /obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda
 	refill_type = /obj/machinery/vending/sovietsoda
@@ -158,4 +161,4 @@
 	refill_type = /obj/machinery/vending/tool
 
 /obj/item/weapon/refill_cartridge/autoname/giftvendor
-	refill_type = /obj/machinery/vending/giftvendor
+	refill_type = /obj/machinery/vending/giftvendor

code/modules/events/gravity.dm

@@ -1,30 +1,62 @@
 /datum/event/gravity
 	announceWhen = 5
 	var/list/zLevels
+	var/list/generators = list()
 
 /datum/event/gravity/setup()
-	endWhen = rand(15, 60)
 	// Setup which levels we will disrupt gravit on.
 	zLevels = using_map.station_levels.Copy()
 	for(var/datum/planet/P in SSplanets.planets)
 		zLevels -= P.expected_z_levels
 
+	for(var/obj/machinery/gravity_generator/main/GG in machines)
+		if((GG.z in zLevels) && GG.on)
+			generators += GG
+
+	if(generators.len)
+		endWhen = rand(5 MINUTES, 20 MINUTES)
+	else
+		endWhen = rand(15, 60)
+
 /datum/event/gravity/announce()
-	command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system \
-	reinitializes. Please stand by while the gravity system reinitializes.", "Gravity Failure")
+	if(generators.len)
+		command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled. \
+										Please wait for the system to reinitialize, or contact your engineering department.", "Gravity Failure")
+	else
+		command_announcement.Announce("Feedback surge detected in mass-distributions systems. Artificial gravity has been disabled whilst the system \
+										reinitializes. Please stand by while the gravity system reinitializes.", "Gravity Failure")
 
 /datum/event/gravity/start()
 	gravity_is_on = 0
-	for(var/area/A in world)
-		if(A.z in zLevels)
-			A.gravitychange(gravity_is_on)
+	if(generators.len)
+		for(var/obj/machinery/gravity_generator/main/GG in generators)
+			if((GG.z in zLevels) && GG.on)
+				GG.breaker = FALSE
+				GG.set_power()
+				GG.charge_count = 10
+	else
+		for(var/area/A in world)
+			if(A.z in zLevels)
+				A.gravitychange(gravity_is_on)
 
 /datum/event/gravity/end()
 	if(!gravity_is_on)
 		gravity_is_on = 1
 
-		for(var/area/A in world)
-			if(A.z in zLevels)
-				A.gravitychange(gravity_is_on)
 
-		command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")
+		var/did_anything = FALSE
+		if(generators.len)
+			for(var/obj/machinery/gravity_generator/main/GG in generators)
+				if(!GG.on)
+					GG.breaker = TRUE
+					GG.set_power()
+					GG.charge_count = 90
+					did_anything = TRUE
+		else
+			for(var/area/A in world)
+				if(A.z in zLevels)
+					A.gravitychange(gravity_is_on)
+					did_anything = TRUE
+
+		if(did_anything)
+			command_announcement.Announce("Gravity generators are again functioning within normal parameters. Sorry for any inconvenience.", "Gravity Restored")

code/modules/mob/transform_procs.dm

@@ -191,8 +191,9 @@
 		var/datum/preferences/B = O.client.prefs
 		for(var/language in B.alternate_languages)
 			O.add_language(language)
-		O.resize(B.size_multiplier, animate = TRUE, ignore_prefs = TRUE)		//VOREStation Addition: add size prefs to borgs
-		O.fuzzy = B.fuzzy								//VOREStation Addition: add size prefs to borgs
+		O.resize(B.size_multiplier, animate = TRUE, ignore_prefs = TRUE)
+		O.fuzzy = B.fuzzy
+		O.custom_speech_bubble = B.custom_speech_bubble
 
 	callHook("borgify", list(O))
 	O.namepick()

code/modules/recycling/sortingmachinery.dm

@@ -236,7 +236,7 @@
 		return
 	if(target.anchored)
 		return
-	if(target in user)
+	if(!isturf(target.loc)) //no wrapping things inside other things, just breaks things, put it on the ground first.
 		return
 	if(user in target) //no wrapping closets that you are inside - it's not physically possible
 		return
@@ -366,7 +366,7 @@
 	switch(action)
 		if("set_tag")
 			var/new_tag = params["tag"]
-			if(!(new_tag in GLOB.tagger_locations))	
+			if(!(new_tag in GLOB.tagger_locations))
 				return FALSE
 			currTag = new_tag
 			. = TRUE