Coonflict fiiixeeess

code/game/atoms.dm

@@ -32,6 +32,9 @@
 
 	var/list/filter_data //For handling persistent filters
 
+	var/custom_price
+	var/custom_premium_price
+
 	var/datum/component/orbiter/orbiters
 
 	var/rad_flags = NONE // Will move to flags_1 when i can be arsed to

code/game/machinery/Sleeper.dm

@@ -26,6 +26,8 @@
 	var/list/chem_buttons	//Used when emagged to scramble which chem is used, eg: antitoxin -> morphine
 	var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning
 	var/enter_message = "<span class='notice'><b>You feel cool air surround you. You go numb as your senses turn inward.</b></span>"
+	payment_department = ACCOUNT_MED
+	fair_market_price = 5
 
 /obj/machinery/sleeper/Initialize()
 	. = ..()
@@ -205,6 +207,13 @@
 		ui = new(user, src, ui_key, "Sleeper", name, 550, 700, master_ui, state)
 		ui.open()
 
+/obj/machinery/sleeper/process()
+	..()
+	check_nap_violations()
+
+/obj/machinery/sleeper/nap_violation(mob/violator)
+	open_machine()
+
 /obj/machinery/sleeper/ui_data()
 	var/list/data = list()
 	var/chemical_list = list()
@@ -250,7 +259,7 @@
 		data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
 		data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss()
 		data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN)
-		
+
 		if(mob_occupant.reagents.reagent_list.len)
 			for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)
 				chemical_list += list(list("name" = R.name, "volume" = R.volume))
@@ -290,7 +299,7 @@
 	if(..())
 		return
 	var/mob/living/mob_occupant = occupant
-
+	check_nap_violations()
 	switch(action)
 		if("door")
 			if(state_open)

code/game/machinery/_machinery.dm

@@ -121,6 +121,10 @@ Class Procs:
 
 	var/interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE
 
+	var/fair_market_price = 69
+	var/market_verb = "Customer"
+	var/payment_department = ACCOUNT_ENG
+
 /obj/machinery/Initialize()
 	if(!armor)
 		armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 70)
@@ -248,6 +252,36 @@ Class Procs:
 				return FALSE
 	return TRUE
 
+/obj/machinery/proc/check_nap_violations()
+	if(!SSeconomy.full_ancap)
+		return TRUE
+	if(occupant && !state_open)
+		if(ishuman(occupant))
+			var/mob/living/carbon/human/H = occupant
+			var/obj/item/card/id/I = H.get_idcard()
+			if(I)
+				var/datum/bank_account/insurance = I.registered_account
+				if(!insurance)
+					say("[market_verb] NAP Violation: No bank account found.")
+					nap_violation()
+					return FALSE
+				else
+					if(!insurance.adjust_money(-fair_market_price))
+						say("[market_verb] NAP Violation: Unable to pay.")
+						nap_violation()
+						return FALSE
+					var/datum/bank_account/D = SSeconomy.get_dep_account(payment_department)
+					if(D)
+						D.adjust_money(fair_market_price)
+			else
+				say("[market_verb] NAP Violation: No ID card found.")
+				nap_violation()
+				return FALSE
+	return TRUE
+
+/obj/machinery/proc/nap_violation(mob/violator)
+	return
+
 ////////////////////////////////////////////////////////////////////////////////////////////
 
 //Return a non FALSE value to interrupt attack_hand propagation to subtypes.

code/game/machinery/autolathe.dm

@@ -30,6 +30,8 @@
 	var/list/datum/design/matching_designs
 	var/selected_category
 	var/screen = 1
+	var/base_price = 25
+	var/hacked_price = 50
 
 	var/datum/techweb/specialized/autounlocking/stored_research = /datum/techweb/specialized/autounlocking/autolathe
 	var/list/categories = list(

code/game/machinery/bank_machine.dm

@@ -8,6 +8,7 @@
 	var/obj/item/radio/radio
 	var/radio_channel = RADIO_CHANNEL_COMMON
 	var/minimum_time_between_warnings = 400
+	var/syphoning_credits = 0
 
 /obj/machinery/computer/bank_machine/Initialize()
 	. = ..()
@@ -25,9 +26,14 @@
 	if(istype(I, /obj/item/stack/spacecash))
 		var/obj/item/stack/spacecash/C = I
 		value = C.value * C.amount
+	else if(istype(I, /obj/item/holochip))
+		var/obj/item/holochip/H = I
+		value = H.credits
 	if(value)
-		SSshuttle.points += value
-		to_chat(user, "<span class='notice'>You deposit [I]. The station now has [SSshuttle.points] credits.</span>")
+		var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+		if(D)
+			D.adjust_money(value)
+			to_chat(user, "<span class='notice'>You deposit [I]. The Cargo Budget is now [D.account_balance] cr.</span>")
 		qdel(I)
 		return
 	return ..()
@@ -38,14 +44,16 @@
 	if(siphoning)
 		if (stat & (BROKEN|NOPOWER))
 			say("Insufficient power. Halting siphon.")
-			siphoning =	FALSE
-		if(SSshuttle.points < 200)
-			say("Station funds depleted. Halting siphon.")
-			siphoning = FALSE
-		else
-			new /obj/item/stack/spacecash/c200(drop_location()) // will autostack
-			playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1)
-			SSshuttle.points -= 200
+			end_syphon()
+		var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+		if(!D.has_money(200))
+			say("Cargo budget depleted. Halting siphon.")
+			end_syphon()
+			return
+
+		playsound(src.loc, 'sound/items/poster_being_created.ogg', 100, 1)
+		syphoning_credits += 200
+		D.adjust_money(-200)
 		if(next_warning < world.time && prob(15))
 			var/area/A = get_area(loc)
 			var/message = "Unauthorized credit withdrawal underway in [A.map_name]!!"
@@ -61,7 +69,8 @@
 
 /obj/machinery/computer/bank_machine/ui_data(mob/user)
 	var/list/data = list()
-	data["current_balance"] = SSshuttle.points
+	var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+	data["current_balance"] = D.account_balance
 	data["siphoning"] = siphoning
 	data["station_name"] = station_name()
 
@@ -78,5 +87,10 @@
 			. = TRUE
 		if("halt")
 			say("Station credit withdrawal halted.")
-			siphoning = FALSE
+			end_syphon()
 			. = TRUE
+
+/obj/machinery/computer/bank_machine/proc/end_syphon()
+	siphoning = FALSE
+	new /obj/item/holochip(drop_location(), syphoning_credits) //get the loot
+	syphoning_credits = 0

code/game/machinery/cloning.dm

@@ -37,6 +37,9 @@
 
 	var/list/unattached_flesh
 	var/flesh_number = 0
+	var/datum/bank_account/current_insurance
+	fair_market_price = 5 // He nodded, because he knew I was right. Then he swiped his credit card to pay me for arresting him.
+	payment_department = ACCOUNT_MED
 
 /obj/machinery/clonepod/Initialize()
 	. = ..()
@@ -106,7 +109,7 @@
 	return examine(user)
 
 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, datum/species/mrace, list/features, factions, list/quirks)
+/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, mutation_index, mindref, datum/species/mrace, list/features, factions, list/quirks, datum/bank_account/insurance)
 	if(panel_open)
 		return FALSE
 	if(mess || attempting)
@@ -136,7 +139,7 @@
 		mess = TRUE
 		update_icon()
 		return FALSE
-
+	current_insurance = insurance
 	attempting = TRUE //One at a time!!
 	countdown.start()
 
@@ -199,15 +202,29 @@
 			connected_message("Clone Ejected: Loss of power.")
 
 	else if(mob_occupant && (mob_occupant.loc == src))
-		if((mob_occupant.stat == DEAD) || (mob_occupant.suiciding) || mob_occupant.hellbound)  //Autoeject corpses and suiciding dudes.
-			connected_message("Clone Rejected: Deceased.")
+		if(SSeconomy.full_ancap)
+			if(!current_insurance)
+				go_out()
+				connected_message("Clone Ejected: No bank account.")
+				if(internal_radio)
+					SPEAK("The cloning of [mob_occupant.real_name] has been terminated due to no bank account to draw payment from.")
+			else if(!current_insurance.adjust_money(-fair_market_price))
+				go_out()
+				connected_message("Clone Ejected: Out of Money.")
+				if(internal_radio)
+					SPEAK("The cloning of [mob_occupant.real_name] has been ended prematurely due to being unable to pay.")
+			else
+				var/datum/bank_account/D = SSeconomy.get_dep_account(payment_department)
+				if(D)
+					D.adjust_money(fair_market_price)
+		if(mob_occupant && (mob_occupant.stat == DEAD) || (mob_occupant.suiciding) || mob_occupant.hellbound)  //Autoeject corpses and suiciding dudes.			connected_message("Clone Rejected: Deceased.")
 			if(internal_radio)
 				SPEAK("The cloning has been \
 					aborted due to unrecoverable tissue failure.")
 			go_out()
 			mob_occupant.copy_from_prefs_vr()
 
-		else if(mob_occupant.cloneloss > (100 - heal_level))
+		else if(mob_occupant && mob_occupant.cloneloss > (100 - heal_level))
 			mob_occupant.Unconscious(80)
 			var/dmg_mult = CONFIG_GET(number/damage_multiplier)
 			 //Slowly get that clone healed and finished.
@@ -234,7 +251,7 @@
 
 			use_power(7500) //This might need tweaking.
 
-		else if((mob_occupant.cloneloss <= (100 - heal_level)))
+		else if((mob_occupant && mob_occupant.cloneloss <= (100 - heal_level)))
 			connected_message("Cloning Process Complete.")
 			if(internal_radio)
 				SPEAK("The cloning cycle is complete.")
