Updating polneb from dev.

code/__defines/armor.dm

@@ -33,6 +33,7 @@
 #define  ARMOR_RAD_MINOR			10
 #define  ARMOR_RAD_SMALL			25
 #define  ARMOR_RAD_RESISTANT		40
+#define  ARMOR_RAD_LARGE			60
 #define  ARMOR_RAD_SHIELDED			100
 
 #define  ARMOR_BOMB_MINOR			10

code/_global_vars/lists/flavor.dm

@@ -118,6 +118,7 @@ GLOBAL_GETTER(cable_colors, /list, SetupCableColors())
 	. = list()
 
 	var/list/valid_cable_coils = typesof(/obj/item/stack/cable_coil) - typesof(
+		/obj/item/stack/cable_coil/five,
 		/obj/item/stack/cable_coil/single,
 		/obj/item/stack/cable_coil/cut,
 		/obj/item/stack/cable_coil/cyborg,

code/_global_vars/sound.dm

@@ -128,4 +128,11 @@ var/global/list/sweeping_sound = list(
 	'sound/foley/sweeping5.ogg',
 	'sound/foley/sweeping6.ogg',
 	'sound/foley/sweeping7.ogg',
-)
+)
+
+var/global/list/ricochet_sound = list(
+	'sound/weapons/guns/ricochet1.ogg',
+	'sound/weapons/guns/ricochet2.ogg',
+	'sound/weapons/guns/ricochet3.ogg',
+	'sound/weapons/guns/ricochet4.ogg'
+)

code/_helpers/type2type.dm

@@ -1,13 +1,20 @@
 /*
  * Holds procs designed to change one type of value, into another.
  * Contains:
- *			text2list & list2text
+ *          alist2list
  *			file2list
  *			angle2dir
  *			angle2text
- *			worldtime2text
  */
 
+// This proc does not support converting numerically indexed alists to assoc lists.
+/proc/alist2list(alist/input)
+	. = list()
+	for(var/k,v in input)
+		if(isnum(k))
+			CRASH("Numeric index passed to alist2list()!")
+		.[k] = v
+
 // Splits the text of a file at seperator and returns them in a list.
 /proc/file2list(filename, seperator = "\n")
 	return splittext(safe_file2text(filename), seperator)

code/_onclick/hud/_defines.dm

@@ -52,7 +52,6 @@
 #define ui_movi "RIGHT-2:24,BOTTOM:5"
 #define ui_attack_selector "RIGHT-2:27,BOTTOM+2:9"
 #define ui_zonesel "RIGHT-1:28,BOTTOM:5"
-#define ui_stamina "RIGHT-2:24,BOTTOM:8"
 
 #define ui_borg_module "RIGHT-1:28,BOTTOM+1:7"
 

code/_onclick/hud/hud_types/_hud.dm

@@ -92,6 +92,9 @@
 	var/action_buttons_hidden = FALSE
 	var/obj/screen/action_button/hide_toggle/hide_actions_toggle
 
+	var/const/HAND_UI_PER_ROW = 4
+	var/const/HAND_UI_INITIAL_Y_OFFSET = 21
+
 	// TODO: declify these.
 	VAR_PROTECTED/gun_mode_toggle_type
 	VAR_PRIVATE/obj/screen/gun/mode/gun_mode_toggle
@@ -351,11 +354,10 @@
 			qdel(inv_box)
 
 	// Rebuild offsets for the hand elements.
-	var/const/elems_per_row = 4
-	var/hand_y_offset = 21
+	var/hand_y_offset = HAND_UI_INITIAL_Y_OFFSET
 	var/list/elements = hud_elements_hands?.Copy()
 	while(length(elements))
-		var/copy_index = min(length(elements), elems_per_row)+1
+		var/copy_index = min(length(elements), HAND_UI_PER_ROW)+1
 		var/list/sublist = elements.Copy(1, copy_index)
 		elements.Cut(1, copy_index)
 		var/hand_x_offset = (world.icon_size/2) * (1 - length(sublist))
@@ -389,6 +391,7 @@
 			if(mymob.client)
 				mymob.client.screen |= swap_elem
 
+	refresh_element(HUD_STAMINA)
 	update_hand_elements()
 
 	return TRUE

code/_onclick/hud/screen/screen_stamina.dm

@@ -1,24 +1,41 @@
 /obj/screen/stamina
 	name              = "stamina"
-	icon              = 'icons/effects/progressbar.dmi'
-	icon_state        = "prog_bar_100"
+	icon              = 'icons/effects/staminabar.dmi'
+	icon_state        = "bar"
 	invisibility      = INVISIBILITY_MAXIMUM
