Merge remote-tracking branch 'upstream/master' into zombies

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

@@ -333,7 +333,7 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 					return FALSE
 				playsound(loc, usesound, 50, 1)
 				var/turf/AT = A
-				AT.ChangeTurf(/turf/space)
+				AT.ChangeTurf(AT.baseturf)
 				return TRUE
 			return FALSE
 		to_chat(user, "<span class='warning'>ERROR! Not enough matter in unit to deconstruct this floor!</span>")

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

@@ -325,6 +325,10 @@
 	origin_tech = "syndicate=1"
 	var/registered_user = null
 	untrackable = 1
+	var/anyone = FALSE //Can anyone forge the ID or just syndicate?
+
+/obj/item/card/id/syndicate/anyone
+	anyone = TRUE
 
 /obj/item/card/id/syndicate/New()
 	access = initial_access.Copy()
@@ -344,7 +348,7 @@
 	if(istype(O, /obj/item/card/id))
 		var/obj/item/card/id/I = O
 		if(istype(user, /mob/living) && user.mind)
-			if(user.mind.special_role)
+			if(user.mind.special_role || anyone)
 				to_chat(usr, "<span class='notice'>The card's microscanners activate as you pass it over \the [I], copying its access.</span>")
 				src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming
 

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

@@ -31,7 +31,6 @@ LIGHTERS ARE IN LIGHTERS.DM
 	var/lastHolder = null
 	var/smoketime = 300
 	var/chem_volume = 30
-	species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/mask.dmi',
 		"Unathi" = 'icons/mob/species/unathi/mask.dmi',

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

@@ -11,7 +11,6 @@
 	w_class = WEIGHT_CLASS_BULKY
 	origin_tech = "biotech=4"
 	actions_types = list(/datum/action/item_action/toggle_paddles)
-	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/back.dmi'
 		)
@@ -23,6 +22,9 @@
 	var/obj/item/stock_parts/cell/high/bcell = null
 	var/combat = 0 //can we revive through space suits?
 
+/obj/item/defibrillator/get_cell()
+	return bcell
+
 /obj/item/defibrillator/New() //starts without a cell for rnd
 	..()
 	paddles = make_paddles()

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

@@ -24,6 +24,10 @@
 	if(!istype(C))
 		return
 
+	if(flags & NODROP)
+		to_chat(user, "<span class='warning'>[src] is stuck to your hand!</span>")
+		return
+
 	if((CLUMSY in user.mutations) && prob(50) && (!ignoresClumsy))
 		to_chat(user, "<span class='warning'>Uh... how do those things work?!</span>")
 		apply_cuffs(user, user)

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

@@ -165,6 +165,22 @@
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
 
+/obj/item/kitchen/knife/combat/survival
+	name = "survival knife"
+	icon_state = "survivalknife"
+	desc = "A hunting grade survival knife."
+	force = 15
+	throwforce = 15
+
+/obj/item/kitchen/knife/combat/survival/bone
+	name = "bone dagger"
+	item_state = "bone_dagger"
+	icon_state = "bone_dagger"
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	desc = "A sharpened bone. The bare minimum in survival."
+	materials = list()
+
 /obj/item/kitchen/knife/combat/cyborg
 	name = "cyborg knife"
 	icon = 'icons/obj/items_cyborg.dmi'

code/game/objects/items/weapons/melee/energy.dm

@@ -2,6 +2,8 @@
 	var/active = 0
 	var/force_on = 30 //force when active
 	var/throwforce_on = 20
+	var/faction_bonus_force = 0 //Bonus force dealt against certain factions
+	var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
 	w_class = WEIGHT_CLASS_SMALL
 	var/w_class_on = WEIGHT_CLASS_BULKY
 	var/icon_state_on = "axe1"
@@ -13,6 +15,19 @@
 	var/brightness_on = 2
 	var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
 
+/obj/item/melee/energy/attack(mob/living/target, mob/living/carbon/human/user)
+	var/nemesis_faction = FALSE
+	if(LAZYLEN(nemesis_factions))
+		for(var/F in target.faction)
+			if(F in nemesis_factions)
+				nemesis_faction = TRUE
+				force += faction_bonus_force
+				nemesis_effects(user, target)
+				break
+	. = ..()
+	if(nemesis_faction)
+		force -= faction_bonus_force
+
 /obj/item/melee/energy/suicide_act(mob/user)
 	user.visible_message(pick("<span class='suicide'>[user] is slitting [user.p_their()] stomach open with the [name]! It looks like [user.p_theyre()] trying to commit seppuku.</span>", \
 						"<span class='suicide'>[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>"))