@@ -343,7 +360,7 @@
 
 	if(!mob_occupant)
 		return
-
+	current_insurance = null
 	REMOVE_TRAIT(mob_occupant, TRAIT_STABLEHEART, CLONING_POD_TRAIT)
 	REMOVE_TRAIT(mob_occupant, TRAIT_MUTATION_STASIS, CLONING_POD_TRAIT)
 	REMOVE_TRAIT(mob_occupant, TRAIT_STABLELIVER, CLONING_POD_TRAIT)

code/game/machinery/computer/arcade/orion_trail.dm

@@ -117,7 +117,7 @@
 			if(food <= 0)
 				dat += "<br>You ran out of food and starved."
 				if(obj_flags & EMAGGED)
-					user.nutrition = 0 //yeah you pretty hongry
+					user.set_nutrition(0) //yeah you pretty hongry
 					to_chat(user, "<span class='userdanger'>Your body instantly contracts to that of one who has not eaten in months. Agonizing cramps seize you as you fall to the floor.</span>")
 			if(fuel <= 0)
 				dat += "<br>You ran out of fuel, and drift, slowly, into a star."

code/game/machinery/computer/card.dm

@@ -467,7 +467,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 						to_chat(usr, "<span class='alert'>No log exists for this job.</span>")
 						updateUsrDialog()
 						return
-
+					if(inserted_modify_id.registered_account)
+						inserted_modify_id.registered_account.account_job = jobdatum // this is a terrible idea and people will grief but sure whatever
 					inserted_modify_id.access = ( istype(src, /obj/machinery/computer/card/centcom) ? get_centcom_access(t1) : jobdatum.get_access() )
 				if (inserted_modify_id)
 					inserted_modify_id.assignment = t1

code/game/machinery/computer/cloning.dm

@@ -73,7 +73,7 @@
 		if(pod.occupant)
 			continue	//how though?
 
-		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"]))
+		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["quirks"], R.fields["bank_account"]))
 			temp = "[R.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 			records -= R
 
@@ -415,7 +415,7 @@
 			else if(pod.occupant)
 				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"]))
+			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["quirks"], C.fields["bank_account"]))
 				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 				records.Remove(C)
@@ -441,9 +441,13 @@
 /obj/machinery/computer/cloning/proc/scan_occupant(occupant)
 	var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
 	var/datum/dna/dna
+	var/datum/bank_account/has_bank_account
 	if(ishuman(mob_occupant))
 		var/mob/living/carbon/C = mob_occupant
 		dna = C.has_dna()
+		var/obj/item/card/id/I = C.get_idcard()
+		if(I)
+			has_bank_account = I.registered_account
 	if(isbrain(mob_occupant))
 		var/mob/living/brain/B = mob_occupant
 		dna = B.stored_dna
@@ -468,7 +472,10 @@
 		scantemp = "<font class='average'>Subject already in database.</font>"
 		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
 		return
-
+	if(SSeconomy.full_ancap && !has_bank_account)
+		scantemp = "<font class='average'>Subject is either missing an ID card with a bank account on it, or does not have an account to begin with. Please ensure the ID card is on the body before attempting to scan.</font>"
+		playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+		return
 	var/datum/data/record/R = new()
 	if(dna.species)
 		// We store the instance rather than the path, because some
@@ -490,6 +497,7 @@
 	R.fields["features"] = dna.features
 	R.fields["factions"] = mob_occupant.faction
 	R.fields["quirks"] = list()
+	R.fields["bank_account"] = has_bank_account
 	for(var/V in mob_occupant.roundstart_quirks)
 		var/datum/quirk/T = V
 		R.fields["quirks"][T.type] = T.clone_data()

code/game/machinery/computer/communications.dm

@@ -61,7 +61,7 @@
 		// main interface
 		if("main")
 			state = STATE_DEFAULT
-			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 		if("login")
 			var/mob/M = usr
 
@@ -71,21 +71,21 @@
 				if(check_access(I))
 					authenticated = 1
 					auth_id = "[I.registered_name] ([I.assignment])"
-					if((ACCESS_CAPTAIN in I.access))
+					if((20 in I.access))
 						authenticated = 2
-					playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
+					playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
 				if(obj_flags & EMAGGED)
 					authenticated = 2
 					auth_id = "Unknown"
 					to_chat(M, "<span class='warning'>[src] lets out a quiet alarm as its login is overridden.</span>")
-					playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
-					playsound(src, 'sound/machines/terminal_alert.ogg', 25, 0)
+					playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
+					playsound(src, 'sound/machines/terminal_alert.ogg', 25, FALSE)
 					if(prob(25))
 						for(var/mob/living/silicon/ai/AI in active_ais())
 							SEND_SOUND(AI, sound('sound/machines/terminal_alert.ogg', volume = 10)) //Very quiet for balance reasons
 		if("logout")
 			authenticated = 0
-			playsound(src, 'sound/machines/terminal_off.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_off.ogg', 50, FALSE)
 
 		if("swipeidseclevel")
 			var/mob/M = usr
@@ -109,7 +109,7 @@
 					security_level_cd = world.time + 15 SECONDS
 					if(GLOB.security_level != old_level)
 						to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>")
-						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+						playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 						//Only notify people if an actual change happened
 						var/security_level = NUM2SECLEVEL(GLOB.security_level)
 						log_game("[key_name(usr)] has changed the security level to [security_level] with [src] at [AREACOORD(usr)].")
@@ -118,29 +118,34 @@
 					tmp_alertlevel = 0
 				else
 					to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 					tmp_alertlevel = 0
 				state = STATE_DEFAULT
 			else
 				to_chat(usr, "<span class='warning'>You need to swipe your ID!</span>")
-				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 
 		if("announce")
 			if(authenticated==2)
-				playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 				make_announcement(usr)
 
 		if("crossserver")
 			if(authenticated==2)
+				var/dest = href_list["cross_dest"]
 				if(!checkCCcooldown())
-					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 					return
-				var/input = stripped_multiline_input(usr, "Please choose a message to transmit to allied stations.  Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
+				var/warning = dest == "all" ? "Please choose a message to transmit to allied stations." : "Please choose a message to transmit to [dest] sector station."
+				var/input = stripped_multiline_input(usr, "[warning]  Please be aware that this process is very expensive, and abuse will lead to... termination.", "Send a message to an allied station.", "")
 				if(!input || !(usr in view(1,src)) || !checkCCcooldown())
 					return
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-				send2otherserver("[station_name()]", input,"Comms_Console")
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
+				if(dest == "all")
+					send2otherserver("[station_name()]", input,"Comms_Console")
+				else
+					send2otherserver("[station_name()]", input,"Comms_Console", list(dest))
 				minor_announce(input, title = "Outgoing message to allied station")
 				usr.log_talk(input, LOG_SAY, tag="message to the other server")
 				message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server.")
@@ -156,30 +161,34 @@
 				var/datum/map_template/shuttle/S = locate(href_list["chosen_shuttle"]) in shuttles
 				if(S && istype(S))
 					if(SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_IDLE)
-						to_chat(usr, "It's a bit late to buy a new shuttle, don't you think?")
+						to_chat(usr, "<span class='alert'>It's a bit late to buy a new shuttle, don't you think?</span>")
 						return
 					if(SSshuttle.shuttle_purchased)
-						to_chat(usr, "A replacement shuttle has already been purchased.")
+						to_chat(usr, "<span class='alert'>A replacement shuttle has already been purchased.</span>")
 					else if(!S.prerequisites_met())
-						to_chat(usr, "You have not met the requirements for purchasing this shuttle.")
+						to_chat(usr, "<span class='alert'>You have not met the requirements for purchasing this shuttle.</span>")
 					else
-						if(SSshuttle.points >= S.credit_cost)
+						var/points_to_check
+						var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+						if(D)
+							points_to_check = D.account_balance
+						if(points_to_check >= S.credit_cost)
 							SSshuttle.shuttle_purchased = TRUE
 							SSshuttle.unload_preview()
 							SSshuttle.load_template(S)
 							SSshuttle.existing_shuttle = SSshuttle.emergency
 							SSshuttle.action_load(S)
-							SSshuttle.points -= S.credit_cost
-							minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
+							D.adjust_money(-S.credit_cost)
+							minor_announce("[usr.real_name] has purchased [S.name] for [S.credit_cost] credits.[S.extra_desc ? " [S.extra_desc]" : ""]" , "Shuttle Purchase")
 							message_admins("[ADMIN_LOOKUPFLW(usr)] purchased [S.name].")
 							log_shuttle("[key_name(usr)] has purchased [S.name].")
 							SSblackbox.record_feedback("text", "shuttle_purchase", 1, "[S.name]")
 						else
-							to_chat(usr, "Not enough credits.")
+							to_chat(usr, "<span class='alert'>Insufficient credits.</span>")
 
 		if("callshuttle")
 			state = STATE_DEFAULT
-			if(authenticated)
+			if(authenticated && SSshuttle.canEvac(usr))
 				state = STATE_CALLSHUTTLE
 		if("callshuttle2")
 			if(authenticated)
@@ -260,7 +269,7 @@
 
 		// Status display stuff
 		if("setstat")
-			playsound(src, "terminal_type", 50, 0)
+			playsound(src, "terminal_type", 50, FALSE)
 			switch(href_list["statdisp"])
 				if("message")
 					post_status("message", stat_msg1, stat_msg2)
@@ -280,12 +289,12 @@
 		if("MessageCentCom")
 			if(authenticated)
 				if(!checkCCcooldown())
-					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
+					to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
 					return
 				var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response.", "Send a message to CentCom.", "")
 				if(!input || !(usr in view(1,src)) || !checkCCcooldown())
 					return
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 				CentCom_announce(input, usr)
 				to_chat(usr, "<span class='notice'>Message transmitted to Central Command.</span>")
 				for(var/client/X in GLOB.admins)
@@ -298,15 +307,15 @@
 
 		// OMG SYNDICATE ...LETTERHEAD
 		if("MessageSyndicate")
-			if((authenticated==2) && (obj_flags & EMAGGED))
+			if((authenticated) && (obj_flags & EMAGGED))
 				if(!checkCCcooldown())
-					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
-					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+					to_chat(usr, "<span class='warning'>Arrays recycling. Please stand by.</span>")
+					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
 					return
 				var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING COORDINATES\] via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "Send a message to /??????/.", "")
 				if(!input || !(usr in view(1,src)) || !checkCCcooldown())
 					return
