Bitrunner Job Removal + Permabrig updates

code/game/machinery/_machinery.dm

@@ -760,6 +760,7 @@
 /obj/machinery/proc/RefreshParts()
 	SHOULD_CALL_PARENT(TRUE)
 	//reset to baseline
+	/*
 	idle_power_usage = initial(idle_power_usage)
 	active_power_usage = initial(active_power_usage)
 	if(!component_parts || !component_parts.len)
@@ -774,6 +775,7 @@
 
 	idle_power_usage = initial(idle_power_usage) * (1 + parts_energy_rating)
 	active_power_usage = initial(active_power_usage) * (1 + parts_energy_rating)
+	*/
 	update_current_power_usage()
 	SEND_SIGNAL(src, COMSIG_MACHINERY_REFRESH_PARTS)
 

code/modules/bitrunning/job.dm

@@ -1,3 +1,4 @@
+/* MONKESTATION REMOVAL: MERGED WITH PRISONERS
 /datum/job/bitrunner
 	title = JOB_BITRUNNER
 	description = "Surf the virtual domain for gear and loot. Decrypt your rewards on station."
@@ -39,3 +40,4 @@
 	uniform = /obj/item/clothing/under/rank/cargo/bitrunner
 	belt = /obj/item/modular_computer/pda/bitrunner
 	ears = /obj/item/radio/headset/headset_cargo
+*/

code/modules/bitrunning/objects/netpod.dm

@@ -14,7 +14,7 @@
 	/// Whether we have an ongoing connection
 	var/connected = FALSE
 	/// A player selected outfit by clicking the netpod
-	var/datum/outfit/netsuit = /datum/outfit/job/bitrunner
+	var/datum/outfit/netsuit = /datum/outfit/job/prisoner
 	/// Holds this to see if it needs to generate a new one
 	var/datum/weakref/avatar_ref
 	/// The linked quantum server

code/modules/bitrunning/objects/vendor.dm

@@ -12,7 +12,7 @@
 	cargo_cost_multiplier = 0.65
 	express_cost_multiplier = 1
 	purchase_tooltip = @{"Your purchases will arrive at cargo,
-	and hopefully get delivered by them.
+	and hopefully gets delivered to you by the security.
 	35% cheaper than express delivery."}
 	express_tooltip = @{"Sends your purchases instantly."}
 	credit_type = CREDIT_TYPE_BITRUNNING
@@ -57,8 +57,8 @@
 		cost_type = credit_type,
 		can_be_cancelled = FALSE,
 	)
-	say("Thank you for your purchase! It will arrive on the next cargo shuttle!")
-	radio.talk_into(src, "A bitrunner has ordered equipment which will arrive on the cargo shuttle! Please make sure it gets to them as soon as possible!", radio_channel)
+	say("Thank you for your purchase! It will arrive on the next cargo shuttle! ")
+	radio.talk_into(src, "A prisoner has ordered equipment which will arrive on the cargo shuttle! Please make sure it gets to them as soon as possible!", radio_channel) //MONKESTATION EDIT
 	SSshuttle.shopping_list += new_order
 
 /obj/machinery/computer/order_console/bitrunning/retrive_points(obj/item/card/id/id_card)
@@ -73,16 +73,18 @@
 	icon_state = "[initial(icon_state)][powered() ? null : "_off"]"
 	return ..()
 
+//MONKESTATION EDIT START
 /datum/supply_pack/bitrunning
-	name = "bitrunning order"
+	name = "prisoner bitrunning order"
 	hidden = TRUE
-	crate_name = "bitrunning delivery crate"
+	crate_name = "prisoner bitrunning delivery crate"
 	access = list(ACCESS_BIT_DEN)
 
 /datum/supply_pack/bitrunning/New(purchaser, cost, list/contains)
 	. = ..()
-	name = "[purchaser]'s Bitrunning Order"
+	name = "[purchaser]'s Prisoner Bitrunning Order"
 	src.cost = cost
 	src.contains = contains
 
+//MONKESTATION EDIT END
 #undef CREDIT_TYPE_BITRUNNING

code/modules/bitrunning/orders/flair.dm

@@ -39,6 +39,18 @@
 	item_path = /obj/item/clothing/shoes/jackboots
 	cost_per_order = 1000
 
