adds nondrug contraband to loadout

code/modules/client/preference_setup/loadout/loadout_contraband.dm

@@ -32,4 +32,38 @@
 	..()
 	var/paperselect = list("rolling papers" = /obj/item/storage/rollingpapers,
 							"blunt wrappers" = /obj/item/storage/rollingpapers/blunt)
-	gear_tweaks += new/datum/gear_tweak/path(paperselect)
+	gear_tweaks += new/datum/gear_tweak/path(paperselect)
+
+/datum/gear/contraband/pepperspray
+	display_name = "personal pepper spray"
+	description = "A smaller bottle of pepper spray, it's less powerful than the security standard issue."
+	path = /obj/item/reagent_containers/spray/pepper/small
+	cost = 3
+
+/datum/gear/contraband/phasepistol
+	display_name = "phase pistol"
+	description = "A phase pistol designed for handling the typical wildlife found on Sif. Not particularly effective against anything else..."
+	path = /obj/item/gun/energy/phasegun/pistol
+	cost = 5
+
+/datum/gear/contraband/knives /// Steel by default
+	display_name = "knife selection"
+	description = "Steel knives in various designs."
+	path = /obj/item/material/knife
+	cost = 4
+
+/datum/gear/contraband/knives/New()
+	..()
+	var/knife = list()
+	knife["boot knife"] = /obj/item/material/knife/tacknife/boot
+	knife["butterfly knife"] = /obj/item/material/butterfly
+	knife["switchblade"] = /obj/item/material/butterfly/switchblade
+	knife["boxcutter"] = /obj/item/material/butterfly/boxcutter
+	knife["survival knife"] = /obj/item/material/knife/tacknife/survival
+	gear_tweaks += new/datum/gear_tweak/path(knife)
+
+/datum/gear/contraband/zipgun
+	display_name = "zip gun"
+	description = "A single shot gun. You can't quite remember what ammo it used..." /// It randomizes from a list of (potentially shitty) ammunition.
+	path = /obj/item/gun/projectile/pirate
+	cost = 10

code/modules/client/preference_setup/loadout/loadout_cyberware.dm

@@ -5,7 +5,7 @@
 	slot = "implant"
 	exploitable = 1
 	sort_category = "Cyberware"
-	cost = 6
+	cost = 4
 
 /datum/gear/utility/implant/tracking
 	display_name = "implant, tracking"

code/modules/client/preference_setup/loadout/loadout_mask.dm

@@ -26,7 +26,16 @@
 	display_name = "black veil"
 	path = /obj/item/clothing/mask/veil
 
-/datum/gear/mask/plaguedoctor2
-	display_name = "golden plague doctor's mask"
-	path = /obj/item/clothing/mask/gas/plaguedoctor/gold
-	cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage.
+/datum/gear/mask/gasmasks
+	display_name = "gas mask selection"
+	path = /obj/item/clothing/mask/gas
+	cost = 2
+
+/datum/gear/mask/gasmasks/New()
+	..()
+	var/masks = list()
+	masks["gas mask"] = /obj/item/clothing/mask/gas
+	masks["clear gas mask"] = /obj/item/clothing/mask/gas/clear
+	masks["plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor
+	masks["gold plague doctor mask"] = /obj/item/clothing/mask/gas/plaguedoctor/gold
+	gear_tweaks += new/datum/gear_tweak/path(masks)

code/modules/reagents/reagent_containers/spray.dm

@@ -129,7 +129,7 @@
 
 /obj/item/reagent_containers/spray/pepper/Initialize()
 	. = ..()
-	reagents.add_reagent("condensedcapsaicin", 40)
+	reagents.add_reagent("condensedcapsaicin", volume)
 
 /obj/item/reagent_containers/spray/pepper/examine(mob/user)
 	. = ..()
@@ -146,6 +146,14 @@
 		return
 	. = ..()
 
+/obj/item/reagent_containers/spray/pepper/small
+	name = "personal pepperspray"
+	desc = "A small personal defense weapon with up to two smaller pumps of blinding spray."
+	icon_state = "pepperspray_small"
+	item_state = "pepperspray_small"
+	volume = 10
+	amount_per_transfer_from_this = 5
+
 /obj/item/reagent_containers/spray/waterflower
 	name = "water flower"
 	desc = "A seemingly innocent sunflower...with a twist."