Porting main code changes from Polaris rebase.

code/datums/storage/subtypes_box.dm

@@ -18,6 +18,9 @@
 /datum/storage/box/animal_cube
 	can_hold = list(/obj/item/food/animal_cube)
 
+/datum/storage/box/large/metal
+	use_sound = 'sound/effects/closet_open.ogg'
+
 /datum/storage/box/snappop
 	can_hold = list(/obj/item/toy/snappop)
 

code/game/machinery/cryopod.dm

@@ -475,7 +475,7 @@
 	if(!usr.can_enter_cryopod(usr))
 		return
 
-	visible_message(emote_replace_user_tokens(emote_replace_target_tokens(on_enter_visible_message, src), usr), range = 3)
+	visible_message(capitalize_proper_html(emote_replace_user_tokens(emote_replace_target_tokens(on_enter_visible_message, src), usr)), range = 3)
 
 	if(do_after(usr, 20, src))
 

code/game/movietitles.dm

@@ -128,7 +128,7 @@ var/global/list/end_titles
 		titles += "<center>STAFF'S GOOD BOYS:<br>[english_list(goodboys)]</center><br>"
 
 	var/disclaimer = "<br>Sponsored by [global.using_map.company_name].<br>All rights reserved.<br>\
-					 This motion picture is protected under the copyright laws of the Sol Central Government<br> and other nations throughout the galaxy.<br>\
+					 This motion picture is protected under the copyright laws of the system government<br> and other nations throughout the galaxy.<br>\
 					 Colony of First Publication: [pick("Mars", "Luna", "Earth", "Venus", "Phobos", "Ceres", "Tiamat", "Ceti Epsilon", "Eos", "Pluto", "Ouere",\
 					 "Lordania", "Kingston", "Cinu", "Yuklid V", "Lorriman", "Tersten", "Gaia")].<br>"
 	disclaimer += pick("Use for parody prohibited. PROHIBITED.",

code/game/objects/items/weapons/storage/boxes.dm

@@ -169,6 +169,7 @@
 /obj/item/box/ammo/blanks/large
 	icon_state = "largebox"
 	w_class = ITEM_SIZE_LARGE
+	storage = /datum/storage/box/large/metal
 
 /obj/item/box/ammo/blanks/large/Initialize(ml, material_key)
 	. = ..()

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -1,7 +1,6 @@
 /* Types of tanks!
  * Contains:
  *		Oxygen
- *		Anesthetic
  *		Air
  *		Hydrogen
  *		Emergency Oxygen
@@ -55,6 +54,9 @@
 /obj/item/tank/hydrogen/empty
 	starting_pressure = list()
 
+/obj/item/tank/hydrogen/collector
+	starting_pressure = list(/decl/material/gas/hydrogen = 70)
+
 /*
  * Emergency Oxygen
  */
@@ -105,4 +107,4 @@
 	icon = 'icons/obj/items/tanks/tank_red.dmi'
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 	starting_pressure = list(/decl/material/gas/nitrogen = 10 ATM)
-	gas_volume = 180
+	gas_volume = 180

code/modules/admin/verbs/debug.dm

@@ -313,8 +313,7 @@
 	for(var/obj/machinery/rad_collector/Rad in SSmachines.machinery)
 		if(Rad.anchored)
 			if(!Rad.loaded_tank)
-				Rad.loaded_tank = new /obj/item/tank/hydrogen(Rad)
-				Rad.loaded_tank.air_contents.gas[/decl/material/gas/hydrogen] = 70
+				Rad.loaded_tank = new /obj/item/tank/hydrogen/collector(Rad)
 				Rad.drainratio = 0
 			if(!Rad.active)
 				Rad.toggle_power()

code/modules/backgrounds/citizenship/_citizenship.dm

@@ -1,6 +1,7 @@
 /decl/background_detail/citizenship
 	abstract_type = /decl/background_detail/citizenship
 	category = /decl/background_category/citizenship
+	var/ruling_body = "Other Faction"
 	var/capital
 	var/size_heading = "Systems"
 	var/size_value

code/modules/backgrounds/citizenship/citizenship_other.dm

@@ -14,3 +14,16 @@
 	description = "You do not possess any kind of official citizenship."
 	economic_power = 0
 	capital = "None"
+
+/decl/background_detail/citizenship/synthetic
+	name = "Stateless Drone"
+	uid = "stateless_drone"
+	description = "Drones are considered property in most systems. Thus, statelessness is ubiqtuous for them."
+	secondary_langs = list(
+		/decl/language/machine,
+		/decl/language/human/common,
+		/decl/language/sign
+	)
+
+/decl/background_detail/citizenship/synthetic/sanitize_background_name(new_name)
+	return sanitize_name(new_name, allow_numbers = TRUE)

code/modules/clothing/costumes/rank.dm

@@ -15,7 +15,7 @@
 	name = "head of personnel's suit"
 	icon = 'icons/clothing/uniform_hop_whimsy.dmi'
 
-/obj/item/clothing/costume/hosformalmale
+/obj/item/clothing/costume/hosformal
 	name = "head of security's formal uniform"
 	desc = "A male head of security's formal-wear, for special occasions."
 	icon = 'icons/clothing/uniform_hos_formal.dmi'

code/modules/clothing/jumpsuits/_jumpsuit.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/jumpsuit
 	name = "jumpsuit"
-	desc = "The latest in space fashion."
+	desc = "The latest in utilitarian fashion."
 	icon = 'icons/clothing/jumpsuits/jumpsuit.dmi'
 	body_parts_covered = SLOT_UPPER_BODY|SLOT_LOWER_BODY|SLOT_LEGS|SLOT_ARMS
 	permeability_coefficient = 0.90

code/modules/clothing/masks/monitor.dm

@@ -1,6 +1,6 @@
 //IPC-face object for FPB.
 /obj/item/clothing/mask/monitor
-	name = "display monitor"
+	name = "unbranded display monitor"
 	desc = "A rather clunky old CRT-style display screen, fit for mounting on an optical output."
 	flags_inv = HIDEEYES
 	body_parts_covered = SLOT_EYES

code/modules/codex/categories/category_cultures.dm

@@ -1,5 +1,5 @@
 /decl/codex_category/cultures
-	name = "Places, Factions and Culture"
+	name = "Places, Factions, and Culture"
 	desc = "Prominent planets, cultures, factions and religions of known space."
 
 /decl/codex_category/cultures/Populate()

code/modules/economy/cael/EFTPOS.dm

@@ -41,7 +41,16 @@
 
 	//by default, connect to the station account
 	//the user of the EFTPOS device can change the target account though, and no-one will be the wiser (except whoever's being charged)
-	linked_account = station_account
+	linked_account = get_default_account()
+
+/obj/item/eftpos/proc/get_default_account()
+	return global.station_account
+
+/obj/item/eftpos/departmental
+	var/decl/department/default_department
+
+/obj/item/eftpos/departmental/get_default_account()
+	return (default_department && global.department_accounts[default_department]) || ..()
 
 /obj/item/eftpos/proc/print_reference()
 	var/obj/item/paper/R = new(src.loc, null,

code/modules/maps/template_types/random_exoplanet/planet_themes/ruined_city.dm

@@ -123,6 +123,9 @@
 	floor_type = null
 	material = /decl/material/solid/stone/concrete
 
+/turf/wall/concrete/reinforced
+	reinf_material = /decl/material/solid/metal/steel
+
 //Generic ruin
 /datum/random_map/maze/concrete
 	wall_type =  /turf/wall/concrete

code/modules/materials/definitions/solids/materials_solid_stone.dm

@@ -44,6 +44,15 @@
 	melting_point = T0C + 600
 	hardness = MAT_VALUE_RIGID + 5
 
+/decl/material/solid/stone/limestone
+	name          = "limestone"
+	uid           = "solid_limestone"
+	lore_text     = "A pale sedimentary rock, often containing fossils. The cost of boosting it to orbit is almost universally much higher than the actual value of the material."
+	color         = COLOR_OFF_WHITE
+	value         = 1.5
+	melting_point = T0C + 600
+	hardness      = MAT_VALUE_RIGID + 5
+
 /decl/material/solid/stone/flint
 	name      = "flint"
 	uid       = "solid_flint"

code/modules/materials/stack_types/material_stack_misc.dm

@@ -82,6 +82,16 @@
 	crafting_stack_type = /obj/item/stack/material/puck
 	can_be_pulverized = TRUE
 
+/obj/item/stack/material/crystal
+	name = "crystal"
+	singular_name = "crystal"
+	plural_name = "crystals"
+	icon_state = "sheet-phoron"
+	plural_icon_state = "sheet-phoron-mult"
+	max_icon_state = "sheet-phoron-max"
+	stack_merge_type = /obj/item/stack/material/crystal
+	can_be_pulverized = TRUE
+
 /obj/item/stack/material/segment
 	name = "segments"
 	singular_name = "segment"

code/modules/mob/living/human/human.dm

@@ -614,7 +614,7 @@
 	for(var/obj/item/organ/external/E in get_external_organs())
 		E.sanitize_sprite_accessories()
 
-	for(var/acc_cat in root_bodytype.default_sprite_accessories)
+	for(var/acc_cat in root_bodytype?.default_sprite_accessories)
 		var/decl/sprite_accessory_category/acc_cat_decl = GET_DECL(acc_cat)
 		if(!acc_cat_decl.always_apply_defaults)
 			continue

code/modules/overmap/ftl_shunt/core.dm

@@ -554,7 +554,7 @@
 		/decl/material/gas/hydrogen/deuterium = 25000,
 		/decl/material/gas/hydrogen = 25000,
 		/decl/material/solid/exotic_matter = 50000
-		)
+	)
 	var/obj/item/fuel_assembly/fuel
 	var/obj/machinery/ftl_shunt/core/master
 	var/max_fuel = 0