@@ -225,3 +240,127 @@
 	desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
 	icon_state = "lightblade"
 	item_state = "lightblade"
+
+/obj/item/melee/energy/proc/nemesis_effects(mob/living/user, mob/living/target)
+	return
+
+/obj/item/melee/energy/cleaving_saw
+	name = "cleaving saw"
+	desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force."
+	force = 12
+	force_on = 20 //force when active
+	throwforce = 20
+	throwforce_on = 20
+	icon = 'icons/obj/lavaland/artefacts.dmi'
+	lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+	inhand_x_dimension = 64
+	inhand_y_dimension = 64
+	icon_state = "cleaving_saw"
+	icon_state_on = "cleaving_saw_open"
+	slot_flags = SLOT_BELT
+	var/attack_verb_off = list("attacked", "sawed", "sliced", "torn", "ripped", "diced", "cut")
+	attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	w_class = WEIGHT_CLASS_BULKY
+	sharp = TRUE
+	faction_bonus_force = 30
+	nemesis_factions = list("mining", "boss")
+	var/transform_cooldown
+	var/swiping = FALSE
+
+/obj/item/melee/energy/cleaving_saw/nemesis_effects(mob/living/user, mob/living/target)
+	var/datum/status_effect/saw_bleed/B = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
+	if(!B)
+		if(!active) //This isn't in the above if-check so that the else doesn't care about active
+			target.apply_status_effect(STATUS_EFFECT_SAWBLEED)
+	else
+		B.add_bleed(B.bleed_buildup)
+
+/obj/item/melee/energy/cleaving_saw/attack_self(mob/living/carbon/user)
+	transform_weapon(user)
+
+/obj/item/melee/energy/cleaving_saw/proc/transform_weapon(mob/living/user, supress_message_text)
+	if(transform_cooldown > world.time)
+		return FALSE
+
+	transform_cooldown = world.time + (CLICK_CD_MELEE * 0.5)
+	user.changeNext_move(CLICK_CD_MELEE * 0.25)
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(H.disabilities & CLUMSY && prob(50))
+			to_chat(H, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
+			H.take_organ_damage(10,10)
+	active = !active
+	if(active)
+		force = force_on
+		throwforce = throwforce_on
+		hitsound = 'sound/weapons/bladeslice.ogg'
+		throw_speed = 4
+		if(attack_verb_on.len)
+			attack_verb = attack_verb_on
+		if(!item_color)
+			icon_state = icon_state_on
+			set_light(brightness_on)
+		else
+			icon_state = "sword[item_color]"
+			set_light(brightness_on, l_color=colormap[item_color])
+		w_class = w_class_on
+		playsound(user, 'sound/magic/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
+		to_chat(user, "<span class='notice'>You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.</span>")
+	else
+		force = initial(force)
+		throwforce = initial(throwforce)
+		hitsound = initial(hitsound)
+		throw_speed = initial(throw_speed)
+		if(attack_verb_on.len)
+			attack_verb = list()
+		icon_state = initial(icon_state)
+		w_class = initial(w_class)
+		playsound(user, 'sound/magic/fellowship_armory.ogg', 35, 1)  //changed it from 50% volume to 35% because deafness
+		set_light(0)
+		to_chat(user, "<span class='notice'>You close [src]. It will now attack rapidly and cause fauna to bleed.</span>")
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
+	add_fingerprint(user)
+
+/obj/item/melee/energy/cleaving_saw/examine(mob/user)
+	..()
+	to_chat(user, "<span class='notice'>It is [active ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].<br>\
+	Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.<br>\
+	Transforming it immediately after an attack causes the next attack to come out faster.</span>")
+
+/obj/item/melee/energy/cleaving_saw/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is [active ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	transform_cooldown = 0
+	transform_weapon(user, TRUE)
+	return BRUTELOSS
+
+/obj/item/melee/energy/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
+	..()
+	if(!active)
+		user.changeNext_move(CLICK_CD_MELEE * 0.5) //when closed, it attacks very rapidly
+
+/obj/item/melee/energy/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
+	if(!active || swiping || !target.density || get_turf(target) == get_turf(user))
+		if(!active)
+			faction_bonus_force = 0
+		..()
+		if(!active)
+			faction_bonus_force = initial(faction_bonus_force)
+	else
+		var/turf/user_turf = get_turf(user)
+		var/dir_to_target = get_dir(user_turf, get_turf(target))
+		swiping = TRUE
+		var/static/list/cleaving_saw_cleave_angles = list(0, -45, 45) //so that the animation animates towards the target clicked and not towards a side target
+		for(var/i in cleaving_saw_cleave_angles)
+			var/turf/T = get_step(user_turf, turn(dir_to_target, i))
+			for(var/mob/living/L in T)
+				if(user.Adjacent(L) && L.density)
+					melee_attack_chain(user, L)
+		swiping = FALSE

code/game/objects/items/weapons/melee/misc.dm

@@ -67,4 +67,38 @@
 	force = 10
 	throwforce = 7
 	w_class = WEIGHT_CLASS_NORMAL
-	attack_verb = list("slashed", "stabbed", "sliced", "caned")
+	attack_verb = list("slashed", "stabbed", "sliced", "caned")
+
+/obj/item/melee/flyswatter
+	name = "flyswatter"
+	desc = "Useful for killing insects of all sizes."
+	icon_state = "flyswatter"
+	item_state = "flyswatter"
+	force = 1
+	throwforce = 1
+	attack_verb = list("swatted", "smacked")
+	hitsound = 'sound/effects/snap.ogg'
+	w_class = WEIGHT_CLASS_SMALL
+	//Things in this list will be instantly splatted.  Flyman weakness is handled in the flyman species weakness proc.
+	var/list/strong_against
+
+/obj/item/melee/flyswatter/Initialize(mapload)
+	. = ..()
+	strong_against = typecacheof(list(
+					/mob/living/simple_animal/hostile/poison/bees/,
+					/mob/living/simple_animal/butterfly,
+					/mob/living/simple_animal/cockroach,
+					/obj/item/queen_bee
+	))
+
+/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag)
+	. = ..()
+	if(proximity_flag)
+		if(is_type_in_typecache(target, strong_against))
+			new /obj/effect/decal/cleanable/insectguts(target.drop_location())
+			to_chat(user, "<span class='warning'>You easily splat the [target].</span>")
+			if(istype(target, /mob/living/))
+				var/mob/living/bug = target
+				bug.death(1)
+			else
+				qdel(target)

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

@@ -4,6 +4,9 @@
 
 #define RPD_COOLDOWN_TIME		4 //How long should we have to wait between dispensing pipes?
 #define RPD_WALLBUILD_TIME		40 //How long should drilling into a wall take?
+#define RPD_MENU_ROTATE "Rotate pipes" //Stuff for radial menu
+#define RPD_MENU_FLIP "Flip pipes" //Stuff for radial menu
+#define RPD_MENU_DELETE "Delete pipes" //Stuff for radial menu
 
 /obj/item/rpd
 	name = "rapid pipe dispenser"
@@ -172,6 +175,9 @@ var/list/pipemenu = list(
 		ui.open()
 		ui.set_auto_update(1)
 
+/obj/item/rpd/AltClick(mob/user)
+	radial_menu(user)
+
 /obj/item/rpd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state)
 	var/data[0]
 	data["iconrotation"] = iconrotation
@@ -200,6 +206,44 @@ var/list/pipemenu = list(
 		return
 	SSnanoui.update_uis(src)
 
+//RPD radial menu
+
+/obj/item/rpd/proc/check_menu(mob/living/user)
+	if(!istype(user))
+		return
+	if(user.incapacitated())
+		return
+	if(loc != user)
+		return
+	return TRUE
+
+/obj/item/rpd/proc/radial_menu(mob/user)
+	if(!check_menu(user))
+		to_chat(user, "<span class='notice'>You can't do that right now!</span>")
+		return
+	var/list/choices = list(
+		RPD_MENU_ROTATE = image(icon = 'icons/obj/interface.dmi', icon_state = "rpd_rotate"),
+		RPD_MENU_FLIP = image(icon = 'icons/obj/interface.dmi', icon_state = "rpd_flip"),
+		RPD_MENU_DELETE = image(icon = 'icons/obj/interface.dmi', icon_state = "rpd_delete"),
+		"UI" = image(icon = 'icons/obj/interface.dmi', icon_state = "ui_interact")
+	)
+	var/selected_mode = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user))
+	if(!check_menu(user))
+		return
+	if(selected_mode == "UI")
+		ui_interact(user)
+	else
+		switch(selected_mode)
+			if(RPD_MENU_ROTATE)
+				mode = RPD_ROTATE_MODE
+			if(RPD_MENU_FLIP)
+				mode = RPD_FLIP_MODE
+			if(RPD_MENU_DELETE)
+				mode = RPD_DELETE_MODE
+			else
+				return //Either nothing was selected, or an invalid mode was selected
+		to_chat(user, "<span class='notice'>You set [src]'s mode.</span>")
+
 /obj/item/rpd/afterattack(atom/target, mob/user, proximity)
 	..()
 	if(loc != user)
@@ -236,3 +280,6 @@ var/list/pipemenu = list(
 
 #undef RPD_COOLDOWN_TIME
 #undef RPD_WALLBUILD_TIME
+#undef RPD_MENU_ROTATE
+#undef RPD_MENU_FLIP
+#undef RPD_MENU_DELETE

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

@@ -4,6 +4,8 @@
 	gender = PLURAL
 	icon = 'icons/obj/items.dmi'
 	icon_state = "soap"
+	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
 	throw_speed = 4

code/game/objects/items/weapons/storage/backpack.dm

@@ -17,7 +17,6 @@
 	storage_slots = 21
 	burn_state = FLAMMABLE
 	burntime = 20
-	species_fit = list("Vox")
 	sprite_sheets = list(
 		"Vox" = 'icons/mob/species/vox/back.dmi'
 		)
@@ -52,6 +51,7 @@
 	desc = "A backpack that opens into a localized pocket of Blue Space."
 	origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
 	icon_state = "holdingpack"
+	item_state = "holdingpack"
 	max_w_class = WEIGHT_CLASS_HUGE
 	max_combined_w_class = 35
 	burn_state = FIRE_PROOF
@@ -158,6 +158,12 @@
 	item_state = "engiepack"
 	burn_state = FIRE_PROOF
 
+/obj/item/storage/backpack/explorer
+	name = "explorer bag"
+	desc = "A robust backpack for stashing your loot."
+	icon_state = "explorerpack"
+	item_state = "explorerpack"
+
 /obj/item/storage/backpack/botany
 	name = "botany backpack"
 	desc = "It's a backpack made of all-natural fibers."
@@ -235,6 +241,12 @@
 	icon_state = "satchel-eng"
 	burn_state = FIRE_PROOF
 
+/obj/item/storage/backpack/satchel/explorer
+	name = "explorer satchel"
+	desc = "A robust satchel for stashing your loot."
+	icon_state = "satchel-explorer"
+	item_state = "securitypack"
+
 /obj/item/storage/backpack/satchel_med
 	name = "medical satchel"
 	desc = "A sterile satchel used in medical departments."
@@ -345,6 +357,21 @@
 	new /obj/item/ammo_box/magazine/m12g/buckshot(src)
 	new /obj/item/ammo_box/magazine/m12g/dragon(src)
 
+/obj/item/storage/backpack/duffel/mining_conscript/noid
+	name = "mining conscription kit"
+	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
+
+/obj/item/storage/backpack/duffel/mining_conscript/noid/New()
+	..()
+	new /obj/item/pickaxe(src)
+	new /obj/item/clothing/glasses/meson(src)
+	new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
+	new /obj/item/storage/bag/ore(src)
+	new /obj/item/clothing/under/rank/miner/lavaland(src)
+	new /obj/item/encryptionkey/headset_cargo(src)
+	new /obj/item/clothing/mask/gas(src)
+
+
 /obj/item/storage/backpack/duffel/syndie/ammo/smg
 	desc = "A large duffel bag, packed to the brim with C-20r magazines."
 

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

@@ -385,7 +385,8 @@
 		/obj/item/flashlight,
 		/obj/item/reagent_containers/spray,
 		/obj/item/soap,
-		/obj/item/holosign_creator
+		/obj/item/holosign_creator,
+		/obj/item/melee/flyswatter,
 		)
 
 /obj/item/storage/belt/janitor/full/New()
@@ -396,6 +397,7 @@
 	new /obj/item/soap(src)
 	new /obj/item/grenade/chem_grenade/cleaner(src)
 	new /obj/item/grenade/chem_grenade/cleaner(src)
+	new /obj/item/melee/flyswatter(src)
 	update_icon()
 
 /obj/item/storage/belt/lazarus
@@ -723,3 +725,52 @@
 
 	new /obj/item/analyzer(src)
 	new /obj/item/healthanalyzer(src)
+
+/obj/item/storage/belt/mining
+	name = "explorer's webbing"
+	desc = "A versatile chest rig, cherished by miners and hunters alike."
+	icon_state = "explorer1"
+	item_state = "explorer1"
+	storage_slots = 6
+	max_w_class = WEIGHT_CLASS_BULKY
+	use_item_overlays = 0
+	can_hold = list(
+		/obj/item/crowbar,
+		/obj/item/screwdriver,
+		/obj/item/weldingtool,
+		/obj/item/wirecutters,
+		/obj/item/wrench,
+		/obj/item/multitool,
+		/obj/item/flashlight,
+		/obj/item/stack/cable_coil,
+		/obj/item/analyzer,
+		/obj/item/extinguisher/mini,
+		/obj/item/radio,
+		/obj/item/clothing/gloves,
+		/obj/item/resonator,
+		/obj/item/mining_scanner,
+		/obj/item/pickaxe,
+		/obj/item/stack/sheet/animalhide,
+		/obj/item/stack/sheet/sinew,
+		/obj/item/stack/sheet/bone,
+		/obj/item/lighter,
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/reagent_containers/food/drinks/bottle,
+		/obj/item/stack/medical,
+		/obj/item/kitchen/knife,
+		/obj/item/reagent_containers/hypospray,
+		/obj/item/gps,
+		/obj/item/storage/bag/ore,
+		/obj/item/survivalcapsule,
+		/obj/item/t_scanner/adv_mining_scanner,
+		/obj/item/reagent_containers/food/pill,
+		/obj/item/stack/ore,
+		/obj/item/reagent_containers/food/drinks,
+		/obj/item/organ/internal/hivelord_core,
+		/obj/item/wormhole_jaunter,
+		/obj/item/storage/bag/plants,
+		/obj/item/stack/marker_beacon)
+
+/obj/item/storage/belt/mining/New()
+	..()
+	new /obj/item/survivalcapsule(src)

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

@@ -191,6 +191,15 @@
 		new /obj/item/reagent_containers/glass/beaker( src )
 		new /obj/item/reagent_containers/glass/beaker( src )
 
+/obj/item/storage/box/beakers/bluespace
+	name = "box of bluespace beakers"
+	icon_state = "beaker"
+
+/obj/item/storage/box/beakers/bluespace/New()
+	..()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/glass/beaker/bluespace(src)
+
 /obj/item/storage/box/iv_bags
 	name = "IV Bags"
 	desc = "A box full of empty IV bags."
@@ -536,6 +545,10 @@
 	for(var/i in 1 to 5)
 		new monkey_cube_type(src)
 
+/obj/item/storage/box/monkeycubes/syndicate
+	desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
+	monkey_cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
+
 /obj/item/storage/box/monkeycubes/farwacubes
 	name = "farwa cube box"
 	desc = "Drymate brand farwa cubes. Just add water!"
@@ -1044,6 +1057,56 @@
 	new /obj/item/circuitboard/circuit_imprinter(src)
 	new /obj/item/circuitboard/rdconsole/public(src)
 
+/obj/item/storage/box/stockparts/basic //for ruins where it's a bad idea to give access to an autolathe/protolathe, but still want to make stock parts accessible
+	name = "box of stock parts"
+	desc = "Contains a variety of basic stock parts."
+
+/obj/item/storage/box/stockparts/basic/New()
+	..()
+	for(var/i in 1 to 3)
+		new /obj/item/stock_parts/capacitor(src)
+		new /obj/item/stock_parts/scanning_module(src)
+		new /obj/item/stock_parts/manipulator(src)
+		new /obj/item/stock_parts/micro_laser(src)
+		new /obj/item/stock_parts/matter_bin(src)
+
+/obj/item/storage/box/stockparts/deluxe
+	name = "box of deluxe stock parts"
+	desc = "Contains a variety of deluxe stock parts."
+
+/obj/item/storage/box/stockparts/deluxe/New()
+	for(var/i in 1 to 3)
+		new /obj/item/stock_parts/capacitor/quadratic(src)
+		new /obj/item/stock_parts/scanning_module/triphasic(src)
+		new /obj/item/stock_parts/manipulator/femto(src)
+		new /obj/item/stock_parts/micro_laser/quadultra(src)
+		new /obj/item/stock_parts/matter_bin/bluespace(src)
+
+/obj/item/storage/box/mininghardsuit
+	name = "Boxed Mining Hardsuit"
+	desc = "Contains a mining hardsuit and helmet. For mining."
+
+/obj/item/storage/box/mininghardsuit/New()
+	..()
+	new /obj/item/clothing/suit/space/hardsuit/mining(src)
+	new /obj/item/clothing/head/helmet/space/hardsuit/mining(src)
+
+/obj/item/storage/box/hug
+	name = "box of hugs"
+	desc = "A special box for sensitive people."
+	icon_state = "hugbox"
+	foldable = null
+
+/obj/item/storage/box/hug/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] clamps the box of hugs on [user.p_their()] jugular! Guess it wasn't such a hugbox after all..</span>")
+	return (BRUTELOSS)
+
+/obj/item/storage/box/hug/attack_self(mob/user)
+	..()
+	user.changeNext_move(CLICK_CD_MELEE)
+	playsound(loc, "rustle", 50, 1, -5)
+	user.visible_message("<span class='notice'>[user] hugs \the [src].</span>","<span class='notice'>You hug \the [src].</span>")
+
 #undef NODESIGN
 #undef NANOTRASEN
 #undef SYNDI

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

