rhicora · rhicora · Jul 6, 2019 · Jul 6, 2019 · Jul 6, 2019 · Jul 6, 2019
diff --git a/code/controllers/subsystems/market.dm b/code/controllers/subsystems/market.dm
@@ -46,7 +46,7 @@ SUBSYSTEM_DEF(market)
 					if((faction.weekly_assigned + 7 DAY) < world.realtime)
 						faction.assign_weekly_objective()
 			else
-				if((faction.daily_assigned + 7 DAYS) < world.realtime)
+				if((faction.weekly_assigned + 7 DAYS) < world.realtime)
 					faction.assign_weekly_objective()
 
 
@@ -149,7 +149,7 @@ SUBSYSTEM_DEF(market)
 			if(R)
 				payee_account = R.linked_account
 		if(payee_account)
-			if(payee_account.money >= pay_amount)
+			if(payer_account.money >= pay_amount)
 				var/datum/transaction/T = new("[payee] (via recurring contract)", "Contract Payment", -pay_amount, "Recurring Contract")
 				payer_account.do_transaction(T)
 				//transfer the money

diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
@@ -30,11 +30,8 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
 
 		if(new_seed_type)
 			to_chat(user, "<span class='notice'>You extract some seeds from [O].</span>")
-			if(prob(35))
-				var/produce =(1)
-			else
-				to_chat (user, "<span class='notice'>You fail to extract any seeds from [O].</span>")
-			for(var/i = 0;i<=produce;i++)
+			var/produce = pick(1, 2)
+			for(var/i = 0; i <= produce; i++)
 				var/obj/item/seeds/seeds = new(get_turf(src))
 				seeds.seed_type = new_seed_type.name
 				seeds.update_seed()

diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
@@ -257,7 +257,7 @@
 
 /decl/flooring/wood
 	name = "wooden floor"
-	desc = "Polished redwood planks."
+	desc = "Polished oak planks."
 	icon = 'icons/turf/flooring/wood.dmi'
 	icon_base = "wood"
 	has_damage_range = 6
@@ -271,26 +271,32 @@
 	color = WOOD_COLOR_GENERIC
 
 /decl/flooring/wood/mahogany
+	desc = "Polished mahogany planks."
 	color = WOOD_COLOR_RICH
 	build_type = /obj/item/stack/tile/mahogany
 
 /decl/flooring/wood/maple
+	desc = "Polished maple planks."
 	color = WOOD_COLOR_PALE
 	build_type = /obj/item/stack/tile/maple
 
 /decl/flooring/wood/ebony
+	desc = "Polished ebony planks."
 	color = WOOD_COLOR_BLACK
 	build_type = /obj/item/stack/tile/ebony
 
 /decl/flooring/wood/walnut
+	desc = "Polished walnut planks."
 	color = WOOD_COLOR_CHOCOLATE
 	build_type = /obj/item/stack/tile/walnut
 
 /decl/flooring/wood/bamboo
+	desc = "Polished bamboo planks."
 	color = WOOD_COLOR_PALE2
 	build_type = /obj/item/stack/tile/bamboo
 
 /decl/flooring/wood/yew
+	desc = "Polished yew planks."
 	color = WOOD_COLOR_YELLOW
 	build_type = /obj/item/stack/tile/yew
 

diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
@@ -511,13 +511,13 @@ var/list/admin_verbs_mentor = list(
 /client/proc/unban_panel()
 	set name = "Unban Panel"
 	set category = "Admin"
-	// if(holder)
-	// 	if(config.ban_legacy_system)
-	// 		holder.unbanpanel()
-	// 	else
-	// 		holder.DB_ban_panel()
-	// SSstatistics.add_field_details("admin_verb","UBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	// return
+	if(holder)
+		if(config.ban_legacy_system)
+			holder.unbanpanel()
+		else
+			holder.DB_ban_panel()
+	SSstatistics.add_field_details("admin_verb","UBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	return
 
 /client/proc/game_panel()
 	set name = "Game Panel"

diff --git a/code/modules/designer/canvas.dm b/code/modules/designer/canvas.dm
@@ -1,5 +1,5 @@
 /obj/item/frame/canvas
-	name = "Canvas (30x30)"
+	name = "Canvas"
 	desc = "Such avant-garde, much art."
 	gender = NEUTER
 	icon = 'icons/obj/bureaucracy.dmi'
@@ -104,6 +104,7 @@
 	canvas_item = frame.type
 	designer_associate(frame.designer_unit)
 	designer_update_icon()
+	anchored = 1
 
 /obj/structure/canvas/Destroy()
 		designer_disassociate()

diff --git a/code/modules/designer/canvas/size_M.dm b/code/modules/designer/canvas/size_M.dm
@@ -4,17 +4,18 @@
 	icon_offset_y = 5
 	icon_width = 22
 	icon_height = 22
-
+	name = "canvas (22x22)"
 /obj/item/frame/canvas/size_m/portrait
 	icon_state = "canvas_m_p"
 	icon_offset_x = 8
 	icon_offset_y = 5
 	icon_width = 16
 	icon_height = 22
-
+	name = "canvas (16x22)"
 /obj/item/frame/canvas/size_m/landscape
 	icon_state = "canvas_m_l"
 	icon_offset_x = 5
 	icon_offset_y = 8
 	icon_width = 22
 	icon_height = 16
+	name = "canvas (22x16)"
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
@@ -22,22 +22,11 @@
 /datum/money_account/New()
 	ADD_SAVED_VAR(dupe_fixed)
 	..()
+
 /datum/money_account/after_load()
-	var/datum/money_account/M = get_account_loadless(account_number)
-	if(M && M.money >= money)
-		message_admins("duplicate account loaded owner: [owner_name] account_number: [M.account_number]")
-		return M
-	else if(M && M.money < money)
-		all_money_accounts.Remove(M)
-		all_money_accounts.Add(src)
-		return src
-	else
-		all_money_accounts.Add(src)
+	all_money_accounts.Add(src)
 	if(money < 0)
 		money = 0
-	if(!dupe_fixed && money > 3000)
-		money = 3000
-		dupe_fixed = 1
 	..()
 	return src
 

diff --git a/code/modules/factions/faction.dm b/code/modules/factions/faction.dm
@@ -3438,7 +3438,7 @@ var/PriorityQueue/all_feeds
 /datum/business_spec/mining/monsterhunter
 	name = "Monster Hunter"
 	desc = "This specialization gives the business capacity for a medical fabricator and tech that can produce machines and equipment to keep employees alive while fighting the top tier of monsters. Travel to the outer reaches and dig for riches, let the monsters come to you."
-	limits = /datum/machine_limits/retail/spec/bigstore
+	limits = /datum/machine_limits/mining/spec/monsterhunter
 	hourly_objectives = list(/datum/module_objective/hourly/monsters)
 	daily_objectives = list(/datum/module_objective/daily/monsters)
 	weekly_objectives = list(/datum/module_objective/weekly/monsters)

diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm
@@ -243,7 +243,7 @@
 		user.visible_message("<span class='notice'>\The [user] loads \the [H] into \the [src] and turns it on.</span>", "<span class='notice'>You load \the [H] into \the [src] and turn it on.</span>")
 		processing = H.honey
 		qdel(H)
-		time_end_processing = world.time + 300 SECONDS
+		time_end_processing = world.time + 60 SECONDS
 		update_icon()
 		update_use_power(POWER_USE_ACTIVE)
 		return 1

diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
@@ -24,17 +24,16 @@
 	fill_reagents()
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/Initialize()
-	. = ..()
 	if(!map_storage_loaded)
 		//Only get plant type from SSPlant if we're newly created. Otherwise keep our stored properties
 		if(!SSplants)
 			log_error("<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
 			return INITIALIZE_HINT_QDEL
 		seed = SSplants.seeds[plantname]
-		SetupReagents()
 	if(!seed)
+		log_error("[src]\ref[src] at loc [loc]([x], [y], [z]) didn't have a seed when initialized!")
 		return INITIALIZE_HINT_QDEL
-
+	. = ..() //SetupReagents is called in the base class, and it calls fill_reagents, which needs the seed to be setup!
 	SetName("[seed.seed_name]")
 	trash = seed.get_trash_type()
 	if(!dried_type)
@@ -45,6 +44,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/proc/fill_reagents()
 	if(!seed)
+		log_error("[src]\ref[src] had no seed when reagents were intialized!")
 		return
 
 	if(!seed.chems)

diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm
@@ -132,7 +132,33 @@
 
 /obj/machinery/portable_atmospherics/hydroponics/New()
 	. = ..()
-
+	ADD_SAVED_VAR(waterlevel)
+	ADD_SAVED_VAR(nutrilevel)
+	ADD_SAVED_VAR(pestlevel)
+	ADD_SAVED_VAR(weedlevel)
+	ADD_SAVED_VAR(dead)
+	ADD_SAVED_VAR(harvest)
+	ADD_SAVED_VAR(age)
+	ADD_SAVED_VAR(sampled)
+	ADD_SAVED_VAR(yield_mod)
+	ADD_SAVED_VAR(mutation_mod)
+	ADD_SAVED_VAR(toxins)
+	ADD_SAVED_VAR(mutation_level)
+	ADD_SAVED_VAR(tray_light)
+	ADD_SAVED_VAR(plant_health)
+
+	ADD_SAVED_VAR(closed_system)
+
+	ADD_SAVED_VAR(temp_chem_holder)
+	ADD_SAVED_VAR(labelled)
+	ADD_SAVED_VAR(seed)
+	ADD_SAVED_VAR(req_access_faction)
+
+/obj/machinery/portable_atmospherics/hydroponics/before_save()
+	. = ..()
+	if(connected_faction)
+		req_access_faction = connected_faction.uid
+
 /obj/machinery/portable_atmospherics/hydroponics/after_load()
 	..()
 	if(req_access_faction)

diff --git a/code/modules/materials/definitions/materials_metal.dm b/code/modules/materials/definitions/materials_metal.dm
@@ -395,7 +395,7 @@
 	weight = 23
 	stack_origin_tech = list(TECH_MATERIAL = 2)
 	hitsound = 'sound/weapons/smash.ogg'
-	alloy_materials = list(MATERIAL_IRON = 1250, MATERIAL_PLATINUM = 1250, MATERIAL_GRAPHITE = 1250)
+	alloy_materials = list(MATERIAL_STEEL = 1875, MATERIAL_PLATINUM = 1875)
 	alloy_product = TRUE
 	ore_smelts_to = MATERIAL_PLASTEEL
 

diff --git a/code/modules/mining/machinery/mineral_processor.dm b/code/modules/mining/machinery/mineral_processor.dm
@@ -47,7 +47,7 @@
 	if(input_turf)
 		for(var/obj/item/stack/S in input_turf)
 			// If we are deleted or are neither dust or ore, continue
-			if(QDELETED(S) || (!istype(S, /obj/item/stack/material_dust) && !istype(S, /obj/item/stack/ore)) || !LAZYLEN(S.matter))
+			if(QDELETED(S) || (!istype(S, /obj/item/stack/material_dust) && !istype(S, /obj/item/stack/ore) && !istype(S, /obj/item/stack/material)) || !LAZYLEN(S.matter))
 				continue
 
 			// Otherwise add the matter in the stack to our stores.
@@ -58,7 +58,7 @@
 				LAZYASSOC(materials_processing, M.name)
 
 			qdel(S)
-			
+
 	if(output_turf)
 		var/list/attempt_to_alloy = list()
 		var/max_sheets = sheets_per_tick
@@ -122,7 +122,7 @@
 	var/result = Clamp(Floor(materials_stored[M.name] / M.units_per_sheet), 0, max_result)
 	if(!result)
 		return 0
-		
+
 	materials_stored[M.name] -= result * M.units_per_sheet
 
 	use_power_oneoff(active_power_usage)
@@ -132,7 +132,7 @@
 		N.place_sheet(output_turf, result)
 	else
 		M.place_sheet(output_turf, result)
-		
+
 	return result
 
 /obj/machinery/mineral/processing_unit/proc/attempt_compression(var/material/M, var/max_result)
@@ -203,4 +203,4 @@
 #undef ORE_DISABLED
 #undef ORE_SMELT
 #undef ORE_COMPRESS
-#undef ORE_ALLOY
+#undef ORE_ALLOY
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
@@ -479,7 +479,9 @@
 		to_chat(src, "Your character is not loading correctly. Contact Brawler.")
 		spawning = FALSE
 		return
-	Retrieve_Record(character.real_name)
+	if (!Retrieve_Record(character.real_name))
+		var/datum/computer_file/report/crew_record/new_record = CreateModularRecord(character)
+		GLOB.all_crew_records |= new_record
 	var/turf/spawnTurf = locate(0,0,0) //Instead of null start with 0,0,0 because the unsafe spawn check will kick in and warn the user if there's something wrong
 
 	if(character.spawn_type == CHARACTER_SPAWN_TYPE_CRYONET)

diff --git a/code/modules/modular_computers/file_system/programs/generic/email_client.dm b/code/modules/modular_computers/file_system/programs/generic/email_client.dm
@@ -252,7 +252,7 @@
 						"body" = pencode2html(message.stored_data),
 						"source" = message.source,
 						"timestamp" = message.timestamp,
-						"ref" = "\ref[message.uid]"
+						"ref" = "\ref[message]"
 					)))
 				data["messages"] = all_messages
 				data["messagecount"] = all_messages.len