@@ -654,4 +654,7 @@
 	icon = 'icons/obj/items/stock_parts/stock_parts.dmi'
 	icon_state = "smes_coil"
 	color = COLOR_YELLOW
-	matter = list(/decl/material/solid/exotic_matter = MATTER_AMOUNT_REINFORCEMENT, /decl/material/solid/metal/plasteel = MATTER_AMOUNT_PRIMARY)
+	matter = list(
+		/decl/material/solid/exotic_matter = MATTER_AMOUNT_REINFORCEMENT,
+		/decl/material/solid/metal/plasteel = MATTER_AMOUNT_PRIMARY
+	)

code/modules/power/cell.dm

@@ -330,6 +330,9 @@
 	maxcharge = 500
 	w_class = ITEM_SIZE_SMALL //Perhaps unwise.
 
+/obj/item/cell/gun/empty
+	charge = 0
+
 /obj/item/cell/gun/on_update_icon()
 	. = ..()
 	 //Color the battery charging overlay against the percentage of the battery capacity. However the index of gradient() is set to 1, instead of 100, so we divide it by 100. Colors were chosen by the sprite artist.

code/modules/power/singularity/collector.dm

@@ -4,14 +4,14 @@ var/global/list/rad_collectors = list()
 
 /obj/machinery/rad_collector
 	name = "radiation collector array"