@@ -62,6 +62,7 @@
 /obj/item/storage/fancy/egg_box
 	icon_state = "eggbox"
 	icon_type = "egg"
+	item_state = "eggbox"
 	name = "egg box"
 	storage_slots = 12
 	can_hold = list(/obj/item/reagent_containers/food/snacks/egg)

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -1,112 +1,120 @@
-/obj/item/storage/box/syndicate/
-	New()
-		..()
-		switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "gadgets" = 1, "professional" = 1)))
-			if("bloodyspai")	// 28TC
-				new /obj/item/twohanded/garrote(src)
-				new /obj/item/pinpointer/advpinpointer(src)
-				new /obj/item/clothing/mask/chameleon(src)
-				new /obj/item/clothing/under/chameleon(src)
-				new /obj/item/card/id/syndicate(src)
-				new /obj/item/flashlight/emp(src)
-				new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src)
-				new /obj/item/clothing/glasses/hud/security/chameleon(src)
-				new /obj/item/camera_bug(src)
-				return
+/obj/item/storage/box/syndicate/New()
+	..()
+	switch(pickweight(list("bloodyspai" = 1, "thief" = 1, "bond" = 1, "sabotage" = 1, "payday" = 1, "implant" = 1, "hacker" = 1, "darklord" = 1, "professional" = 1)))
+		if("bloodyspai") // 35TC + one 0TC
+			new /obj/item/clothing/under/chameleon(src) // 2TC
+			new /obj/item/clothing/mask/chameleon(src) // 0TC
+			new /obj/item/card/id/syndicate(src) // 2TC
+			new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC
+			new /obj/item/camera_bug(src) // 1TC
+			new /obj/item/multitool/ai_detect(src) // 1TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			new /obj/item/twohanded/garrote(src) // 10TC
+			new /obj/item/pinpointer/advpinpointer(src) // 4TC
+			new /obj/item/storage/fancy/cigarettes/cigpack_syndicate(src) // 2TC
+			new /obj/item/flashlight/emp(src) // 2TC
+			new /obj/item/clothing/glasses/hud/security/chameleon(src) // 2TC
+			new /obj/item/chameleon(src) // 8TC
+			return
 