diff --git a/code/modules/modular_computers/file_system/reports/crew_record.dm b/code/modules/modular_computers/file_system/reports/crew_record.dm
@@ -110,8 +110,8 @@ FIELD_LONG("Exploitable Information", antagRecord, access_syndicate, access_synd
 	if(linked_account.money < cost)
 		to_chat(user, "Insufficent funds.")
 		return
-	var/datum/transaction/T = new("Nexus Account Upgrade", "Nexus Account Upgrade", cost, "Nexus Account Upgrade")
-	linked_account.do_transaction(T)
+	var/datum/transaction/Te = new("Nexus Account Upgrade", "Nexus Account Upgrade", -cost, "Nexus Account Upgrade")
+	linked_account.do_transaction(Te)
 	network_level++
 
 /datum/computer_file/report/crew_record/proc/get_stock_limit()

diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
@@ -157,7 +157,6 @@ Some standard magazines, speedloaders and clips
 	matter = list(MATERIAL_STEEL = 1440)
 	max_ammo = 4
 	multiple_sprites = 1
-	w_class = ITEM_SIZE_NORMAL
 	mass = 80 GRAMS
 	var/marking_color
 
@@ -245,7 +244,6 @@ Some standard magazines, speedloaders and clips
 	ammo_type = /obj/item/ammo_casing/c9mm
 	max_ammo = 20
 	multiple_sprites = 1
-	w_class = ITEM_SIZE_NORMAL
 	mass = 150 GRAMS
 /obj/item/ammo_magazine/box/c9mm/_20/empty
 	initial_ammo = 0
@@ -332,7 +330,6 @@ Some standard magazines, speedloaders and clips
 	ammo_type = /obj/item/ammo_casing/c45
 	max_ammo = 20
 	multiple_sprites = 1
-	w_class = ITEM_SIZE_NORMAL
 	mass = 150 GRAMS
 /obj/item/ammo_magazine/box/c45/_20/empty
 	initial_ammo = 0
@@ -410,7 +407,6 @@ Some standard magazines, speedloaders and clips
 	ammo_type = /obj/item/ammo_casing/c762
 	max_ammo = 15 //if we lived in a world where normal mags had 30 rounds, this would be a 20 round mag
 	multiple_sprites = 1
-	w_class = ITEM_SIZE_NORMAL
 	mass = 180 GRAMS
 /obj/item/ammo_magazine/box/c762/empty
 	initial_ammo = 0