Dorf work

selling plasma to centcom again
changelog

code/controllers/master_controller.dm

@@ -92,6 +92,7 @@ datum/controller/game_controller/proc/setup()
 	cachedamageicons()
 	//if(map && map.dorf)
 		//mining_surprises = typesof(/mining_surprise/dorf) - /mining_surprise/dorf
+		//max_secret_rooms += 2
 	for(var/i=0, i<max_secret_rooms, i++)
 		//if(map && map.dorf)
 			//make_dorf_secret()

code/game/objects/items/stacks/sheets/mineral.dm

@@ -201,6 +201,7 @@ var/global/list/datum/stack_recipe/phazon_recipes = list()
 	desc = "Holy christ what is this?"
 	icon_state = "sheet-phazon"
 	item_state = "sheet-phazon"
+	sheettype = "phazon"
 	perunit = 1500
 	melt_temperature = MELTPOINT_PLASTIC
 	throwforce = 15.0

code/game/objects/items/stacks/stack.dm

@@ -15,6 +15,7 @@
 	var/amount = 1
 	var/perunit = 3750
 	var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
+	var/redeemed = 0 // For selling minerals to central command via supply shuttle.
 
 /obj/item/stack/New(var/loc, var/amount=null)
 	..()

code/game/objects/items/weapons/cash.dm

@@ -106,6 +106,12 @@ var/global/list/moneytypes=list(
 	worth = 1000
 	stack_color = "#333333"
 
+/obj/structure/closet/cash_closet/New()
+	var/list/types = typesof(/obj/item/weapon/spacecash)
+	for(var/i = 1 to rand(3,10))
+		var/typepath = pick(types)
+		new typepath(src)
+
 /proc/dispense_cash(var/amount, var/loc)
 	for(var/cashtype in moneytypes)
 		var/slice = moneytypes[cashtype]

code/game/supplyshuttle.dm

@@ -138,7 +138,7 @@ var/list/mechtoys = list(
 	//supply points have been replaced with MONEY MONEY MONEY - N3X
 	var/credits_per_slip = 2
 	var/credits_per_crate = 5
-	var/credits_per_plasma = 0.5 // 2 plasma for 1 point
+	//var/credits_per_plasma = 0.5 // 2 plasma for 1 point
 	//control
 	var/ordernum
 	var/list/centcomm_orders = list()
@@ -151,7 +151,7 @@ var/list/mechtoys = list(
 	var/moving = 0
 	var/eta_timeofday
 	var/eta
-
+	var/datum/materials/materials_list = new
 	New()
 		ordernum = rand(1,9000)
 
@@ -266,12 +266,24 @@ var/list/mechtoys = list(
 		for(var/atom/movable/MA in shuttle)
 			if(MA.anchored)	continue
 
+			if(istype(MA, /obj/item/stack/sheet/mineral/plasma))
+				var/obj/item/stack/sheet/mineral/plasma/P = MA
+				if(P.redeemed) continue
+				var/datum/material/mat = materials_list.getMaterial(P.sheettype)
+				cargo_acct.money += (mat.value * 2) * P.amount // Central Command pays double for plasma they receive that hasn't been redeemed already.
+
 			// Must be in a crate!
-			if(istype(MA,/obj/structure/closet/crate))
+			else if(istype(MA,/obj/structure/closet/crate))
 				cargo_acct.money += credits_per_crate
 				var/find_slip = 1
 
 				for(var/atom/A in MA)
+					if(istype(A, /obj/item/stack/sheet/mineral/plasma))
+						var/obj/item/stack/sheet/mineral/plasma/P = A
+						if(P.redeemed) continue
+						var/datum/material/mat = materials_list.getMaterial(P.sheettype)
+						cargo_acct.money += (mat.value * 2) * P.amount // Central Command pays double for plasma they receive that hasn't been redeemed already.
+						continue
 					if(find_slip && istype(A,/obj/item/weapon/paper/manifest))
 						var/obj/item/weapon/paper/slip = A
 						if(slip.stamped && slip.stamped.len) //yes, the clown stamp will work. clown is the highest authority on the station, it makes sense

code/modules/mining/equipment_locker.dm

@@ -77,6 +77,7 @@
 	if(O.material)
 		var/datum/material/mat = materials.getMaterial(O.material)
 		var/obj/item/stack/sheet/M = new mat.sheettype(src)
+		M.redeemed = 1
 		//credits += mat.value // Old behavior
 		return M
 	return
@@ -157,6 +158,7 @@
 			if(desired==0)
 				return 1
 			var/obj/item/stack/sheet/out = new mat.sheettype(output.loc)
+			out.redeemed = 1 //Central command will not pay for this mineral stack.
 			out.amount = Clamp(desired, 0, min(mat.stored, out.max_amount))
 			mat.stored -= out.amount
 	updateUsrDialog()

html/changelog.html

@@ -79,6 +79,14 @@ ADDING CREDITS?  EDIT templates/header.html (or footer.html if they're for old t
 		
 		-->
 
+		<div class="commit sansserif">
+			<h2 class="date">2015.02.28</h2>
+			<h3 class="author">Pomf123 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="tweak">Re-added the ability to sell plasma sheets to centcom via supply shuttle. They can't have been redeemed already and you get twice the value as opposed to using the Ore Redeemer on station.</li>
+			</ul>
+		</div>
+
 		<div class="commit sansserif">
 			<h2 class="date">2015.02.27</h2>
 			<h3 class="author">Clusterfack updated:</h3>

html/changelogs/.all_changelog.yml

@@ -2424,3 +2424,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   Pomf123:
   - tweak: Machine Frames can now be deanchored and moved, to deconstruct ensure its
       anchored and is empty.
+2015-02-28:
+  Pomf123:
+  - tweak: Re-added the ability to sell plasma sheets to centcom via supply shuttle.
+      They can't have been redeemed already and you get twice the value as opposed
+      to using the Ore Redeemer on station.

maps/dorffort.dm

@@ -60,8 +60,7 @@
 /obj/item/toy/gooncode
 	origin_tech = "materials=10;plasmatech=5;syndicate=3;programming=10;bluespace=5;power=5"
 
-/mining_surprise/dorf
+
-	name = "Dorf!"
 
 /mining_surprise/dorf/medbay
 	name= "Abandoned Medbay"
@@ -226,5 +225,36 @@
 	room_size_max = 8
 	flags = CONTIGUOUS_WALLS
 
+/mining_surprise/dorf/cargo
+	name= "Abandoned Cache"
+	max_richness = 5
+	floortypes = list(
+		/turf/simulated/floor/plating/airless = 100
+	)
+	walltypes = list(
+		/turf/simulated/wall/r_wall		= 100
+	)
+
+	spawntypes = list(
+		/obj/mecha/working/ripley/mining			= 1,
+		/obj/item/weapon/pickaxe/jackhammer			= 1,
+		/obj/item/weapon/pickaxe/drill/diamond		= 1,
+		/obj/structure/closet/syndicate/resources	= 2,
+		/obj/structure/closet/cash_closet			= 3,
+	)
+
+	fluffitems = list(
+		/obj/effect/decal/cleanable/blood								= 3,
+		/obj/effect/decal/remains/human									= 1,
+		/obj/item/clothing/under/overalls								= 1,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/chili		= 1,
+		/obj/item/weapon/tank/oxygen/red								= 2,
+		/obj/item/weapon/gun/projectile/mateba							= 1
+	)
+
+	complex_max_size=3
+	room_size_max=7
+	flags = CONTIGUOUS_WALLS
+
 ////////////////////////////////////////////////////////////////
 #include "tgstation.dmm"