-			if("thief")	// 30TC
-				new /obj/item/gun/energy/kinetic_accelerator/crossbow(src)
-				new /obj/item/chameleon(src)
-				new /obj/item/clothing/gloves/color/black/thief(src)
-				new /obj/item/card/id/syndicate(src)
-				new /obj/item/clothing/shoes/chameleon/noslip(src)
-				new /obj/item/storage/box/syndie_kit/safecracking(src)
-				return
+		if("thief")	// 40TC
+			new /obj/item/gun/energy/kinetic_accelerator/crossbow(src) // 12TC
+			new /obj/item/chameleon(src) // 8TC
+			new /obj/item/clothing/glasses/thermal/syndi(src) // 6TC
+			new /obj/item/clothing/gloves/color/black/thief(src) // 6TC
+			new /obj/item/card/id/syndicate(src) // 2TC
+			new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC
+			new /obj/item/storage/backpack/satchel_flat(src) // 2TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			return
 
-			if("bond")	// 29TC + Healing Cocktail + armored suit jacket
-				new /obj/item/gun/projectile/automatic/pistol(src)
-				new /obj/item/suppressor(src)
-				new /obj/item/ammo_box/magazine/m10mm/hp(src)
-				new /obj/item/ammo_box/magazine/m10mm/ap(src)
-				new /obj/item/encryptionkey/syndicate(src)
-				new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src)	// This drink heals now
-				new /obj/item/card/id/syndicate(src)
-				new /obj/item/dnascrambler(src)
-				new /obj/item/storage/box/syndie_kit/emp(src)
-				new /obj/item/CQC_manual(src)
-				new /obj/item/clothing/under/suit_jacket/really_black(src)
-				new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src)
-				return
+		if("bond") // 33TC + three 0TC
+			new /obj/item/gun/projectile/automatic/pistol(src) // 4TC
+			new /obj/item/suppressor(src) // 1TC
+			new /obj/item/ammo_box/magazine/m10mm/hp(src)  // 3TC
+			new /obj/item/ammo_box/magazine/m10mm/ap(src) // 2TC
+			new /obj/item/clothing/under/suit_jacket/really_black(src) // 0TC
+			new /obj/item/card/id/syndicate(src) // 2TC
+			new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(src)	// 0TC
+			new /obj/item/dnascrambler(src) // 4TC
+			new /obj/item/storage/box/syndie_kit/emp(src) // 2TC
+			new /obj/item/CQC_manual(src) // 13TC
+			return
 