-				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 				Syndicate_announce(input, usr)
 				to_chat(usr, "<span class='danger'>SYSERR @l(19833)of(transmit.dm): !@$ MESSAGE TRANSMITTED TO SYNDICATE COMMAND.</span>")
 				for(var/client/X in GLOB.admins)
@@ -319,7 +328,7 @@
 
 		if("RestoreBackup")
 			to_chat(usr, "<span class='notice'>Backup routing data restored!</span>")
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 			obj_flags &= ~EMAGGED
 			updateDialog()
 
@@ -333,8 +342,8 @@
 					return
 				Nuke_request(input, usr)
 				to_chat(usr, "<span class='notice'>Request sent.</span>")
-				usr.log_message("has requested the nuclear codes from CentCom", LOG_SAY)
-				priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested","commandreport")
+				usr.log_message("has requested the nuclear codes from CentCom with reason \"[input]\"", LOG_SAY)
+				priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/ai/commandreport.ogg')
 				CM.lastTimeUsed = world.time
 
 
@@ -440,8 +449,7 @@
 	if(authenticated == 1)
 		authenticated = 2
 	to_chat(user, "<span class='danger'>You scramble the communication routing circuits!</span>")
-	playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
-	return TRUE
+	playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
 
 /obj/machinery/computer/communications/ui_interact(mob/user)
 	. = ..()
@@ -506,16 +514,16 @@
 				dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=login'>Log In</A> \]"
 		if(STATE_CALLSHUTTLE)
 			dat += get_call_shuttle_form()
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 		if(STATE_CANCELSHUTTLE)
 			dat += get_cancel_shuttle_form()
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 		if(STATE_MESSAGELIST)
 			dat += "Messages:"
 			for(var/i in 1 to messages.len)
 				var/datum/comm_message/M = messages[i]
 				dat += "<BR><A HREF='?src=[REF(src)];operation=viewmessage;message-num=[i]'>[M.title]</A>"
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 		if(STATE_VIEWMESSAGE)
 			if (currmsg)
 				dat += "<B>[currmsg.title]</B><BR><BR>[currmsg.content]"
@@ -549,13 +557,12 @@
 			dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=redalert'>Red Alert</A> |"
 			dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=lockdown'>Lockdown</A> |"
 			dat += " <A HREF='?src=[REF(src)];operation=setstat;statdisp=alert;alert=biohazard'>Biohazard</A> \]<BR><HR>"
-			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
 		if(STATE_ALERT_LEVEL)
 			dat += "Current alert level: [NUM2SECLEVEL(GLOB.security_level)]<BR>"
 			if(GLOB.security_level == SEC_LEVEL_DELTA)
 				dat += "<font color='red'><b>The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate.</b></font>"
 			else
-				dat += "<A HREF='?src=[REF(src)];operation=securitylevel;newalertlevel=[SEC_LEVEL_AMBER]'>Amber</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=securitylevel;newalertlevel=[SEC_LEVEL_BLUE]'>Blue</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=securitylevel;newalertlevel=[SEC_LEVEL_GREEN]'>Green</A>"
 		if(STATE_CONFIRM_LEVEL)
@@ -563,7 +570,7 @@
 			dat += "Confirm the change to: [NUM2SECLEVEL(tmp_alertlevel)]<BR>"
 			dat += "<A HREF='?src=[REF(src)];operation=swipeidseclevel'>Swipe ID</A> to confirm change.<BR>"
 		if(STATE_TOGGLE_EMERGENCY)
-			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
+			playsound(src, 'sound/machines/terminal_prompt.ogg', 50, FALSE)
 			if(GLOB.emergency_access == 1)
 				dat += "<b>Emergency Maintenance Access is currently <font color='red'>ENABLED</font></b>"
 				dat += "<BR>Restore maintenance access restrictions? <BR>\[ <A HREF='?src=[REF(src)];operation=disableemergency'>OK</A> | <A HREF='?src=[REF(src)];operation=viewmessage'>Cancel</A> \]"
@@ -572,7 +579,8 @@
 				dat += "<BR>Lift access restrictions on maintenance and external airlocks? <BR>\[ <A HREF='?src=[REF(src)];operation=enableemergency'>OK</A> | <A HREF='?src=[REF(src)];operation=viewmessage'>Cancel</A> \]"
 
 		if(STATE_PURCHASE)
-			dat += "Budget: [SSshuttle.points] Credits.<BR>"
+			var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
+			dat += "Budget: [D.account_balance] Credits.<BR>"
 			dat += "<BR>"
 			dat += "<b>Caution: Purchasing dangerous shuttles may lead to mutiny and/or death.</b><br>"
 			dat += "<BR>"
@@ -696,7 +704,6 @@
 			if(GLOB.security_level == SEC_LEVEL_DELTA)
 				dat += "<font color='red'><b>The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate.</b></font>"
 			else
-				dat += "<A HREF='?src=[REF(src)];operation=ai-securitylevel;newalertlevel=[SEC_LEVEL_AMBER]'>Amber</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=ai-securitylevel;newalertlevel=[SEC_LEVEL_BLUE]'>Blue</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=ai-securitylevel;newalertlevel=[SEC_LEVEL_GREEN]'>Green</A>"
 
@@ -713,7 +720,7 @@
 
 /obj/machinery/computer/communications/proc/make_announcement(mob/living/user, is_silicon)
 	if(!SScommunications.can_announce(user, is_silicon))
-		to_chat(user, "Intercomms recharging. Please stand by.")
+		to_chat(user, "<span class='alert'>Intercomms recharging. Please stand by.</span>")
 		return
 	var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?")
 	if(!input || !user.canUseTopic(src))

code/game/machinery/doors/airlock_electronics.dm

@@ -1,6 +1,7 @@
 /obj/item/electronics/airlock
 	name = "airlock electronics"
 	req_access = list(ACCESS_MAINT_TUNNELS)
+	custom_price = 50
 
 	var/list/accesses = list()
 	var/one_access = 0

code/game/machinery/doors/firedoor.dm

@@ -260,6 +260,7 @@
 
 /obj/item/electronics/firelock
 	name = "firelock circuitry"
+	custom_price = 50
 	desc = "A circuit board used in construction of firelocks."
 	icon_state = "mainboard"
 

code/game/machinery/doppler_array.dm

@@ -174,9 +174,11 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
 		else
 			linked_techweb.largest_bomb_value = TECHWEB_BOMB_POINTCAP
 			point_gain = 1000
-
+		var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_SCI)
+		if(D)
+			D.adjust_money(point_gain)
 		linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain)
-		say("Gained [point_gain] points from explosion dataset.")
+		say("Explosion details and mixture analyzed and sold to the highest bidder for [point_gain] cr, with a reward of [point_gain] points.")
 
 	else //you've made smaller bombs
 		say("Data already captured. Aborting.")

code/game/machinery/firealarm.dm

@@ -2,6 +2,7 @@
 
 /obj/item/electronics/firealarm
 	name = "fire alarm electronics"
+	custom_price = 50
 	desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius."
 
 /obj/item/wallframe/firealarm

code/game/objects/effects/decals/cleanable/misc.dm

@@ -133,7 +133,7 @@
 			if(reagents)
 				for(var/datum/reagent/consumable/R in reagents.reagent_list)
 					if(R.nutriment_factor > 0)
-						H.nutrition += R.nutriment_factor * R.volume
+						H.adjust_nutrition(R.nutriment_factor * R.volume)
 						reagents.del_reagent(R.type)
 			reagents.trans_to(H, reagents.total_volume)
 			qdel(src)

code/game/objects/items/RCD.dm

@@ -154,6 +154,7 @@ RLD
 	icon_state = "rcd"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+	custom_price = 900
 	max_matter = 160
 	item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
 	has_ammobar = TRUE

code/game/objects/items/RSF.dm

@@ -41,24 +41,21 @@ RSF
 /obj/item/rsf/attack_self(mob/user)
 	playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
 	switch(mode)
+		if(5)
+			mode = 1
+			to_chat(user, "Changed dispensing mode to 'Drinking Glass'")
 		if(1)
 			mode = 2
-			to_chat(user, "Changed dispensing mode to 'Drinking Glass'")
+			to_chat(user, "Changed dispensing mode to 'Paper'")
 		if(2)
 			mode = 3
-			to_chat(user, "Changed dispensing mode to 'Paper'")
+			to_chat(user, "Changed dispensing mode to 'Pen'")
 		if(3)
 			mode = 4
-			to_chat(user, "Changed dispensing mode to 'Pen'")
+			to_chat(user, "Changed dispensing mode to 'Dice Pack'")
 		if(4)
 			mode = 5
-			to_chat(user, "Changed dispensing mode to 'Dice Pack'")
-		if(5)
-			mode = 6
 			to_chat(user, "Changed dispensing mode to 'Cigarette'")
-		if(6)
-			mode = 1
-			to_chat(user, "Changed dispensing mode to 'Dosh'")
 	// Change mode
 
 /obj/item/rsf/afterattack(atom/A, mob/user, proximity)