-	desc = "A device which uses radiation and hydrogen to produce power."
+	desc = "A device which uses radiation and a reactant to produce power."
 	icon = 'icons/obj/machines/rad_collector.dmi'
 	icon_state = "ca"
 	anchored = FALSE
 	density = TRUE
 	initial_access = list(access_engine_equip)
 	max_health = 100
-	var/obj/item/tank/hydrogen/loaded_tank = null
+	var/obj/item/tank/loaded_tank = null
 
 	var/max_safe_temp = 1000 + T0C
 	var/melted
@@ -80,22 +80,22 @@ var/global/list/rad_collectors = list()
 		return FALSE
 	. = TRUE
 	if((stat & BROKEN) || melted)
-		to_chat(user, "<span class='warning'>\The [src] is completely destroyed!</span>")
+		to_chat(user, SPAN_WARNING("\The [src] is completely destroyed!"))
 	if(!src.locked)
 		toggle_power()
 		user.visible_message("[user.name] turns \the [src] [active? "on":"off"].", \
 		"You turn \the [src] [active? "on":"off"].")
 		investigate_log("turned [active?"<font color='green'>on</font>":"<font color='red'>off</font>"] by [user.key]. [loaded_tank?"Fuel: [round(loaded_tank.air_contents.gas[/decl/material/gas/hydrogen]/0.29)]%":"<font color='red'>It is empty</font>"].","singulo")
 	else
-		to_chat(user, "<span class='warning'>The controls are locked!</span>")
+		to_chat(user, SPAN_WARNING("The controls are locked!"))
 
 /obj/machinery/rad_collector/attackby(obj/item/used_item, mob/user)
-	if(istype(used_item, /obj/item/tank/hydrogen))
+	if(istype(used_item, /obj/item/tank))
 		if(!src.anchored)
-			to_chat(user, "<span class='warning'>\The [src] needs to be secured to the floor first.</span>")
+			to_chat(user, SPAN_WARNING("\The [src] needs to be secured to the floor first."))
 			return TRUE
 		if(src.loaded_tank)
-			to_chat(user, "<span class='warning'>There's already a tank loaded.</span>")
+			to_chat(user, SPAN_WARNING("There's already a tank loaded."))
 			return TRUE
 		if(!user.try_unequip(used_item, src))
 			return TRUE
@@ -108,11 +108,11 @@ var/global/list/rad_collectors = list()
 			return TRUE
 	else if(IS_WRENCH(used_item))
 		if(loaded_tank)
-			to_chat(user, "<span class='notice'>Remove the tank first.</span>")
+			to_chat(user, SPAN_NOTICE("Remove the tank first."))
 			return TRUE
 		for(var/obj/machinery/rad_collector/R in get_turf(src))
 			if(R != src)