-			if("sabotage")	// 31TC + RCD + Insuls
-				new /obj/item/powersink(src)
-				new /obj/item/grenade/syndieminibomb(src)
-				new /obj/item/card/emag(src)
-				new /obj/item/grenade/clusterbuster/n2o(src)
-				new /obj/item/clothing/gloves/color/yellow(src)
-				new /obj/item/rcd/preloaded(src)
-				new /obj/item/storage/box/syndie_kit/space(src)
-				return
+		if("sabotage") // 47TC + three 0TC
+			new /obj/item/grenade/plastic/c4(src) // 1TC
+			new /obj/item/grenade/plastic/c4(src) // 1TC
+			new /obj/item/camera_bug(src) // 1TC
+			new /obj/item/powersink(src) // 10TC
+			new /obj/item/cartridge/syndicate(src) // 6TC
+			new /obj/item/rcd/preloaded(src) // 0TC
+			new /obj/item/card/emag(src) // 6TC
+			new /obj/item/clothing/gloves/color/yellow(src) // 0TC
+			new /obj/item/grenade/syndieminibomb(src) // 6TC
+			new /obj/item/grenade/clusterbuster/n2o(src) // 0TC
+			new /obj/item/storage/box/syndie_kit/space(src) // 4TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			return
 
-			if("payday")	// 31TC + armored suit jacket
-				new /obj/item/gun/projectile/revolver(src)
-				new /obj/item/ammo_box/a357(src)
-				new /obj/item/ammo_box/a357(src)
-				new /obj/item/card/emag(src)
-				new /obj/item/grenade/plastic/c4(src)
-				new /obj/item/card/id/syndicate(src)
-				new /obj/item/clothing/under/suit_jacket/really_black(src)
-				new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src)
-				new /obj/item/clothing/gloves/color/latex/nitrile(src)
-				new /obj/item/clothing/mask/gas/clown_hat(src)
-				new /obj/item/thermal_drill(src)
-				return
+		if("payday") // 33TC + four 0TC
+			new /obj/item/gun/projectile/revolver(src) // 13TC
+			new /obj/item/ammo_box/a357(src) // 3TC
+			new /obj/item/ammo_box/a357(src) // 3TC
+			new /obj/item/card/emag(src) // 6TC
+			new /obj/item/grenade/plastic/c4(src) // 1TC
+			new /obj/item/card/id/syndicate(src) // 2TC
+			new /obj/item/clothing/under/suit_jacket/really_black(src) //0TC
+			new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) //0TC
+			new /obj/item/clothing/gloves/color/latex/nitrile(src) //0 TC
+			new /obj/item/clothing/mask/gas/clown_hat(src) // 0TC
+			new /obj/item/thermal_drill(src) // 3TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			return
 