@@ -81,26 +78,22 @@ RSF
 	playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
 	switch(mode)
 		if(1)
-			to_chat(user, "Dispensing Dosh...")
-			new /obj/item/stack/spacecash/c10(T)
-			use_matter(200, user)
-		if(2)
 			to_chat(user, "Dispensing Drinking Glass...")
 			new /obj/item/reagent_containers/food/drinks/drinkingglass(T)
 			use_matter(20, user)
-		if(3)
+		if(2)
 			to_chat(user, "Dispensing Paper Sheet...")
 			new /obj/item/paper(T)
 			use_matter(10, user)
-		if(4)
+		if(3)
 			to_chat(user, "Dispensing Pen...")
 			new /obj/item/pen(T)
 			use_matter(50, user)
-		if(5)
+		if(4)
 			to_chat(user, "Dispensing Dice Pack...")
 			new /obj/item/storage/pill_bottle/dice(T)
 			use_matter(200, user)
-		if(6)
+		if(5)
 			to_chat(user, "Dispensing Cigarette...")
 			new /obj/item/clothing/mask/cigarette(T)
 			use_matter(10, user)

code/game/objects/items/cards_ids.dm

@@ -6,8 +6,6 @@
  *		FINGERPRINT CARD
  */
 
-
-
 /*
  * DATA CARDS - Used for the IC data card reader
  */
@@ -173,13 +171,22 @@
 	var/registered_name = null // The name registered_name on the card
 	var/assignment = null
 	var/access_txt // mapping aid
-
-
+	var/bank_support = ID_FREE_BANK_ACCOUNT
+	var/datum/bank_account/registered_account
+	var/obj/machinery/paystand/my_store
 
 /obj/item/card/id/Initialize(mapload)
 	. = ..()
 	if(mapload && access_txt)
 		access = text2access(access_txt)
+	switch(bank_support)
+		if(ID_FREE_BANK_ACCOUNT)
+			var/turf/T = get_turf(src)
+			if(T && is_vr_level(T.z)) //economy is exploitable on VR in so many ways.
+				bank_support = ID_NO_BANK_ACCOUNT
+		if(ID_LOCKED_BANK_ACCOUNT)
+			registered_account = new /datum/bank_account/remote/non_transferable(pick(GLOB.redacted_strings))
+
 
 /obj/item/card/id/vv_edit_var(var_name, var_value)
 	. = ..()
@@ -193,12 +200,150 @@
 		user.visible_message("<span class='notice'>[user] shows you: [icon2html(src, viewers(user))] [src.name].</span>", \
 					"<span class='notice'>You show \the [src.name].</span>")
 		add_fingerprint(user)
+
+/obj/item/card/id/attackby(obj/item/W, mob/user, params)
+	if(!bank_support)
+		return ..()
+	if(istype(W, /obj/item/holochip))
+		insert_money(W, user)
+	else if(istype(W, /obj/item/stack/spacecash) || istype(W, /obj/item/coin))
+		insert_money(W, user, TRUE)
+	else if(istype(W, /obj/item/storage/bag/money))
+		var/obj/item/storage/bag/money/money_bag = W
+		var/list/money_contained = money_bag.contents
+		var/money_added = mass_insert_money(money_contained, user)
+		if (money_added)
+			to_chat(user, "<span class='notice'>You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.</span>")
+	else
+		return ..()
+
+/obj/item/card/id/proc/insert_money(obj/item/I, mob/user, physical_currency)
+	var/cash_money = I.get_item_credit_value()
+	if(!cash_money)
+		to_chat(user, "<span class='warning'>[I] doesn't seem to be worth anything!</span>")
 		return
 
+	if(!registered_account)
+		to_chat(user, "<span class='warning'>[src] doesn't have a linked account to deposit [I] into!</span>")
+		return
+
+	registered_account.adjust_money(cash_money)
+	if(physical_currency)
+		to_chat(user, "<span class='notice'>You stuff [I] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account.</span>")
+	else
+		to_chat(user, "<span class='notice'>You insert [I] into [src], adding [cash_money] credits to the linked account.</span>")
+
+	to_chat(user, "<span class='notice'>The linked account now reports a balance of [registered_account.account_balance] cr.</span>")
+	qdel(I)
+
+/obj/item/card/id/proc/mass_insert_money(list/money, mob/user)
+	if (!money || !money.len)
+		return FALSE
+
+	var/total = 0
+
+	for (var/obj/item/physical_money in money)
+		var/cash_money = physical_money.get_item_credit_value()
+
+		total += cash_money
+
+		registered_account.adjust_money(cash_money)
+
+	QDEL_LIST(money)
+
+	return total
+
+/obj/item/card/id/proc/alt_click_can_use_id(mob/living/user)
+	if(!isliving(user))
+		return
+	if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+
+	return TRUE
+
+// Returns true if new account was set.
+/obj/item/card/id/proc/set_new_account(mob/living/user)
+	if(bank_support != ID_FREE_BANK_ACCOUNT)
+		to_chat(user, "<span class='warning'>This ID has no modular banking support whatsover, must be an older model...</span>")
+		return
+	. = FALSE
+	var/datum/bank_account/old_account = registered_account
+
+	var/new_bank_id = input(user, "Enter your account ID number.", "Account Reclamation", 111111) as num | null
+
+	if (isnull(new_bank_id))
+		return
+
+	if(!alt_click_can_use_id(user))
+		return
+	if(!new_bank_id || new_bank_id < 111111 || new_bank_id > 999999)
+		to_chat(user, "<span class='warning'>The account ID number needs to be between 111111 and 999999.</span>")
+		return
+	if (registered_account && registered_account.account_id == new_bank_id)
+		to_chat(user, "<span class='warning'>The account ID was already assigned to this card.</span>")
+		return
+
+	for(var/A in SSeconomy.bank_accounts)
+		var/datum/bank_account/B = A
+		if(B.account_id == new_bank_id)
+			if (old_account)
+				old_account.bank_cards -= src
+
+			B.bank_cards += src
+			registered_account = B
+			to_chat(user, "<span class='notice'>The provided account has been linked to this ID card.</span>")
+
+			return TRUE
+
+	to_chat(user, "<span class='warning'>The account ID number provided is invalid.</span>")
+	return
+
+/obj/item/card/id/AltClick(mob/living/user)
+	. = ..()
+	if(!bank_support || !alt_click_can_use_id(user))
+		return
+
+	if(!registered_account && bank_support == ID_FREE_BANK_ACCOUNT)
+		set_new_account(user)
+		return
+
+	if (world.time < registered_account.withdrawDelay)
+		registered_account.bank_card_talk("<span class='warning'>ERROR: UNABLE TO LOGIN DUE TO SCHEDULED MAINTENANCE. MAINTENANCE IS SCHEDULED TO COMPLETE IN [(registered_account.withdrawDelay - world.time)/10] SECONDS.</span>", TRUE)
+		return
+
+	var/amount_to_remove =  FLOOR(input(user, "How much do you want to withdraw? Current Balance: [registered_account.account_balance]", "Withdraw Funds", 5) as num|null, 1)
+
+	if(!amount_to_remove || amount_to_remove < 0)
+		return
+	if(!alt_click_can_use_id(user))
+		return
+	if(registered_account.adjust_money(-amount_to_remove))
+		var/obj/item/holochip/holochip = new (user.drop_location(), amount_to_remove)
+		user.put_in_hands(holochip)
+		to_chat(user, "<span class='notice'>You withdraw [amount_to_remove] credits into a holochip.</span>")
+		return
+	else
+		var/difference = amount_to_remove - registered_account.account_balance
+		registered_account.bank_card_talk("<span class='warning'>ERROR: The linked account requires [difference] more credit\s to perform that withdrawal.</span>", TRUE)
+
 /obj/item/card/id/examine(mob/user)
 	. = ..()
 	if(mining_points)
 		. += "There's [mining_points] mining equipment redemption point\s loaded onto this card."
+	if(!bank_support || (bank_support == ID_LOCKED_BANK_ACCOUNT && !registered_account))
+		. += "<span class='info'>This ID has no banking support whatsover, must be an older model...</span>"
+	else if(registered_account)
+		. += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr."
+		if(registered_account.account_job)
+			var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department)
+			if(D)
+				. += "The [D.account_holder] reports a balance of [D.account_balance] cr."
+		. += "<span class='info'>Alt-Click the ID to pull money from the linked account in the form of holochips.</span>"
+		. += "<span class='info'>You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.</span>"
+		if(registered_account.account_holder == user.real_name)
+			. += "<span class='boldnotice'>If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your account ID number.</span>"
+	else
+		. += "<span class='info'>There is no registered account linked to this card. Alt-Click to add one.</span>"
 
 /obj/item/card/id/GetAccess()
 	return access
@@ -280,8 +425,12 @@ update_label("John Doe", "Clowny")
 			else
 				return ..()
 
-		var/popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset")
-		if(user.incapacitated())
+		var/popup_input
+		if(bank_support == ID_FREE_BANK_ACCOUNT)
+			popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset", "Change Account ID")
+		else
+			popup_input = alert(user, "Choose Action", "Agent ID", "Show", "Forge/Reset")
+		if(!user.canUseTopic(src, BE_CLOSE, FALSE))
 			return
 		if(popup_input == "Forge/Reset" && !forged)
 			var/input_name = stripped_input(user, "What name would you like to put on this card? Leave blank to randomise.", "Agent card name", registered_name ? registered_name : (ishuman(user) ? user.real_name : user.name), MAX_NAME_LEN)
@@ -304,6 +453,18 @@ update_label("John Doe", "Clowny")
 			forged = TRUE
 			to_chat(user, "<span class='notice'>You successfully forge the ID card.</span>")
 			log_game("[key_name(user)] has forged \the [initial(name)] with name \"[registered_name]\" and occupation \"[assignment]\".")