-				to_chat(user, "<span class='warning'>You cannot install more than one collector on the same spot.</span>")
+				to_chat(user, SPAN_WARNING("You cannot install more than one collector on the same spot."))
 				return TRUE
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 		src.anchored = !src.anchored
@@ -129,7 +129,7 @@ var/global/list/rad_collectors = list()
 				src.locked = 0 //just in case it somehow gets locked
 				to_chat(user, SPAN_WARNING("The controls can only be locked when \the [src] is active."))
 		else
-			to_chat(user, "<span class='warning'>Access denied!</span>")
+			to_chat(user, SPAN_WARNING("Access denied!"))
 		return TRUE
 	return ..()
 
@@ -164,12 +164,11 @@ var/global/list/rad_collectors = list()
 
 /obj/machinery/rad_collector/proc/eject()
 	locked = 0
-	var/obj/item/tank/hydrogen/Z = src.loaded_tank
-	if (!Z)
+	if (!loaded_tank)
 		return
-	Z.dropInto(loc)
-	Z.reset_plane_and_layer()
-	src.loaded_tank = null
+	loaded_tank.dropInto(loc)
+	loaded_tank.reset_plane_and_layer()
+	loaded_tank = null
 	if(active)
 		toggle_power()
 	else

code/modules/random_map/noise/noise.dm

@@ -152,6 +152,7 @@
 				if(has_neighbor_with_path(x, y, get_appropriate_path(map[mapcell]), TRUE))
 					continue
 				map[mapcell] = map[pick(get_neighbors(x, y, TRUE))]
+				CHECK_TICK
 
 #define CHECK_NEIGHBOR_FOR_PATH(X, Y) \
 	TRANSLATE_AND_VERIFY_COORD(X,Y);\

code/modules/reagents/reagent_containers/drinkingglass/glass_boxes.dm

@@ -65,6 +65,12 @@
 /obj/item/box/glasses/mug/WillContain()
 	return list(/obj/item/chems/drinks/glass2/mug = max(1, storage?.storage_slots))
 
+/obj/item/box/glasses/coffeecup/WillContain()
+	return list(/obj/item/chems/drinks/glass2/coffeecup = max(1, storage?.storage_slots))
+
+/obj/item/box/glasses/teacup/WillContain()
+	return list(/obj/item/chems/drinks/glass2/coffeecup/teacup = max(1, storage?.storage_slots))
+
 /obj/item/box/glasses/wine/WillContain()
 	return list(/obj/item/chems/drinks/glass2/wine = max(1, storage?.storage_slots))
 

code/modules/species/species.dm

@@ -118,7 +118,9 @@ var/global/const/DEFAULT_SPECIES_HEALTH = 200
 	var/breath_type = /decl/material/gas/oxygen                 // Non-oxygen gas breathed, if any.
 	/// Material types considered noticeably poisonous when inhaled (ie. updates the toxins indicator on the HUD).
 	/// This is an associative list for speed.
-	var/poison_types = list(/decl/material/gas/chlorine = TRUE)
+	var/poison_types = list(
+		/decl/material/gas/chlorine = TRUE
+	)
 	var/exhale_type = /decl/material/gas/carbon_dioxide         // Exhaled gas type.
 	var/blood_reagent = /decl/material/liquid/blood
 

mods/content/xenobiology/species/golem.dm

@@ -36,7 +36,7 @@
 	force_background_info = list(
 		/decl/background_category/heritage =    /decl/background_detail/heritage/hidden/cultist,
 		/decl/background_category/homeworld =   /decl/background_detail/location/stateless,
-		/decl/background_category/citizenship = /decl/background_detail/citizenship/other,
+		/decl/background_category/citizenship = /decl/background_detail/citizenship/synthetic,
 		/decl/background_category/faction =     /decl/background_detail/faction/other
 	)
 

mods/species/adherent/datum/species.dm

@@ -56,7 +56,7 @@
 
 	available_background_info = list(
 		/decl/background_category/citizenship = list(
-			/decl/background_detail/citizenship/other
+			/decl/background_detail/citizenship/synthetic
 		),
 		/decl/background_category/heritage = list(
 			/decl/background_detail/heritage/adherent

mods/species/utility_frames/species.dm

@@ -36,7 +36,8 @@
 		/decl/pronouns/neuter
 	)
 	available_background_info = list(
-		/decl/background_category/heritage = list(/decl/background_detail/heritage/synthetic)
+		/decl/background_category/citizenship = list(/decl/background_detail/citizenship/synthetic),
+		/decl/background_category/heritage    = list(/decl/background_detail/heritage/synthetic)
 	)
 
 	exertion_effect_chance = 10