+//MONKESTATION ADDITION START
+/datum/orderable_item/bitrunning_flair/jumpsuit
+	item_path = /obj/item/clothing/under/rank/cargo/bitrunner
+	desc = "An upgrade over the usual orange shirt...right?"
+	cost_per_order = 1000
+
+/datum/orderable_item/bitrunning_flair/mannitol
+	item_path = /obj/item/reagent_containers/cup/bottle/mannitol
+	desc = "A healing potion for your brain, acquired by doing the same thing that caused brain damage in the first place..."
+	cost_per_order = 1000
+
+//MONKESTATION ADDITION END
 /datum/orderable_item/bitrunning_flair/neon_lining
 	item_path = /obj/item/stack/neon_lining/twenty
 	cost_per_order = 250

code/modules/bitrunning/server/quantum_server.dm

@@ -39,7 +39,7 @@
 	/// Changes how much info is available on the domain
 	var/scanner_tier = 1
 	/// Length of time it takes for the server to cool down after resetting. Here to give runners downtime so their faces don't get stuck like that
-	var/server_cooldown_time = 3 MINUTES
+	var/server_cooldown_time = 90 SECONDS //MONKESTATION EDIT
 	/// Applies bonuses to rewards etc
 	var/servo_bonus = 0
 	/// The turfs we can place a hololadder on.

code/modules/bitrunning/server/util.dm

@@ -5,7 +5,9 @@
 /obj/machinery/quantum_server/proc/cool_off()
 	is_ready = TRUE
 	update_appearance()
-	radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY)
+	playsound(loc, 'sound/machines/click.ogg', 30, TRUE) //MONKESTATION ADDITION
+	balloon_alert_to_viewers("Thermal systems within operational parameters. Proceeding to domain configuration.")
+	//radio.talk_into(src, "Thermal systems within operational parameters. Proceeding to domain configuration.", RADIO_CHANNEL_SUPPLY) MONKESTATION REMOVAL: prisoners don't have headsets atm, edit this if that's to change
 
 /// Compiles a list of available domains.
 /obj/machinery/quantum_server/proc/get_available_domains()

code/modules/jobs/job_types/prisoner.dm

@@ -3,8 +3,8 @@
 	description = "Keep yourself occupied in permabrig."
 	department_head = list("The Security Team")
 	faction = FACTION_STATION
-	total_positions = 2
-	spawn_positions = 2
+	total_positions = 5
+	spawn_positions = 5
 	supervisors = "the security team"
 	exp_granted_type = EXP_TYPE_CREW
 	paycheck = PAYCHECK_LOWER

config/jobconfig.toml

@@ -13,7 +13,7 @@
 ## The game will not read any line that is commented out with a '#', as to allow you to defer to codebase defaults.
 ## If you want to override the codebase values, add the value and then uncomment that line by removing the # from the job key's name.
 ## Ensure that the key is flush, do not introduce any whitespaces when you uncomment a key. For example:
-## "# Total Positions" should always be changed to "Total Positions", no additional spacing. 
+## "# Total Positions" should always be changed to "Total Positions", no additional spacing.
 ## Best of luck editing!
 
 [AI]
@@ -163,7 +163,7 @@
 [PRISONER]
 "# Playtime Requirements" = 0
 "# Required Account Age" = 0
-"# Spawn Positions" = 2
+"# Spawn Positions" = 5
 "# Total Positions" = 0
 
 [PSYCHOLOGIST]

monkestation/code/area/areas/station.dm

@@ -15,6 +15,12 @@
 	icon = 'monkestation/icons/area/areas_station.dmi'
 	icon_state = "patho_iso"
 
+/area/station/security/bitden
+	name = "Bitrunning Den"
+	desc = "Office of bitrunners, houses their equipment."
+	icon = 'monkestation/icons/area/areas_station.dmi'
+	icon_state = "bit_den"
+
 // QM office replacement so the windows are shit brown and not blue!
 
 /area/station/cargo/quartermaster

monkestation/code/modules/client/preferences/alt_jobs/titles.dm

@@ -247,6 +247,7 @@
 		"Convict",
 		"Felon",
 		"Inmate",
+		"Gamer",
 	)
 
 /datum/job/psychologist