+
+			// First time use automatically sets the account id to the user.
+			if (first_use && !registered_account)
+				if(ishuman(user))
+					var/mob/living/carbon/human/accountowner = user
+
+					for(var/bank_account in SSeconomy.bank_accounts)
+						var/datum/bank_account/account = bank_account
+						if(account.account_id == accountowner.account_id)
+							account.bank_cards += src
+							registered_account = account
+							to_chat(user, "<span class='notice'>Your account number has been automatically assigned.</span>")
 			return
 		else if (popup_input == "Forge/Reset" && forged)
 			registered_name = initial(registered_name)
@@ -313,6 +474,9 @@ update_label("John Doe", "Clowny")
 			forged = FALSE
 			to_chat(user, "<span class='notice'>You successfully reset the ID card.</span>")
 			return
+		else if (popup_input == "Change Account ID")
+			set_new_account(user)
+			return
 	return ..()
 
 /obj/item/card/id/syndicate/anyone
@@ -329,6 +493,15 @@ update_label("John Doe", "Clowny")
 	assignment = "Syndicate Overlord"
 	access = list(ACCESS_SYNDICATE)
 
+/obj/item/card/id/no_banking
+	bank_support = ID_NO_BANK_ACCOUNT
+
+/obj/item/card/id/locked_banking
+	bank_support = ID_LOCKED_BANK_ACCOUNT
+
+/obj/item/card/id/syndicate/locked_banking
+	bank_support = ID_LOCKED_BANK_ACCOUNT
+
 /obj/item/card/id/captains_spare
 	name = "captain's spare ID"
 	desc = "The spare ID of the High Lord himself."
@@ -516,6 +689,34 @@ update_label("John Doe", "Clowny")
 	desc = "A special ID card that allows access to APC terminals."
 	access = list(ACCESS_ENGINE_EQUIP)
 
+/obj/item/card/id/departmental_budget
+	name = "departmental card (FUCK)"
+	desc = "Provides access to the departmental budget."
+	var/department_ID = ACCOUNT_CIV
+	var/department_name = ACCOUNT_CIV_NAME
+
+/obj/item/card/id/departmental_budget/Initialize()
+	. = ..()
+	var/datum/bank_account/B = SSeconomy.get_dep_account(department_ID)
+	if(B)
+		registered_account = B
+		if(!B.bank_cards.Find(src))
+			B.bank_cards += src
+		name = "departmental card ([department_name])"
+		desc = "Provides access to the [department_name]."
+	SSeconomy.dep_cards += src
+
+/obj/item/card/id/departmental_budget/Destroy()
+	SSeconomy.dep_cards -= src
+	return ..()
+
+/obj/item/card/id/departmental_budget/update_label()
+	return
+
+/obj/item/card/id/departmental_budget/car
+	department_ID = ACCOUNT_CAR
+	department_name = ACCOUNT_CAR_NAME
+
 //Polychromatic Knight Badge
 
 /obj/item/card/id/knight
@@ -578,5 +779,5 @@ update_label("John Doe", "Clowny")
 
 /obj/item/card/id/debug/Initialize()
 	access = get_all_accesses()+get_all_centcom_access()+get_all_syndicate_access()
+	registered_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
 	. = ..()
-

code/game/objects/items/cigs_lighters.dm

@@ -506,6 +506,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	resistance_flags = FIRE_PROOF
 	light_color = LIGHT_COLOR_FIRE
 	grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
+	custom_price = 55
 
 /obj/item/lighter/Initialize()
 	. = ..()
@@ -710,7 +711,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	item_state = "black_vape"
 	w_class = WEIGHT_CLASS_TINY
 	var/chem_volume = 100
-	var/vapetime = FALSE //this so it won't puff out clouds every tick 
+	var/vapetime = FALSE //this so it won't puff out clouds every tick
 	var/screw = FALSE // kinky
 	var/super = FALSE //for the fattest vapes dude.
 

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -229,10 +229,11 @@
 	def_components = list(/obj/item/stack/ore/bluespace_crystal = /obj/item/stack/ore/bluespace_crystal/artificial)
 
 /obj/item/circuitboard/machine/vendor
-	name = "Booze-O-Mat Vendor (Machine Board)"
+	name = "Custom Vendor (Machine Board)"
 	desc = "You can turn the \"brand selection\" dial using a screwdriver."
-	build_path = /obj/machinery/vending/boozeomat
-	req_components = list(/obj/item/vending_refill/boozeomat = 1)
+	custom_premium_price = 100
+	build_path = /obj/machinery/vending/custom
+	req_components = list(/obj/item/vending_refill/custom = 1)
 
 	var/static/list/vending_names_paths = list(
 		/obj/machinery/vending/boozeomat = "Booze-O-Mat",
@@ -269,7 +270,8 @@
 		/obj/machinery/vending/wardrobe/viro_wardrobe = "ViroDrobe",
 		/obj/machinery/vending/clothing = "ClothesMate",
 		/obj/machinery/vending/medical = "NanoMed Plus",
-		/obj/machinery/vending/wallmed = "NanoMed")
+		/obj/machinery/vending/wallmed = "NanoMed",
+		/obj/machinery/vending/custom = "Custom Vendor")
 
 /obj/item/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/screwdriver))
@@ -1040,6 +1042,11 @@
 	build_path = /obj/machinery/ore_silo
 	req_components = list()
 
+/obj/item/circuitboard/machine/paystand
+	name = "Pay Stand (Machine Board)"
+	build_path = /obj/machinery/paystand
+	req_components = list()
+
 /obj/item/circuitboard/machine/autobottler
 	name = "Auto-Bottler (Machine Board)"
 	build_path = /obj/machinery/rnd/production/protolathe/department/autobottler //Manips make you print things cheaper, even chems

code/game/objects/items/crab17.dm