-	screen_loc        = ui_stamina
 	use_supplied_ui_color = FALSE
 	use_supplied_ui_alpha = FALSE
 	use_supplied_ui_icon = FALSE
 	requires_ui_style = FALSE
 	layer = HUD_BASE_LAYER + 0.1 // needs to layer over the movement intent element
+	var/const/STAMINA_STATE_PERIOD = 5
+
+/obj/screen/stamina/Initialize(mapload, mob/_owner, decl/ui_style/ui_style, ui_color, ui_alpha, ui_cat)
+	. = ..()
+	update_icon()
 
 /obj/screen/stamina/on_update_icon()
 	. = ..()
 	var/mob/living/owner = owner_ref?.resolve()
 	if(!istype(owner))
 		set_invisibility(INVISIBILITY_MAXIMUM)
+		return
+
+	var/hand_row_offset = /datum/hud::HAND_UI_INITIAL_Y_OFFSET + (ceil(length(owner.get_held_item_slots()) / /datum/hud::HAND_UI_PER_ROW) * world.icon_size) + 16
+	screen_loc = "CENTER:-32,BOTTOM:[hand_row_offset]"
+
+	var/stamina = owner.get_stamina()
+	cut_overlays()
+	if(stamina < 100)
+		set_invisibility(INVISIBILITY_NONE)
+		var/stamina_amt = floor(stamina/STAMINA_STATE_PERIOD)*STAMINA_STATE_PERIOD
+		var/bar_overlay_state = "bar_[stamina_amt]"
+		if(stamina_amt > 0 && stamina <= 25)
+			bar_overlay_state = "[bar_overlay_state]_fail"
+		var/image/bar_overlay = image(icon = icon, icon_state = bar_overlay_state)
+		bar_overlay.appearance_flags |= RESET_COLOR
+		bar_overlay.color = COLOR_WHITE
+		add_overlay(bar_overlay)
 	else
-		var/stamina = owner.get_stamina()
-		if(stamina < 100)
-			set_invisibility(INVISIBILITY_NONE)
-			icon_state = "prog_bar_[floor(stamina/5)*5][(stamina >= 5) && (stamina <= 25) ? "_fail" : null]"
-		else
-			set_invisibility(INVISIBILITY_MAXIMUM)
+		set_invisibility(INVISIBILITY_MAXIMUM)
+	compile_overlays()

code/controllers/subsystems/initialization/persistence.dm

@@ -38,11 +38,19 @@ SUBSYSTEM_DEF(persistence)
 
 	var/turf/T = get_turf(value)
 	if(!T)
-		return
+		return FALSE
 
-	var/area/A = get_area(T)
-	if(!A || (A.area_flags & AREA_FLAG_IS_NOT_PERSISTENT))
-		return
+	var/decl/persistence_handler/handler = RESOLVE_TO_DECL(track_type)
+	if(!istype(handler))
+		return FALSE
+
+	if(handler.station_restricted && (!T || !(T.z in SSmapping.station_levels) ))
+		return FALSE
+
+	if(handler.area_restricted)
+		var/area/A = get_area(T)
+		if(!A || (A.area_flags & AREA_FLAG_IS_NOT_PERSISTENT))
+			return FALSE
 
 	var/datum/level_data/level = SSmapping.levels_by_z[T.z]
 	if(!istype(level) || !level.permit_persistence)

code/datums/composite_sounds/vehicle_engine.dm

@@ -0,0 +1,7 @@
+/datum/composite_sound/vehicle_engine
+	start_sound = 'sound/machines/vehicle/engine_start.ogg'
+	start_length = 2
+	mid_sounds = list('sound/machines/vehicle/engine_mid.ogg'=1)
+	mid_length = 6
+	end_sound = 'sound/machines/vehicle/engine_end.ogg'
+	play_volume = 20

code/datums/repositories/atom_info.dm

@@ -1,13 +1,14 @@
 var/global/repository/atom_info/atom_info_repository = new()
 
 /repository/atom_info
-	var/list/matter_cache =         list()
+	var/list/matter_cache         = list()
 	var/list/combined_worth_cache = list()
-	var/list/single_worth_cache =   list()
-	var/list/name_cache =           list()
-	var/list/description_cache =    list()
-	var/list/matter_mult_cache =    list()
-	var/list/origin_tech_cache =    list()
+	var/list/single_worth_cache   = list()
+	var/list/name_cache           = list()
+	var/list/description_cache    = list()
+	var/list/matter_mult_cache    = list()
+	var/list/origin_tech_cache    = list()
+	var/list/appearance_cache     = list()
 
 /repository/atom_info/proc/create_key_for(var/_path, var/_mat, var/_amount)
 	. = "[_path]"
