Merge remote-tracking branch 'upstream/master'

code/game/objects/items/cards_ids.dm

@@ -373,6 +373,11 @@
 				. += "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.civilian_bounty)
+			. += "<span class='info'><b>There is an active civilian bounty.</b>"
+			. += "<span class='info'><i>[registered_account.bounty_text()]</i></span>"
+			. += "<span class='info'>Quantity: [registered_account.bounty_num()]</span>"
+			. += "<span class='info'>Reward: [registered_account.bounty_value()]</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

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

@@ -348,9 +348,9 @@
 	name = "Snow Taxi (Computer Board)"
 	build_path = /obj/machinery/computer/shuttle/snow_taxi
 
-// /obj/item/circuitboard/computer/bountypad
-// 	name = "Bounty Pad (Computer Board)"
-// 	build_path = /obj/machinery/computer/piratepad_control/civilian
+/obj/item/circuitboard/computer/bountypad
+	name = "Bounty Pad (Computer Board)"
+	build_path = /obj/machinery/computer/piratepad_control/civilian
 
 /obj/item/circuitboard/computer/security/shuttle
 	name = "Shuttlelinking Security Cameras (Computer Board)"
@@ -581,10 +581,6 @@
 	name = "Supply Request Console (Computer Board)"
 	build_path = /obj/machinery/computer/cargo/request
 
-/obj/item/circuitboard/computer/bounty
-	name = "Nanotrasen Bounty Console (Computer Board)"
-	build_path = /obj/machinery/computer/bounty
-
 /obj/item/circuitboard/computer/ferry
 	name = "Transport Ferry (Computer Board)"
 	icon_state = "supply"

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

@@ -685,15 +685,15 @@
 		/obj/item/stack/sheet/glass = 1,
 		/obj/item/vending_refill/donksoft = 1)
 
-// /obj/item/circuitboard/machine/bountypad
-// 	name = "Civilian Bounty Pad (Machine Board)"
-// 	icon_state = "generic"
-// 	build_path = /obj/machinery/piratepad/civilian
-// 	req_components = list(
-// 		/obj/item/stock_parts/card_reader = 1,
-// 		/obj/item/stock_parts/scanning_module = 1,
-// 		/obj/item/stock_parts/micro_laser = 1
-// 	)
+
+/obj/item/circuitboard/machine/bountypad
+	name = "Civilian Bounty Pad (Machine Board)"
+	icon_state = "generic"
+	build_path = /obj/machinery/piratepad/civilian
+	req_components = list(
+		/obj/item/stock_parts/scanning_module = 1,
+		/obj/item/stock_parts/micro_laser = 1
+	)
 
 // /obj/item/circuitboard/machine/accounting
 // 	name = "Account Registration Device (Machine Board)"

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

@@ -216,6 +216,26 @@ as performing this in action() will cause the upgrade to end up in the borg inst
 			C.icon_state = initial(icon_state)
 			for(var/obj/item/ammo_casing/energy/plasma/weak/L in C.ammo_type)
 				L.projectile_type = initial(L.projectile_type)
+
+/obj/item/borg/upgrade/premiumka
+	name = "mining cyborg premium KA"
+	desc = "A premium kinetic accelerator replacement for the mining module's standard kinetic accelerator."
+	icon_state = "cyborg_upgrade3"
+	require_module = 1
+	module_type = list(/obj/item/robot_module/miner)
+
+/obj/item/borg/upgrade/premiumka/action(mob/living/silicon/robot/R, user = usr)
+	. = ..()
+	if(.)
+		for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/KA in R.module)
+			for(var/obj/item/borg/upgrade/modkit/M in KA.modkits)
+				M.uninstall(src)
+			R.module.remove_module(KA, TRUE)
+
+		var/obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg/PKA = new /obj/item/gun/energy/kinetic_accelerator/premiumka/cyborg(R.module)
+		R.module.basic_modules += PKA
+		R.module.add_module(PKA, FALSE, TRUE)
+
 /obj/item/borg/upgrade/tboh
 	name = "janitor cyborg trash bag of holding"
 	desc = "A trash bag of holding replacement for the janiborg's standard trash bag."

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

@@ -20,6 +20,9 @@
 	if(QDELETED(src) && !transfer)
 		new /obj/item/c_tube(T)
 
+/obj/item/stack/wrapping_paper/small
+	desc = "Wrap packages with this festive paper to make gifts. This roll looks a bit skimpy."
+	amount = 10
 
 /*
  * Package Wrap
@@ -121,6 +124,11 @@
 	if(QDELETED(src) && !transfer)
 		new /obj/item/c_tube(T)
 
+/obj/item/stack/packageWrap/small
+	desc = "You can use this to wrap items in. This roll looks a bit skimpy."
+	w_class = WEIGHT_CLASS_SMALL
+	amount = 5
+
 /obj/item/c_tube
 	name = "cardboard tube"
 	desc = "A tube... of cardboard."

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

@@ -1461,3 +1461,18 @@
 /obj/item/storage/box/strange_seeds_5pack/PopulateContents()
 	for(var/i in 1 to 5)
 		new /obj/item/seeds/random(src)
+
+/obj/item/storage/box/shipping
+	name = "box of shipping supplies"
+	desc = "Contains several scanners and labelers for shipping things. Wrapping Paper not included."
+	illustration = "shipping"
+
+/obj/item/storage/box/shipping/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/destTagger=1,\
+		/obj/item/sales_tagger=1,\
+		/obj/item/export_scanner=1,\
+		/obj/item/stack/packageWrap/small=2,\
+		/obj/item/stack/wrapping_paper/small=1
+		)
+	generate_items_inside(items_inside,src)