Merge pull request #5277 from MistakeNot4892/port/more_polaris_changes

Various other Polaris/Cynosure changes.

Author: out-of-phaze

code/controllers/evacuation/evacuation.dm

@@ -91,10 +91,8 @@
 				A.readyalert()
 		if(!skip_announce)
 			global.using_map.emergency_shuttle_called_announcement()
-	else
-		if(!skip_announce)
-			priority_announcement.Announce(replacetext(replacetext(global.using_map.shuttle_called_message, "%dock_name%", "[global.using_map.dock_name]"),  "%ETA%", "[round(get_eta()/60)] minute\s"))
-
+	else if(!skip_announce && global.using_map.shuttle_called_message)
+		priority_announcement.Announce(replacetext(replacetext(global.using_map.shuttle_called_message, "%dock_name%", "[global.using_map.dock_name]"),  "%ETA%", "[round(get_eta()/60)] minute\s"))
 	return 1
 
 /datum/evacuation_controller/proc/cancel_evacuation()
@@ -113,12 +111,13 @@
 	auto_recall_time =  null
 
 	if(emergency_evacuation)
-		evac_recalled.Announce(global.using_map.emergency_shuttle_recall_message)
+		if(global.using_map.emergency_shuttle_recall_message)
+			evac_recalled.Announce(global.using_map.emergency_shuttle_recall_message)
 		for(var/area/A in global.areas)
 			if(istype(A) && (A.area_flags & AREA_FLAG_HALLWAY))
 				A.readyreset()
 		emergency_evacuation = 0
-	else
+	else if(global.using_map.emergency_shuttle_recall_message)
 		priority_announcement.Announce(global.using_map.shuttle_recall_message)
 
 	return 1

code/datums/supplypacks/science.dm

@@ -43,7 +43,7 @@
 					/obj/item/clothing/gloves/thick,
 					/obj/item/clothing/shoes/color/black,
 					/obj/item/scanner/gas,
-					/obj/item/ore,
+					/obj/item/ore_satchel,
 					/obj/item/flashlight/lantern,
 					/obj/item/tool/shovel,
 					/obj/item/tool/pickaxe,

code/datums/trading/traders/ai.dm

@@ -49,8 +49,8 @@ They sell generic supplies and ask for generic supplies.
 		/obj/item/box/fancy                        = TRADER_SUBTYPES_ONLY,
 		/obj/item/laundry_basket                   = TRADER_THIS_TYPE,
 		/obj/item/secure_storage/briefcase         = TRADER_THIS_TYPE,
-		/obj/item/plants                           = TRADER_THIS_TYPE,
-		/obj/item/ore                              = TRADER_THIS_TYPE,
+		/obj/item/plant_satchel                    = TRADER_THIS_TYPE,
+		/obj/item/ore_satchel                      = TRADER_THIS_TYPE,
 		/obj/item/toolbox                          = TRADER_ALL,
 		/obj/item/wallet                           = TRADER_THIS_TYPE,
 		/obj/item/photo_album                      = TRADER_THIS_TYPE,

code/game/area/area_access.dm

@@ -1,6 +1,7 @@
 /area
 	var/list/req_access = list()
 	var/secure = FALSE    // unsecure areas will have doors between them use access diff; secure ones use union.
+	var/override_unlock = FALSE // TRUE will override area and will be always unlocked. This is e.g. for restrooms inside secure areas, surgery observation room etc.
 
 // Given two areas, find the minimal req_access needed such that (return value) + (area access) >= (other area access) and vice versa
 /proc/req_access_diff(area/first, area/second)

code/game/machinery/doors/_door.dm

@@ -574,6 +574,8 @@
 
 	if (!fore && !aft)
 		return list()
+	else if (fore.override_unlock || aft.override_unlock)
+		return list()
 	else if (fore.secure || aft.secure)
 		return req_access_union(fore, aft)
 	else

code/game/machinery/hologram.dm

@@ -58,6 +58,7 @@ var/global/list/holopads = list()
 	var/allow_ai = TRUE
 	var/static/list/reachable_overmaps = list(OVERMAP_ID_SPACE)
 
+	var/static/list/used_holopad_ids = list()
 	var/holopad_id
 
 /obj/machinery/hologram/holopad/Initialize()
@@ -68,7 +69,13 @@ var/global/list/holopads = list()
 	// Null ID means we want to use our area name.
 	if(isnull(holopad_id))
 		var/area/A = get_area(src)
-		holopad_id = A?.proper_name || "Unknown"
+		var/holopad_index = 1
+		var/holopad_base = A?.proper_name || "Unknown"
+		holopad_id = "[holopad_base] #[holopad_index]"
+		while(holopad_id in used_holopad_ids)
+			holopad_index++
+			holopad_id = "[holopad_base] #[holopad_index]"
+	used_holopad_ids |= holopad_id
 
 	// For overmap sites, always tag the sector name so we have a unique discriminator for long range calls.
 	var/obj/effect/overmap/visitable/sector = global.overmap_sectors[z]

code/game/machinery/portable_turret.dm

@@ -95,7 +95,7 @@
 			iconholder = 1
 			eprojectile = /obj/item/projectile/beam
 
-		if(/obj/item/gun/energy/captain)
+		if(/obj/item/gun/energy/retro/captain)
 			iconholder = 1
 
 		if(/obj/item/gun/energy/lasercannon)

code/game/machinery/vending/botany.dm

@@ -13,7 +13,7 @@
 		/obj/item/chems/glass/bottle/robustharvest = 3,
 		/obj/item/plantspray/pests = 20,
 		/obj/item/chems/syringe = 5,
-		/obj/item/plants = 5,
+		/obj/item/plant_satchel = 5,
 		/obj/item/chems/glass/bottle/ammonia = 10
 	)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.

code/game/objects/items/candelabra.dm

@@ -49,3 +49,6 @@
 			if(i > length(candles_storage.candle_offsets))
 				break
 	compile_overlays()
+
+/obj/item/candelabra/infinite/WillContain()
+	return list(/obj/item/flame/candle/infinite = 3)

code/game/objects/items/flame/flame_candle.dm

@@ -17,6 +17,21 @@
 /obj/item/flame/candle/spent
 	_fuel           = 0
 
+/obj/item/flame/candle/infinite/get_fuel()
+	return 10
+
+/obj/item/flame/candle/infinite/has_fuel(amount)
+	return TRUE
+
+/obj/item/flame/candle/infinite/expend_fuel(amount)
+	return TRUE
+
+/obj/item/flame/candle/infinite/red
+	paint_color = COLOR_RED
+
+/obj/item/flame/candle/infinite/white
+	paint_color = COLOR_WHITE
+
 /obj/item/flame/candle/red
 	paint_color = COLOR_RED