@@ -24,7 +25,7 @@ var/global/repository/atom_info/atom_info_repository = new()
 	else
 		. = new _path
 
-/repository/atom_info/proc/update_cached_info_for(var/_path, var/_mat, var/_amount, var/key)
+/repository/atom_info/proc/update_cached_info_for(var/_path, var/_mat, var/_amount, var/key, var/cache_appearance = FALSE)
 	var/atom/instance
 	if(!matter_cache[key])
 		instance = get_instance_of(_path, _mat, _amount)
@@ -41,6 +42,9 @@ var/global/repository/atom_info/atom_info_repository = new()
 	if(!description_cache[key])
 		instance = instance || get_instance_of(_path, _mat, _amount)
 		description_cache[key] = instance.desc
+	if(cache_appearance && !appearance_cache[key])
+		instance = instance || get_instance_of(_path, _mat, _amount)
+		appearance_cache[key] = instance.appearance
 	if(!matter_mult_cache[key] && ispath(_path, /obj))
 		var/obj/obj_instance = instance || get_instance_of(_path, _mat, _amount)
 		matter_mult_cache[key] = obj_instance.get_matter_amount_modifier()
@@ -84,4 +88,10 @@ var/global/repository/atom_info/atom_info_repository = new()
 /repository/atom_info/proc/get_origin_tech_for(var/_path, var/_mat, var/_amount)
 	var/key = create_key_for(_path, _mat, _amount)
 	update_cached_info_for(_path, _mat, _amount, key)
-	. = origin_tech_cache[key]
+	. = origin_tech_cache[key]
+
+// Bespoke proc; only cache appearance if and when this proc is called, not more generally.
+/repository/atom_info/proc/get_appearance_of(var/_path, var/_mat, var/_amount)
+	var/key = create_key_for(_path, _mat, _amount)
+	update_cached_info_for(_path, _mat, _amount, key, cache_appearance = TRUE)
+	. = appearance_cache[key]

code/datums/supplypacks/operations.dm

@@ -3,13 +3,13 @@
 
 /decl/hierarchy/supply_pack/operations/cargotrain
 	name = "Equipment - Cargo Train Tug"
-	contains = list(/obj/vehicle/train/cargo/engine)
+	contains = list(/obj/vehicle/train/engine)
 	containertype = /obj/structure/largecrate
 	containername = "cargo train tug crate"
 
 /decl/hierarchy/supply_pack/operations/cargotrailer
 	name = "Equipment - Cargo Train Trolley"
-	contains = list(/obj/vehicle/train/cargo/trolley)
+	contains = list(/obj/vehicle/train/trolley)
 	containertype = /obj/structure/largecrate
 	containername = "cargo train trolley crate"
 

code/datums/supplypacks/science.dm

@@ -66,12 +66,3 @@
 	name = "Gear - Illumination grenades"
 	contains = list(/obj/item/grenade/light = 8)
 	containername = "illumination grenade crate"
-
-/decl/hierarchy/supply_pack/science/stasis_cages
-	name          = "Stasis Cage"
-	contains      = list(
-		/obj/structure/stasis_cage = 1
-	)
-	containertype = /obj/structure/closet/crate/large
-	containername = "stasis cage crate"
-	access        = access_xenofauna

code/datums/supplypacks/supplypack.dm

@@ -19,13 +19,16 @@ var/global/list/cargoprices = list()
 	. = ..() // make sure children are set up
 	if(is_category())
 		return // don't do any of this for categories
+	var/total_contained = 0
+	for(var/entry in contains)
+		total_contained += max(1, contains[entry])
 	if(!num_contained)
-		for(var/entry in contains)
-			num_contained += max(1, contains[entry])
+		num_contained = total_contained
 	if(isnull(cost))
 		cost = 0
 		for(var/entry in contains)
 			cost += atom_info_repository.get_combined_worth_for(entry) * max(1, contains[entry])
+		cost *= num_contained / total_contained // if you get a random selection, it costs the expected value rather than the total worth. gambling!
 		cost += containertype ? atom_info_repository.get_single_worth_for(containertype) : 0
 		cost = max(1, NONUNIT_CEILING((cost * WORTH_TO_SUPPLY_POINTS_CONSTANT * SSsupply.price_markup), WORTH_TO_SUPPLY_POINTS_ROUND_CONSTANT))
 	global.cargoprices[name] = cost