@@ -0,0 +1,229 @@
+/obj/item/suspiciousphone
+	name = "suspicious phone"
+	desc = "This device raises pink levels to unknown highs."
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "suspiciousphone"
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("dumped")
+	var/dumped = FALSE
+
+/obj/item/suspiciousphone/attack_self(mob/user)
+	if(!ishuman(user))
+		to_chat(user, "<span class='warning'>This device is too advanced for you!</span>")
+		return
+	if(dumped)
+		to_chat(user, "<span class='warning'>You already activated Protocol CRAB-17.</span>")
+		return FALSE
+	if(alert(user, "Are you sure you want to crash this market with no survivors?", "Protocol CRAB-17", "Yes", "No") == "Yes")
+		if(dumped || QDELETED(src)) //Prevents fuckers from cheesing alert
+			return FALSE
+		var/turf/targetturf = get_safe_random_station_turf()
+		if (!targetturf)
+			return FALSE
+		new /obj/effect/dumpeetTarget(targetturf, user)
+		dumped = TRUE
+
+/obj/structure/checkoutmachine
+	name = "\improper Nanotrasen Space-Coin Market"
+	desc = "This is good for spacecoin because"
+	icon = 'icons/obj/money_machine.dmi'
+	icon_state = "bogdanoff"
+	layer = LARGE_MOB_LAYER
+	armor = list("melee" = 80, "bullet" = 30, "laser" = 30, "energy" = 60, "bomb" = 90, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
+	density = TRUE
+	pixel_z = -8
+	max_integrity = 5000
+	var/list/accounts_to_rob
+	var/mob/living/carbon/human/bogdanoff
+	var/canwalk = FALSE
+
+/obj/structure/checkoutmachine/examine(mob/living/user)
+	. = ..()
+	. += "<span class='info'>It's integrated integrity meter reads: <b>HEALTH: [obj_integrity]</b>.</span>"
+
+/obj/structure/checkoutmachine/proc/check_if_finished()
+	for(var/i in accounts_to_rob)
+		var/datum/bank_account/B = i
+		if (B.being_dumped)
+			return FALSE
+	return TRUE
+
+/obj/structure/checkoutmachine/attackby(obj/item/W, mob/user, params)
+	if(check_if_finished())
+		qdel(src)
+		return
+	if(istype(W, /obj/item/card/id))
+		var/obj/item/card/id/card = W
+		if(!card.registered_account)
+			to_chat(user, "<span class='warning'>This card does not have a registered account!</span>")
+			return
+		if(!card.registered_account.being_dumped)
+			to_chat(user, "<span class='warning'>It appears that your funds are safe from draining!</span>")
+			return
+		if(do_after(user, 40, target = src))
+			if(!card.registered_account.being_dumped)
+				return
+			to_chat(user, "<span class='warning'>You quickly cash out your funds to a more secure banking location. Funds are safu.</span>") // This is a reference and not a typo
+			card.registered_account.being_dumped = FALSE
+			card.registered_account.withdrawDelay = 0
+			if(check_if_finished())
+				qdel(src)
+				return
+	else
+		return ..()
+
+/obj/structure/checkoutmachine/Initialize(mapload, mob/living/user)
+	. = ..()
+	bogdanoff = user
+	add_overlay("flaps")
+	add_overlay("hatch")
+	add_overlay("legs_retracted")
+	addtimer(CALLBACK(src, .proc/startUp), 50)
+	QDEL_IN(src, 8 MINUTES) //Self destruct after 8 min
+
+
+/obj/structure/checkoutmachine/proc/startUp() //very VERY snowflake code that adds a neat animation when the pod lands.
+	start_dumping() //The machine doesnt move during this time, giving people close by a small window to grab their funds before it starts running around
+	sleep(10)
+	if(QDELETED(src))
+		return
+	playsound(src, 'sound/machines/click.ogg', 15, TRUE, -3)
+	cut_overlay("flaps")
+	sleep(10)
+	if(QDELETED(src))
+		return
+	playsound(src, 'sound/machines/click.ogg', 15, TRUE, -3)
+	cut_overlay("hatch")
+	sleep(30)
+	if(QDELETED(src))
+		return
+	playsound(src,'sound/machines/twobeep.ogg',50,FALSE)
+	var/mutable_appearance/hologram = mutable_appearance(icon, "hologram")
+	hologram.pixel_y = 16
+	add_overlay(hologram)
+	var/mutable_appearance/holosign = mutable_appearance(icon, "holosign")
+	holosign.pixel_y = 16
+	add_overlay(holosign)
+	add_overlay("legs_extending")
+	cut_overlay("legs_retracted")
+	pixel_z += 4
+	sleep(5)
+	if(QDELETED(src))
+		return
+	add_overlay("legs_extended")
+	cut_overlay("legs_extending")
+	pixel_z += 4
+	sleep(20)
+	if(QDELETED(src))
+		return
+	add_overlay("screen_lines")
+	sleep(5)
+	if(QDELETED(src))
+		return
+	cut_overlay("screen_lines")
+	sleep(5)
+	if(QDELETED(src))
+		return
+	add_overlay("screen_lines")
+	add_overlay("screen")
+	sleep(5)
+	if(QDELETED(src))
+		return
+	playsound(src,'sound/machines/triple_beep.ogg',50,FALSE)
+	add_overlay("text")
+	sleep(10)
+	if(QDELETED(src))
+		return
+	add_overlay("legs")
+	cut_overlay("legs_extended")
+	cut_overlay("screen")
+	add_overlay("screen")
+	cut_overlay("screen_lines")
+	add_overlay("screen_lines")
+	cut_overlay("text")
+	add_overlay("text")
+	canwalk = TRUE
+	START_PROCESSING(SSfastprocess, src)
+
+/obj/structure/checkoutmachine/Destroy()
+	stop_dumping()
+	STOP_PROCESSING(SSfastprocess, src)
+	priority_announce("The credit deposit machine at [get_area(src)] has been destroyed. Station funds have stopped draining!", sender_override = "CRAB-17 Protocol")
+	explosion(src, 0,0,1, flame_range = 2)
+	return ..()
+
+/obj/structure/checkoutmachine/proc/start_dumping()
+	accounts_to_rob = SSeconomy.bank_accounts.Copy()
+	accounts_to_rob -= bogdanoff.get_bank_account()
+	for(var/i in accounts_to_rob)
+		var/datum/bank_account/B = i
+		B.dumpeet()
+	dump()
+
+/obj/structure/checkoutmachine/proc/dump()
+	var/percentage_lost = (rand(5, 15) / 100)
+	for(var/i in accounts_to_rob)
+		var/datum/bank_account/B = i
+		if(!B.being_dumped)
+			continue
+		var/amount = B.account_balance * percentage_lost
+		var/datum/bank_account/account = bogdanoff.get_bank_account()
+		if (account) // get_bank_account() may return FALSE
+			account.transfer_money(B, amount)
+			B.bank_card_talk("You have lost [percentage_lost * 100]% of your funds! A spacecoin credit deposit machine is located at: [get_area(src)].")
+	addtimer(CALLBACK(src, .proc/dump), 150) //Drain every 15 seconds
+
+/obj/structure/checkoutmachine/process()
+	var/anydir = pick(GLOB.cardinals)
+	if(Process_Spacemove(anydir))
+		Move(get_step(src, anydir), anydir)
+
+/obj/structure/checkoutmachine/proc/stop_dumping()
+	for(var/i in accounts_to_rob)
+		var/datum/bank_account/B = i
+		B.being_dumped = FALSE
+
+/obj/effect/dumpeetFall //Falling pod
+	name = ""
+	icon = 'icons/obj/money_machine_64.dmi'
+	pixel_z = 300
+	desc = "Get out of the way!"
+	layer = FLY_LAYER//that wasnt flying, that was falling with style!
+	icon_state = "missile_blur"
+
+/obj/effect/dumpeetTarget
+	name = "Landing Zone Indicator"
+	desc = "A holographic projection designating the landing zone of something. It's probably best to stand back."
+	icon = 'icons/mob/actions/actions_items.dmi'
+	icon_state = "sniper_zoom"
+	layer = PROJECTILE_HIT_THRESHHOLD_LAYER
+	light_range = 2
+	var/obj/effect/dumpeetFall/DF
+	var/obj/structure/checkoutmachine/dump
+	var/mob/living/carbon/human/bogdanoff
+
+/obj/effect/ex_act()
+	return
+
+/obj/effect/dumpeetTarget/Initialize(mapload, user)
+	. = ..()
+	bogdanoff = user
+	addtimer(CALLBACK(src, .proc/startLaunch), 100)
+	sound_to_playing_players('sound/items/dump_it.ogg', 20)
+	deadchat_broadcast("<span class='game deadsay'>Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!</span>", turf_target = get_turf(src))
+
+/obj/effect/dumpeetTarget/proc/startLaunch()
+	DF = new /obj/effect/dumpeetFall(drop_location())
+	dump = new /obj/structure/checkoutmachine(null, bogdanoff)
+	priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol")
+	animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING)
+	playsound(src,  'sound/weapons/mortar_whistle.ogg', 70, TRUE, 6)
+	addtimer(CALLBACK(src, .proc/endLaunch), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation
+
+
+
+/obj/effect/dumpeetTarget/proc/endLaunch()
+	QDEL_NULL(DF) //Delete the falling machine effect, because at this point its animation is over. We dont use temp_visual because we want to manually delete it as soon as the pod appears
+	playsound(src, "explosion", 80, TRUE)
+	dump.forceMove(get_turf(src))
+	qdel(src) //The target's purpose is complete. It can rest easy now

code/game/objects/items/credit_holochip.dm

@@ -0,0 +1,107 @@
+/obj/item/holochip
+	name = "credit holochip"
+	desc = "A hard-light chip encoded with an amount of credits. It is a modern replacement for physical money that can be directly converted to virtual currency and viceversa. Keep away from magnets."
+	icon = 'icons/obj/economy.dmi'
+	icon_state = "holochip"
+	throwforce = 0
+	force = 0
+	w_class = WEIGHT_CLASS_TINY
+	var/credits = 0
+
+/obj/item/holochip/Initialize(mapload, amount)
+	. = ..()
+	credits = amount
+	update_icon()
+
+/obj/item/holochip/examine(mob/user)
+	. = ..()
+	. += "<span class='notice'>It's loaded with [credits] credit[( credits > 1 ) ? "s" : ""]</span>\n"+\
+	"<span class='notice'>Alt-Click to split.</span>"
+
+/obj/item/holochip/get_item_credit_value()
+	return credits
+
+/obj/item/holochip/update_icon()
+	name = "\improper [credits] credit holochip"
+	var/rounded_credits = credits
+	switch(credits)
+		if(1 to 999)
+			icon_state = "holochip"
+		if(1000 to 999999)
+			icon_state = "holochip_kilo"
+			rounded_credits = round(rounded_credits * 0.001)
+		if(1000000 to 999999999)
+			icon_state = "holochip_mega"
+			rounded_credits = round(rounded_credits * 0.000001)
+		if(1000000000 to INFINITY)
+			icon_state = "holochip_giga"
+			rounded_credits = round(rounded_credits * 0.000000001)
+	var/overlay_color = "#914792"
+	switch(rounded_credits)
+		if(0 to 4)
+			overlay_color = "#8E2E38"
+		if(5 to 9)
+			overlay_color = "#914792"
+		if(10 to 19)
+			overlay_color = "#BF5E0A"
+		if(20 to 49)
+			overlay_color = "#358F34"
+		if(50 to 99)
+			overlay_color = "#676767"
+		if(100 to 199)
+			overlay_color = "#009D9B"
+		if(200 to 499)
+			overlay_color = "#0153C1"
+		if(500 to INFINITY)
+			overlay_color = "#2C2C2C"
+	cut_overlays()
+	var/mutable_appearance/holochip_overlay = mutable_appearance('icons/obj/economy.dmi', "[icon_state]-color")
+	holochip_overlay.color = overlay_color
+	add_overlay(holochip_overlay)
+
+/obj/item/holochip/proc/spend(amount, pay_anyway = FALSE)
+	if(credits >= amount)
+		credits -= amount
+		if(credits == 0)
+			qdel(src)
+		update_icon()
+		return amount
+	else if(pay_anyway)
+		qdel(src)
+		return credits
+	else
+		return 0
+
+/obj/item/holochip/attackby(obj/item/I, mob/user, params)
+	..()
+	if(istype(I, /obj/item/holochip))
+		var/obj/item/holochip/H = I
+		credits += H.credits
+		to_chat(user, "<span class='notice'>You insert the credits into [src].</span>")
+		update_icon()
+		qdel(H)
+
+/obj/item/holochip/AltClick(mob/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	var/split_amount = round(input(user,"How many credits do you want to extract from the holochip?") as null|num)
+	if(split_amount == null || split_amount <= 0 || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	else
+		var/new_credits = spend(split_amount, TRUE)
+		var/obj/item/holochip/H = new(user ? user : drop_location(), new_credits)
+		if(user)
+			if(!user.put_in_hands(H))
+				H.forceMove(user.drop_location())
+			add_fingerprint(user)
+		H.add_fingerprint(user)
+		to_chat(user, "<span class='notice'>You extract [split_amount] credits into a new holochip.</span>")
+
+/obj/item/holochip/emp_act(severity)
+	. = ..()
+	if(. & EMP_PROTECT_SELF)
+		return
+	var/wipe_chance = 60 / severity
+	if(prob(wipe_chance))
+		visible_message("<span class='warning'>[src] fizzles and disappears!</span>")
+		qdel(src) //rip cash

code/game/objects/items/devices/dogborg_sleeper.dm

@@ -3,7 +3,7 @@
 /obj/item/dogborg/sleeper
 	name = "hound sleeper"
 	desc = "nothing should see this."
-	icon = 'icons/mob/dogborg.dmi'
+	icon = 'icons/mob/robot_items.dmi'
 	icon_state = "sleeper"
 	w_class = WEIGHT_CLASS_TINY
 	var/mob/living/carbon/patient
@@ -418,29 +418,15 @@
 	var/units = round(patient.reagents.get_reagent_amount(chem))
 	to_chat(hound, "<span class='notice'>Injecting [units] unit\s of [chem] into occupant.</span>") //If they were immersed, the reagents wouldn't leave with them.
 
-/obj/item/dogborg/sleeper/medihound //Medihound sleeper
-	name = "Mobile Sleeper"
-	desc = "Equipment for medical hound. A mounted sleeper that stabilizes patients and can inject reagents in the borg's reserves."
-	icon = 'icons/mob/dogborg.dmi'
-	icon_state = "sleeper"
-	breakout_time = 30 //Medical sleepers should be designed to be as easy as possible to get out of.
-
 /obj/item/dogborg/sleeper/K9 //The K9 portabrig
 	name = "Mobile Brig"
 	desc = "Equipment for a K9 unit. A mounted portable-brig that holds criminals."
-	icon = 'icons/mob/dogborg.dmi'
 	icon_state = "sleeperb"
 	inject_amount = 0
 	min_health = -100
 	injection_chems = null //So they don't have all the same chems as the medihound!
 	breakout_time = 300
 
-/obj/item/storage/attackby(obj/item/dogborg/sleeper/K9, mob/user, proximity)
-	if(istype(K9))
-		K9.afterattack(src, user ,1)
-	else
-		. = ..()
-
 /obj/item/dogborg/sleeper/K9/afterattack(mob/living/carbon/target, mob/living/silicon/user, proximity)
 	var/mob/living/silicon/robot/hound = get_host()
 	if(!hound || !istype(target) || !proximity || target.anchored)
@@ -462,70 +448,6 @@
 		user.visible_message("<span class='warning'>[hound.name]'s mobile brig clunks in series as [target] slips inside.</span>", "<span class='notice'>Your mobile brig groans lightly as [target] slips inside.</span>")
 		playsound(hound, 'sound/effects/bin_close.ogg', 80, 1) // Really don't need ERP sound effects for robots
 
-
-/obj/item/dogborg/sleeper/compactor //Janihound gut.
-	name = "garbage processor"
-	desc = "A mounted garbage compactor unit with fuel processor."
-	icon = 'icons/mob/dogborg.dmi'
-	icon_state = "compactor"
-	inject_amount = 0
-	min_health = -100
-	injection_chems = null //So they don't have all the same chems as the medihound!
-	var/max_item_count = 30
-
-/obj/item/storage/attackby(obj/item/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO!
-	if(istype(compactor))
-		compactor.afterattack(src, user ,1)
-	else
-		. = ..()
-
-/obj/item/dogborg/sleeper/compactor/afterattack(atom/movable/target, mob/living/silicon/user, proximity)//GARBO NOMS
-	var/mob/living/silicon/robot/hound = get_host()
-	if(!hound || !istype(target) || !proximity || target.anchored)
-		return
-	if(length(contents) > (max_item_count - 1))
-		to_chat(user,"<span class='warning'>Your [src] is full. Eject or process contents to continue.</span>")
-		return
-	if(isitem(target))
-		var/obj/item/I = target
-		if(CheckAccepted(I))
-			to_chat(user,"<span class='warning'>[I] registers an error code to your [src]</span>")
-			return
-		if(I.w_class > WEIGHT_CLASS_NORMAL)
-			to_chat(user,"<span class='warning'>[I] is too large to fit into your [src]</span>")
-			return
-		user.visible_message("<span class='warning'>[hound.name] is ingesting [I] into their [src.name].</span>", "<span class='notice'>You start ingesting [target] into your [src.name]...</span>")
-		if(do_after(user, 15, target = target) && length(contents) < max_item_count)
-			I.forceMove(src)
-			I.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [I] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [I] slips inside.</span>")
-			playsound(hound, 'sound/machines/disposalflush.ogg', 50, 1)
-			if(length(contents) > 11) //grow that tum after a certain junk amount
-				hound.sleeper_r = 1
-				hound.update_icons()
-			else
-				hound.sleeper_r = 0
-				hound.update_icons()
-		return
-
-	if(iscarbon(target) || issilicon(target))
-		var/mob/living/trashman = target
-		if(!CHECK_BITFIELD(trashman.vore_flags,DEVOURABLE))
-			to_chat(user, "<span class='warning'>[target] registers an error code to your [src]</span>")
-			return
-		if(patient)
-			to_chat(user,"<span class='warning'>Your [src] is already occupied.</span>")
-			return
-		if(trashman.buckled)
-			to_chat(user,"<span class='warning'>[trashman] is buckled and can not be put into your [src].</span>")
-			return
-		user.visible_message("<span class='warning'>[hound.name] is ingesting [trashman] into their [src].</span>", "<span class='notice'>You start ingesting [trashman] into your [src.name]...</span>")
-		if(do_after(user, 30, target = trashman) && !patient && !trashman.buckled && length(contents) < max_item_count)
-			trashman.forceMove(src)
-			trashman.reset_perspective(src)
-			update_gut()
-			user.visible_message("<span class='warning'>[hound.name]'s garbage processor groans lightly as [trashman] slips inside.</span>", "<span class='notice'>Your garbage compactor groans lightly as [trashman] slips inside.</span>")
-			playsound(hound, 'sound/effects/bin_close.ogg', 80, 1)
-
 /obj/item/dogborg/sleeper/K9/flavour
 	name = "Recreational Sleeper"
 	desc = "A mounted, underslung sleeper, intended for holding willing occupants for leisurely purposes."

code/game/objects/items/devices/flashlight.dm

@@ -1,6 +1,7 @@
 /obj/item/flashlight
 	name = "flashlight"
 	desc = "A hand-held emergency light."
+	custom_price = 100
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "flashlight"
 	item_state = "flashlight"
@@ -428,6 +429,7 @@
 /obj/item/flashlight/glowstick
 	name = "glowstick"
 	desc = "A military-grade glowstick."
+	custom_price = 50
 	w_class = WEIGHT_CLASS_SMALL
 	brightness_on = 4
 	color = LIGHT_COLOR_GREEN

code/game/objects/items/devices/scanners.dm

@@ -11,6 +11,7 @@ SLIME SCANNER
 /obj/item/t_scanner
 	name = "\improper T-ray scanner"
 	desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
+	custom_price = 150
 	icon = 'icons/obj/device.dmi'
 	icon_state = "t-ray0"
 	var/on = FALSE

code/game/objects/items/devices/sensor_device.dm

@@ -5,6 +5,7 @@
 	icon_state = "scanner"
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = ITEM_SLOT_BELT
+	custom_price = 900
 
 /obj/item/sensor_device/attack_self(mob/user)
 	GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it

code/game/objects/items/granters.dm

@@ -249,10 +249,8 @@
 /obj/item/book/granter/spell/smoke/recoil(mob/user)
 	..()
 	to_chat(user,"<span class='caution'>Your stomach rumbles...</span>")
-	if(user.nutrition)
-		user.nutrition = 200
-		if(user.nutrition <= 0)
-			user.nutrition = 0
+	if(user.nutrition > NUTRITION_LEVEL_STARVING + 50)
+		user.set_nutrition(NUTRITION_LEVEL_STARVING + 50)
 
 /obj/item/book/granter/spell/blind
 	spell = /obj/effect/proc_holder/spell/targeted/trigger/blind

code/game/objects/items/kitchen.dm

@@ -71,6 +71,7 @@
 	sharpness = IS_SHARP_ACCURATE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	var/bayonet = FALSE	//Can this be attached to a gun?
+	custom_price = 250
 
 /obj/item/kitchen/knife/Initialize()
 	. = ..()
@@ -130,6 +131,7 @@
 	custom_materials = list(/datum/material/iron=18000)
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	w_class = WEIGHT_CLASS_NORMAL
+	custom_price = 600
 
 /obj/item/kitchen/knife/combat
 	name = "combat knife"
@@ -197,6 +199,7 @@
 	throw_range = 7
 	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	custom_price = 200
 
 /obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/game/objects/items/pinpointer.dm

@@ -78,6 +78,7 @@
 	name = "crew pinpointer"
 	desc = "A handheld tracking device that points to crew suit sensors."
 	icon_state = "pinpointer_crew"
+	custom_price = 600
 	var/has_owner = FALSE
 	var/pinpointer_owner = null
 

code/game/objects/items/robot/robot_items.dm

@@ -902,4 +902,47 @@
 	name = "mining point card"
 	desc = "A robotic ID strip used for claiming and transferring mining points. Must be held in an active slot to transfer points."
 	access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
-	icon_state = "data_1"
+	icon_state = "data_1"
+
+
+///Mere cosmetic dogborg items, remnants of what were once the most annoying cyborg modules.
+/obj/item/dogborg_tongue
+	name = "synthetic tongue"
+	desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face."
+	icon = 'icons/mob/robot_items.dmi'
+	icon_state = "synthtongue"
+	hitsound = 'sound/effects/attackblob.ogg'
+	desc = "For giving affectionate kisses."
+	item_flags = NOBLUDGEON
+
+/obj/item/dogborg_tongue/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	if(!proximity || !isliving(target))
+		return
+	var/mob/living/silicon/robot/R = user
+	var/mob/living/L = target
+	if(L.ckey && !(L.client?.prefs.vore_flags & LICKABLE))
+		to_chat(R, "<span class='danger'>ERROR ERROR: Target not lickable. Aborting display-of-affection subroutine.</span>")
+		return
+
+	if(check_zone(R.zone_selected) == "head")
+		R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]'s face!</span>", "<span class='notice'>You affectionally lick \the [L]'s face!</span>")
+		playsound(R, 'sound/effects/attackblob.ogg', 50, 1)
+	else
+		R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]!</span>", "<span class='notice'>You affectionally lick \the [L]!</span>")
+		playsound(R, 'sound/effects/attackblob.ogg', 50, 1)
+
+/obj/item/dogborg_nose
+	name = "boop module"
+	desc = "The BOOP module"
+	icon = 'icons/mob/robot_items.dmi'
+	icon_state = "nose"
+	flags_1 = CONDUCT_1|NOBLUDGEON
+	force = 0
+
+/obj/item/dogborg_nose/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	if(!proximity)
+		return
+	do_attack_animation(target, null, src)
+	user.visible_message("<span class='notice'>[user] [pick("nuzzles", "pushes", "boops")] \the [target.name] with their nose!</span>")

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

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/economy.dmi'
 	icon_state = "spacecash"
 	amount = 1
-	max_amount = 20
+	max_amount = INFINITY
 	throwforce = 0
 	throw_speed = 2
 	throw_range = 2
@@ -18,9 +18,11 @@
 	update_desc()
 
 /obj/item/stack/spacecash/proc/update_desc()
-	var/total_worth = amount*value
+	var/total_worth = get_item_credit_value()
 	desc = "It's worth [total_worth] credit[( total_worth > 1 ) ? "s" : ""]"
 
+/obj/item/stack/spacecash/get_item_credit_value()
+	return (amount*value)
 
 /obj/item/stack/spacecash/merge(obj/item/stack/S)
 	. = ..()

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

@@ -96,6 +96,7 @@
 	var/stop_bleeding = 1800
 	var/heal_brute = 5
 	self_delay = 10
+	custom_price = 100
 
 /obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
 	if(ishuman(M))

code/game/objects/items/storage/belt.dm

@@ -43,6 +43,7 @@
 	icon_state = "utilitybelt"
 	item_state = "utility"
 	content_overlays = TRUE
+	custom_premium_price = 300
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE //because this is easier than trying to have showers wash all contents.
 
 /obj/item/storage/belt/utility/ComponentInitialize()
@@ -712,6 +713,7 @@
 	icon_state = "fannypack_leather"
 	item_state = "fannypack_leather"
 	dying_key = DYE_REGISTRY_FANNYPACK
+	custom_price = 100
 
 /obj/item/storage/belt/fannypack/ComponentInitialize()
 	. = ..()

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

@@ -622,6 +622,7 @@
 	item_state = "zippo"
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = ITEM_SLOT_BELT
+	custom_price = 20
 
 /obj/item/storage/box/matches/ComponentInitialize()
 	. = ..()

code/game/objects/items/storage/fancy.dm

@@ -136,6 +136,7 @@
 	slot_flags = ITEM_SLOT_BELT
 	icon_type = "cigarette"
 	spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
+	custom_price = 75
 
 /obj/item/storage/fancy/cigarettes/ComponentInitialize()
 	. = ..()
@@ -277,6 +278,7 @@
 ///The value in here has NOTHING to do with icons. It needs to be this for the proper examine.
 	icon_type = "rolling paper"
 	spawn_type = /obj/item/rollingpaper
+	custom_price = 25
 
 /obj/item/storage/fancy/rollingpapers/ComponentInitialize()
 	. = ..()

code/game/objects/items/storage/firstaid.dm

@@ -373,7 +373,7 @@
 /////////////
 
 /obj/item/storage/belt/organbox
-	name = "Organ Storge"
+	name = "Organ Storage"
 	desc = "A compact box that helps hold massive amounts of implants, organs, and some tools. Has a belt clip for easy carrying"
 	w_class = WEIGHT_CLASS_BULKY
 	icon = 'icons/obj/mysterybox.dmi'
@@ -392,6 +392,12 @@
 	STR.can_hold = typecacheof(list(
 	/obj/item/storage/pill_bottle,
 	/obj/item/reagent_containers/hypospray,
+	/obj/item/pinpointer/crew,
+	/obj/item/tele_iv,
+	/obj/item/sequence_scanner,
+	/obj/item/sensor_device,
+	/obj/item/bodybag,
+	/obj/item/surgicaldrill/advanced,
 	/obj/item/healthanalyzer,
 	/obj/item/reagent_containers/syringe,
 	/obj/item/clothing/glasses/hud/health,
@@ -407,6 +413,8 @@
 	/obj/item/implantcase,
 	/obj/item/implanter,
 	/obj/item/circuitboard/computer/operating,
+	/obj/item/circuitboard/computer/crew,
+	/obj/item/stack/sheet/glass,
 	/obj/item/stack/sheet/mineral/silver,
 	/obj/item/organ_storage
 	))
@@ -422,6 +430,8 @@
 	throw_range = 7
 	var/empty = FALSE
 	item_state = "firstaid"
+	custom_price = 300
+	custom_premium_price = 500
 
 /obj/item/storage/hypospraykit/ComponentInitialize()
 	. = ..()

code/game/objects/items/storage/wallets.dm

@@ -16,6 +16,7 @@
 	STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power))
 	STR.can_hold = typecacheof(list(
 		/obj/item/stack/spacecash,
+		/obj/item/holochip,
 		/obj/item/card,
 		/obj/item/clothing/mask/cigarette,
 		/obj/item/flashlight/pen,
@@ -101,17 +102,5 @@
 	icon_state = "random_wallet"
 
 /obj/item/storage/wallet/random/PopulateContents()
-	var/item1_type = /obj/effect/spawner/lootdrop/space_cash/no_turf
-	var/item2_type
-	if(prob(50))
-		item2_type = /obj/effect/spawner/lootdrop/space_cash/no_turf
-	var/item3_type = /obj/effect/spawner/lootdrop/coin/no_turf
-
-	spawn(2)
-		if(item1_type)
-			new item1_type(src)
-		if(item2_type)
-			new item2_type(src)
-		if(item3_type)
-			new item3_type(src)
-	update_icon()
+	new /obj/item/holochip(src, rand(5,30))
+	icon_state = "wallet"

code/game/objects/items/tanks/watertank.dm

@@ -145,6 +145,7 @@
 	desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
 	icon_state = "waterbackpackjani"
 	item_state = "waterbackpackjani"
+	custom_price = 1000
 
 /obj/item/watertank/janitor/Initialize()
 	. = ..()

code/game/objects/items/weaponry.dm

@@ -524,6 +524,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	icon_state = "skateboard2"
 	item_state = "skateboard2"
 	board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
+	custom_premium_price = 500
 
 /obj/item/melee/skateboard/hoverboard
 	name = "hoverboard"
@@ -531,6 +532,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	icon_state = "hoverboard_red"
 	item_state = "hoverboard_red"
 	board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
+	custom_premium_price = 2015
 
 /obj/item/melee/skateboard/hoverboard/admin
 	name = "\improper Board Of Directors"

code/game/objects/structures/crates_lockers/crates/secure.dm

@@ -74,4 +74,43 @@
 /obj/structure/closet/crate/secure/medical
 	desc = "A secure medical crate."
 	name = "medical crate"
-	icon_state = "medical_secure_crate"
+	icon_state = "medical_secure_crate"
+
+/obj/structure/closet/crate/secure/owned
+	name = "private crate"
+	desc = "A crate cover designed to only open for who purchased its contents."
+	icon_state = "privatecrate"
+	var/datum/bank_account/buyer_account
+	var/privacy_lock = TRUE
+
+/obj/structure/closet/crate/secure/owned/examine(mob/user)
+	. = ..()
+	to_chat(user, "<span class='notice'>It's locked with a privacy lock, and can only be unlocked by the buyer's ID.</span>")
+
+/obj/structure/closet/crate/secure/owned/Initialize(mapload, datum/bank_account/_buyer_account)
+	. = ..()
+	buyer_account = _buyer_account
+
+/obj/structure/closet/crate/secure/owned/togglelock(mob/living/user, silent)
+	if(privacy_lock)
+		if(!broken)
+			var/obj/item/card/id/id_card = user.get_idcard(TRUE)
+			if(id_card)
+				if(id_card.registered_account)
+					if(id_card.registered_account == buyer_account)
+						if(iscarbon(user))
+							add_fingerprint(user)
+						locked = !locked
+						user.visible_message("<span class='notice'>[user] unlocks [src]'s privacy lock.</span>",
+										"<span class='notice'>You unlock [src]'s privacy lock.</span>")
+						privacy_lock = FALSE
+						update_icon()
+					else if(!silent)
+						to_chat(user, "<span class='notice'>Bank account does not match with buyer!</span>")
+				else if(!silent)
+					to_chat(user, "<span class='notice'>No linked bank account detected!</span>")
+			else if(!silent)
+				to_chat(user, "<span class='notice'>No ID detected!</span>")
+		else if(!silent)
+			to_chat(user, "<span class='warning'>[src] is broken!</span>")
+	else ..()

code/game/objects/structures/ghost_role_spawners.dm

@@ -686,7 +686,7 @@
 	name = "ID, jumpsuit and shoes"
 	uniform = /obj/item/clothing/under/color/random
 	shoes = /obj/item/clothing/shoes/sneakers/black
-	id = /obj/item/card/id
+	id = /obj/item/card/id/no_banking
 	r_hand = /obj/item/storage/box/syndie_kit/chameleon/ghostcafe