rej clean

code/modules/cargo/exports/materials.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm	(rejected hunks)
-@@ -43,7 +43,7 @@
- 
- // Plasma. The oil of 26 century. The reason why you are here.
- /datum/export/material/plasma
--	cost = 500
-+	cost = 300
- 	k_elasticity = 0
- 	material_id = MAT_PLASMA
- 	message = "cm3 of plasma"

code/modules/jobs/job_types/job.dm.rej

@@ -1,12 +0,0 @@
-diff a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm	(rejected hunks)
-@@ -156,7 +156,9 @@
- 		else
- 			back = backpack //Department backpack
- 
--	if(backpack_contents && box)
-+	if(box)
-+		if(!backpack_contents)
-+			backpack_contents = list()
- 		backpack_contents.Insert(1, box) // Box always takes a first slot in backpack
- 		backpack_contents[box] = 1
-