code/game/atoms.dm

@@ -742,17 +742,19 @@
 	- `post_climb_check?`: If we should check if the user can continue climbing
 	- Return: `TRUE` if they can climb, otherwise `FALSE`
 */
-/atom/proc/can_climb(var/mob/living/user, post_climb_check=0)
+/atom/proc/can_climb(mob/living/user, post_climb_check = FALSE, silent = FALSE)
 	if (!(atom_flags & ATOM_FLAG_CLIMBABLE) || !user.can_touch(src) || (!post_climb_check && climbers && (user in climbers)))
 		return FALSE
 
 	if (!user.Adjacent(src))
-		to_chat(user, "<span class='danger'>You can't climb there, the way is blocked.</span>")
+		if(!silent)
+			to_chat(user, SPAN_WARNING("You can't climb there, the way is blocked."))
 		return FALSE
 
 	var/obj/occupied = turf_is_crowded(user)
 	if(occupied)
-		to_chat(user, "<span class='danger'>There's \a [occupied] in the way.</span>")
+		if(!silent)
+			to_chat(user, SPAN_WARNING("There's \a [occupied] in the way."))
 		return FALSE
 	return TRUE
 
@@ -1065,3 +1067,18 @@
 	if(blood_color)
 		return FONT_COLORED(blood_color, "stained")
 	return null
+
+// Used to mark a turf as containing objects that are dangerous to step onto.
+/atom/proc/register_dangerous_to_step()
+	var/turf/T = get_turf(src)
+	if(T)
+		T.register_dangerous_object(src)
+
+/atom/proc/unregister_dangerous_to_step()
+	var/turf/T = get_turf(src)
+	if(T)
+		T.unregister_dangerous_object(src)
+
+// Test for if stepping on a tile containing this obj is safe to do, used for things like landmines and cliffs.
+/atom/proc/is_safe_to_step(mob/living/stepper)
+	return TRUE

code/game/atoms_movable.dm

@@ -628,3 +628,7 @@
 
 /atom/movable/proc/is_valid_merchant_pad_target()
 	return simulated
+
+// TODO reimplement this properly.
+/atom/movable/proc/is_incorporeal()
+	return !simulated

code/game/jobs/access_datum.dm

@@ -268,12 +268,6 @@ var/global/const/access_research = "ACCESS_RESEARCH" //47
 	desc = "Science"
 	region = ACCESS_REGION_RESEARCH
 
-var/global/const/access_explorer = "ACCESS_EXPLORER"
-/datum/access/explorer
-	id = access_explorer
-	desc = "Explorer"
-	region = ACCESS_REGION_GENERAL
-
 var/global/const/access_mining = "ACCESS_MINING" //48
 /datum/access/mining
 	id = access_mining
@@ -310,12 +304,6 @@ var/global/const/access_xenobiology = "ACCESS_XENOBIO" //55
 	desc = "Xenobiology Lab"
 	region = ACCESS_REGION_RESEARCH
 
-var/global/const/access_xenofauna = "ACCESS_XENOFAUNA"
-/datum/access/xenofauna
-	id = access_xenofauna
-	desc = "Xenfauna Lab"
-	region = ACCESS_REGION_RESEARCH
-
 var/global/const/access_ce = "ACCESS_CHIEF_ENGINEER" //56
 /datum/access/ce
 	id = access_ce

code/game/machinery/alarm.dm

@@ -161,7 +161,7 @@
 	TLV["temperature"] =	list(T0C-26, T0C, T0C+40, T0C+66) // K
 
 	var/decl/environment_data/env_info = GET_DECL(environment_type)
-	for(var/g in decls_repository.get_decl_paths_of_subtype(/decl/material/gas))
+	for(var/g in get_filterable_material_types())
 		if(!env_info.important_gasses[g])
 			trace_gas += g
 	// not everything in these lists is a subtype of /decl/material/gas, so:

code/game/machinery/atmoalter/scrubber.dm

@@ -24,7 +24,7 @@
 	. = ..()
 	if(!scrubbing_gas)
 		scrubbing_gas = list()
-		for(var/g in decls_repository.get_decl_paths_of_subtype(/decl/material/gas))
+		for(var/g in get_filterable_material_types())
 			if(g != /decl/material/gas/oxygen && g != /decl/material/gas/nitrogen)
 				scrubbing_gas += g
 

code/game/objects/__objs.dm

@@ -493,4 +493,3 @@
 	if(anchored)
 		return FALSE
 	return ..()
-