-			if("implant")	// 35TC
-				new /obj/item/implanter/uplink(src)
-				new /obj/item/implanter/adrenalin(src)
-				new /obj/item/implanter/storage(src)
-				new /obj/item/implanter/freedom(src)
-				return
+		if("implant") // 39TC + ten free TC
+			new /obj/item/implanter/freedom(src) // 5TC
+			new /obj/item/implanter/uplink(src) // 14TC (ten free TC)
+			new /obj/item/implanter/emp(src) // 0TC
+			new /obj/item/implanter/adrenalin(src) // 8TC
+			new /obj/item/implanter/explosive(src) // 2TC
+			new /obj/item/implanter/storage(src) // 8TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			return
 
-			if("hacker")	// 22TC + Ion law uploader
-				new /obj/item/aiModule/syndicate(src)
-				new /obj/item/encryptionkey/binary(src)
-				new /obj/item/encryptionkey/syndicate(src)
-				new /obj/item/aiModule/toyAI(src)
-				new /obj/item/card/emag(src)
-				return
+		if("hacker") // 30TC + one 0TC
+			new /obj/item/aiModule/syndicate(src) // 12TC
+			new /obj/item/card/emag(src) // 6TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			new /obj/item/encryptionkey/binary(src) // 5TC
+			new /obj/item/aiModule/toyAI(src) // 0TC
+			new /obj/item/multitool/ai_detect(src) // 1TC
+			new /obj/item/storage/box/syndie_kit/c4 // 4TC
+			return
 
-			if("darklord")	// 23TC + TK implant
-				new /obj/item/melee/energy/sword/saber/red(src)
-				new /obj/item/melee/energy/sword/saber/red(src)
-				new /obj/item/dnainjector/telemut/darkbundle(src)
-				new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
-				new /obj/item/card/id/syndicate(src)
-				new /obj/item/clothing/shoes/chameleon/noslip(src)
-				new /obj/item/clothing/mask/chameleon(src)
-				return
+		if("darklord") // 22TC + two 0TC
+			new /obj/item/melee/energy/sword/saber/red(src) // 8TC
+			new /obj/item/melee/energy/sword/saber/red(src) // 8TC
+			new /obj/item/dnainjector/telemut/darkbundle(src) // 0TC
+			new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) // 0TC
+			new /obj/item/card/id/syndicate(src) // 2TC
+			new /obj/item/clothing/shoes/chameleon/noslip(src) // 2TC
+			new /obj/item/clothing/mask/chameleon(src) // 2TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			return
 
-			if("gadgets")	// 30TC
-				new /obj/item/clothing/gloves/color/yellow/power(src)
-				new /obj/item/pen/sleepy(src)
-				new /obj/item/clothing/shoes/chameleon/noslip(src)
-				new /obj/item/clothing/glasses/thermal/syndi(src)
-				new /obj/item/flashlight/emp(src)
-				new /obj/item/stamp/chameleon(src)
-				new /obj/item/multitool/ai_detect(src)
-				return
-
-			if("professional")	// 29TC + armored suit jacket + insulated combat gloves
-				new /obj/item/gun/projectile/automatic/sniper_rifle/soporific(src)	// Unique version that starts with soporific rounds loaded and cannot be suppressed
-				new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
-				new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
-				new /obj/item/pen/edagger(src)
-				new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src)
-				new /obj/item/clothing/under/suit_jacket/really_black(src)
-				new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src)
-				new /obj/item/clothing/gloves/combat(src)
-				return
+		if("professional") // 32 TC + two 0TC
+			new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator(src) // 16TC
+			new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src) // 5TC
+			new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src) // 3TC
+			new /obj/item/clothing/glasses/thermal/syndi/sunglasses(src) // 6TC 
+			new /obj/item/clothing/gloves/combat(src) // 0 TC
+			new /obj/item/clothing/under/suit_jacket/really_black(src) // 0 TC
+			new /obj/item/clothing/suit/storage/lawyer/blackjacket/armored(src) // 0TC
+			new /obj/item/pen/edagger(src) // 2TC
+			new /obj/item/encryptionkey/syndicate(src) // 2TC
+			return
 
 /obj/item/storage/box/syndie_kit
 	name = "Box"

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

@@ -20,6 +20,9 @@
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.</span>")
 	return FIRELOSS
 
+/obj/item/melee/baton/get_cell()
+	return bcell
+
 /obj/item/melee/baton/New()
 	..()
 	update_icon()

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

@@ -192,6 +192,15 @@
 			var/obj/structure/grille/G = A
 			G.take_damage(40, BRUTE, "melee", 0)
 
+/obj/item/twohanded/fireaxe/boneaxe  // Blatant imitation of the fireaxe, but made out of bone.
+	icon_state = "bone_axe0"
+	name = "bone axe"
+	desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
+	force_wielded = 23
+
+/obj/item/twohanded/fireaxe/boneaxe/update_icon()
+	icon_state = "bone_axe[wielded]"
+
 /*
  * Double-Bladed Energy Swords - Cheridan
  */
@@ -347,6 +356,19 @@
 		explosive.prime()
 		qdel(src)
 
+/obj/item/twohanded/spear/bonespear	//Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
+	icon_state = "bone_spear0"
+	name = "bone spear"
+	desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
+	force = 11
+	force_unwielded = 11
+	force_wielded = 20					//I have no idea how to balance
+	throwforce = 22
+	armour_penetration = 15				//Enhanced armor piercing
+
+/obj/item/twohanded/spear/bonespear/update_icon()
+	icon_state = "bone_spear[wielded]"
+
 //GREY TIDE
 /obj/item/twohanded/spear/grey_tide
 	icon_state = "spearglass0"