Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE

2026-08-26 13:37:58 +01:00 · 2019-01-19 23:35:15 -05:00
parent bbe6370b91 eaeeb0cb7d
commit b812736517
439 changed files with 12076 additions and 5435 deletions
@@ -16,6 +16,7 @@
 	anchored = TRUE
 	layer = TURF_DECAL_LAYER
 	icon = 'icons/turf/snow.dmi'
+	icon_state = "snow"

 /obj/effect/decal/snow/clean/edge
 	icon_state = "snow_corner"
@@ -6,6 +6,7 @@
 	icon = 'icons/effects/effects.dmi'
 	burn_state = LAVA_PROOF | FIRE_PROOF
 	resistance_flags = INDESTRUCTIBLE
+	anchored = 1
 	can_be_hit = FALSE

 /obj/effect/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
@@ -7,6 +7,12 @@
 	opacity = 0
 	density = 1
 	unacidable = 1
+	var/lifetime = 30 SECONDS
+
+/obj/effect/forcefield/New()
+	..()
+	if(lifetime)
+		QDEL_IN(src, lifetime)

 /obj/effect/forcefield/CanAtmosPass(turf/T)
 	return !density
@@ -29,12 +35,6 @@
 	icon_state = "empty"
 	name = "invisible wall"
 	desc = "You have a bad feeling about this."
-	var/lifetime = 30 SECONDS
-
-/obj/effect/forcefield/mime/New()
-	..()
-	if(lifetime)
-		QDEL_IN(src, lifetime)

 /obj/effect/forcefield/mime/advanced
 	name = "invisible blockade"
@@ -88,6 +88,10 @@
 			emergencyresponseteamspawn += loc
 			qdel(src)

+		if("Syndicate Officer")
+			syndicateofficer += loc
+			qdel(src)
+
 	GLOB.landmarks_list += src
 	return 1

@@ -286,3 +290,7 @@
 	..()
 	var/turf/simulated/T = get_turf(src)
 	T.burn_tile()
+
+
+/obj/effect/landmark/battle_mob_point
+	name = "Nanomob Battle Avatar Spawn Point"
@@ -53,6 +53,15 @@
 	if(isliving(victim))
 		victim.Weaken(stun_time)

+/obj/effect/mine/depot
+	name = "sentry mine"
+
+/obj/effect/mine/depot/mineEffect(mob/living/victim)
+	var/area/syndicate_depot/core/depotarea = areaMaster
+	if(istype(depotarea))
+		if(depotarea.mine_triggered(victim))
+			explosion(loc, 1, 0, 0, 1) // devastate the tile you are on, but leave everything else untouched
+
 /obj/effect/mine/dnascramble
 	name = "Radiation Mine"
 	var/radiation_amount
@@ -66,4 +66,5 @@
 	desc = "A portal capable of bypassing bluespace interference."
 	icon_state = "portal1"
 	failchance = 0
+	precision = 0
 	ignore_tele_proof_area_setting = TRUE
@@ -0,0 +1,140 @@
+/obj/effect/snowcloud
+	name = "snow cloud"
+	desc = "Let it snow, let it snow, let it snow!"
+	icon_state = "snowcloud"
+	layer = FLY_LAYER
+	anchored = TRUE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	var/obj/machinery/snow_machine/parent_machine
+
+/obj/effect/snowcloud/New(turf, obj/machinery/snow_machine/SM)
+	..()
+	processing_objects.Add(src)
+	if(SM && istype(SM))
+		parent_machine = SM
+
+/obj/effect/snowcloud/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/effect/snowcloud/process()
+	if(QDELETED(parent_machine))
+		parent_machine = null
+	var/turf/T = get_turf(src)
+	if(isspaceturf(T))
+		qdel(src)
+		return
+	var/turf_hotness
+	if(issimulatedturf(T))
+		var/turf/simulated/S = T
+		turf_hotness = S.air.temperature
+	if(turf_hotness > T0C && prob(10 * (turf_hotness - T0C))) //Cloud disappears if it's too warm
+		qdel(src)
+		return
+	if(!parent_machine || !parent_machine.active || parent_machine.stat & NOPOWER) //All reasons a cloud could dissipate
+		if(prob(10))
+			qdel(src)
+		return
+	try_to_snow()
+	try_to_spread_cloud()
+	parent_machine.affect_turf_temperature(T, 0.25 * parent_machine.cooling_speed)
+
+/obj/effect/snowcloud/proc/try_to_snow()
+	var/turf/T = get_turf(src)
+	if(locate(/obj/effect/snow, T))
+		return
+	if(issimulatedturf(T))
+		var/turf/simulated/S = T
+		if(prob(75 + S.air.temperature - T0C)) //Colder turf = more chance of snow
+			return
+	new /obj/effect/snow(T)
+
+/obj/effect/snowcloud/proc/try_to_spread_cloud()
+	if(prob(95 - parent_machine.cooling_speed * 5)) //10 / 15 / 20 / 25% chance to spawn a new cloud
+		return
+	var/list/random_dirs = shuffle(cardinal)
+	for(var/potential in random_dirs)
+		var/turf/T = get_turf(get_step(src, potential))
+		if(isspaceturf(T) || T.density)
+			continue
+		if(!T.CanAtmosPass(T))
+			continue
+		if(parent_machine.make_snowcloud(T))
+			return
+
+
+//Snow stuff below
+
+/obj/effect/snow
+	desc = "Perfect for making snow angels, or throwing at other people!"
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "snow"
+	layer = ABOVE_ICYOVERLAY_LAYER
+	anchored = TRUE
+
+/obj/effect/snow/New()
+	processing_objects.Add(src)
+	icon_state = "snow[rand(1,6)]"
+	..()
+
+/obj/effect/snow/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/effect/snow/process()
+	var/turf/T = get_turf(src)
+	if(isspaceturf(T))
+		qdel(src)
+		return
+	else if(issimulatedturf(T))
+		var/turf/simulated/S = T
+		if(S.air.temperature <= T0C)
+			return
+		if(prob(10 + S.air.temperature - T0C))
+			qdel(src)
+
+/obj/effect/snow/attack_hand(mob/living/carbon/human/user)
+	if(!istype(user)) //Nonhumans don't have the balls to fight in the snow
+		return
+	user.changeNext_move(CLICK_CD_MELEE)
+	var/obj/item/snowball/SB = new(get_turf(user))
+	user.put_in_hands(SB)
+	to_chat(user, "<span class='notice'>You scoop up some snow and make \a [SB]!</span>")
+
+/obj/effect/snow/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/shovel))
+		var/obj/item/shovel/S = I
+		user.visible_message("<span class='notice'>[user] is clearing away [src]...</span>", "<span class='notice'>You begin clearing away [src]...</span>", "<span class='warning'>You hear a wettish digging sound.</span>")
+		playsound(loc, S.usesound, 50, TRUE)
+		if(!do_after(user, 50 * S.toolspeed, target = src))
+			return
+		user.visible_message("<span class='notice'>[user] clears away [src]!</span>", "<span class='notice'>You clear away [src]!</span>")
+		qdel(src)
+	else
+		return ..()
+
+/obj/effect/snow/fire_act()
+	qdel(src)
+
+/obj/effect/snow/ex_act(severity)
+	if(severity == 3 && prob(50))
+		return
+	qdel(src)
+
+/obj/item/snowball
+	name = "snowball"
+	desc = "Get ready for a snowball fight!"
+	force = 0
+	throwforce = 10
+	icon_state = "snowball"
+	damtype = STAMINA
+
+/obj/item/snowball/throw_impact(atom/target)
+	..()
+	qdel(src)
+
+/obj/item/snowball/fire_act()
+	qdel(src)
+
+/obj/item/snowball/ex_act(severity)
+	qdel(src)
@@ -98,6 +98,7 @@
 				/obj/item/poster/random_contraband = 10,
 				/obj/item/crowbar = 10,
 				/obj/item/crowbar/red = 10,
+				/obj/item/restraints/handcuffs/toy = 5,
 				/obj/item/extinguisher = 90,
 				//obj/item/gun/projectile/revolver/russian = 1, //disabled until lootdrop is a proper world proc.
 				/obj/item/hand_labeler = 10,
@@ -152,7 +153,8 @@
 				/obj/item/toy/cards/deck/syndicate = 2,
 				/obj/item/storage/secure/briefcase/syndie = 2,
 				/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 2,
-				"" = 70
+				/obj/item/storage/pill_bottle/fakedeath = 2,
+				"" = 68
 				)

 /obj/effect/spawner/lootdrop/crate_spawner // for ruins
@@ -164,44 +166,218 @@
 				"" = 80,
 				)

-/obj/effect/spawner/lootdrop/trade_sol_rare
-	name = "trader rare item spawner"
-	lootdoubles = 0
+
+
+/obj/effect/spawner/lootdrop/trade_sol/
+	name = "trader item spawner"
+	lootcount = 6
+	lootdoubles = 1
 	color = "#00FFFF"

+
+/obj/effect/spawner/lootdrop/trade_sol/civ
+	name = "1. civilian gear"
 	loot = list(
-				/obj/item/card/emag_broken = 2,
-				/obj/item/defibrillator/compact/loaded = 2,
-				/obj/item/gun/energy/laser/retro = 2,
-				/obj/item/rcd/combat = 1,
-				/obj/item/rcd = 2,
+				// General utility gear
+				/obj/item/storage/belt/utility/full/multitool = 150,
+				/obj/item/clothing/gloves/combat = 100,
+				/obj/item/clothing/glasses/welding = 50,
+				/obj/item/reagent_containers/spray/cleaner = 100,
+				/obj/item/clothing/shoes/magboots = 50,
+				/obj/item/soap = 50,
+				/obj/item/clothing/under/syndicate/combat = 50,
+				/obj/item/soap/syndie = 50,
+				/obj/item/lighter/zippo/gonzofist = 50,
+				/obj/item/stack/nanopaste = 50,
+				/obj/item/clothing/under/psyjump = 50,
+				/obj/item/immortality_talisman = 50,
+				/obj/item/grenade/clusterbuster/smoke = 50
 				)

-/obj/effect/spawner/lootdrop/trade_sol_common
-	name = "trader common item spawner"
-	lootdoubles = 0
-	color = "#00FFFF"
-
+/obj/effect/spawner/lootdrop/trade_sol/minerals
+	name = "2. minerals"
+	lootdoubles = 1
 	loot = list(
-				/obj/item/tank/anesthetic = 2,
-				/obj/item/weldingtool/hugetank = 2,
-				/obj/item/pickaxe/diamond = 1,
-				/obj/item/spacepod_equipment/weaponry/mining_laser = 1,
-				/obj/item/paicard = 2,
-				/obj/item/gun/projectile/automatic/pistol = 2,
-				/obj/item/megaphone = 2,
-				/obj/item/stock_parts/capacitor = 1,
-				/obj/item/stock_parts/cell/high = 1,
-				/obj/item/stock_parts/manipulator = 1,
-				/obj/item/stock_parts/matter_bin = 1,
-				/obj/item/stock_parts/micro_laser = 1,
-				/obj/item/stock_parts/scanning_module = 1,
-				/obj/item/stack/spacecash/c200 = 1,
-				/obj/item/airlock_electronics = 1,
-				/obj/item/gun/energy/kinetic_accelerator = 1,
-				/obj/item/pizzabox = 3,
+				// Common stuff you get from mining which isn't already present on the station
+				// Note that plasma and derived hybrid materials are NOT included in this list because plasma is the trader's objective!
+				/obj/item/stack/sheet/mineral/silver = 50,
+				/obj/item/stack/sheet/mineral/gold = 50,
+				/obj/item/stack/sheet/mineral/uranium = 50,
+				/obj/item/stack/sheet/mineral/diamond = 50,
+				/obj/item/stack/sheet/mineral/titanium = 50,
+				/obj/item/stack/sheet/plasteel = 50,
+
+				// Hybrid stuff you could in theory get from mining
+				/obj/item/stack/sheet/titaniumglass = 50,
+
+				// Rare stuff you can't get from mining
+				/obj/item/stack/sheet/mineral/tranquillite = 50,
+				/obj/item/stack/sheet/mineral/bananium = 50,
+				/obj/item/stack/sheet/wood = 50,
+				/obj/item/stack/sheet/plastic = 50,
+				/obj/item/stack/sheet/mineral/sandstone = 50
 				)

+/obj/effect/spawner/lootdrop/trade_sol/minerals/New()
+	if(loot && loot.len)
+		for(var/i = lootcount, i > 0, i--)
+			if(!loot.len)
+				break
+			var/lootspawn = pickweight(loot)
+			if(!lootdoubles)
+				loot.Remove(lootspawn)
+			if(lootspawn)
+				var/obj/item/stack/sheet/S = new lootspawn(get_turf(src))
+				S.amount = 25
+	qdel(src)
+
+
+/obj/effect/spawner/lootdrop/trade_sol/donksoft
+	name = "3. donksoft gear"
+	loot = list(
+				// Donksoft guns
+				/obj/item/gun/projectile/automatic/c20r/toy = 50,
+				/obj/item/gun/projectile/automatic/l6_saw/toy = 50,
+				/obj/item/gun/projectile/automatic/toy/pistol = 100,
+				/obj/item/gun/projectile/automatic/toy/pistol/enforcer = 50,
+				/obj/item/gun/projectile/shotgun/toy = 50,
+				/obj/item/gun/projectile/shotgun/toy/crossbow = 50,
+				/obj/item/gun/projectile/shotgun/toy/tommygun = 50
+				)
+
+
+/obj/effect/spawner/lootdrop/trade_sol/sci
+	name = "4. science gear"
+	loot = list(
+				// Robotics
+				/obj/item/mmi/robotic_brain = 50, // Low-value, but we want to encourage getting more players back in the round.
+				/obj/item/assembly/signaler/anomaly = 50, // anomaly core
+				/obj/item/mecha_parts/mecha_equipment/weapon/energy/xray = 25, // mecha x-ray laser
+				/obj/item/mecha_parts/mecha_equipment/teleporter/precise = 25, // upgraded mecha teleporter
+				/obj/item/autoimplanter = 50,
+
+				// Research / Experimentor
+				/obj/item/paper/researchnotes = 150, // papers that give random R&D levels
+
+				// Xenobio
+				/obj/item/slimepotion/sentience = 50, // Low-value, but we want to encourage getting more players back in the round.
+				/obj/item/slimepotion/transference = 50
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol/med
+	name = "5. medical gear"
+	loot = list(
+				// Medchem
+				/obj/item/storage/pill_bottle/random_meds/labelled = 100, // random medical and other chems
+				/obj/item/reagent_containers/glass/bottle/reagent/omnizine = 50,
+				/obj/item/reagent_containers/glass/bottle/reagent/strange_reagent = 50,
+
+				// Surgery
+				/obj/item/scalpel/laser/manager = 100,
+				/obj/item/organ/internal/heart/gland/ventcrawling = 50,
+				/obj/item/organ/internal/heart/gland/heals = 50,
+
+				// Genetics Research (should really be under science, but I was stuck for items to put in medical)
+				/obj/item/dnainjector/regenerate = 50, // regeneration
+				/obj/item/dnainjector/nobreath = 50,
+				/obj/item/dnainjector/telemut = 50,
+
+				// Virology
+				/obj/item/reagent_containers/glass/bottle/regeneration = 50,
+				/obj/item/reagent_containers/glass/bottle/sensory_restoration = 50
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol/sec
+	name = "6. security gear"
+	loot = list(
+				// Melee
+				/obj/item/kitchen/knife/combat = 50,
+				/obj/item/fluff/desolate_baton_kit = 50, // permission granted by Desolate to use their fluff kit in this loot table
+
+				// Utility
+				/obj/item/storage/belt/military/assault = 50,
+				/obj/item/clothing/mask/gas/sechailer/swat = 50,
+				/obj/item/clothing/glasses/thermal = 50, // see heat-source mobs through walls. Less powerful than already-available xray.
+
+				// Ranged weapons
+				/obj/item/storage/box/enforcer_rubber = 50,
+				/obj/item/storage/box/enforcer_lethal = 50,
+				/obj/item/gun/projectile/shotgun/automatic/combat = 50, // combat shotgun, between riot and bulldog in robustness. Not illegal, can be obtained from cargo.
+				/obj/item/gun/projectile/shotgun/automatic/dual_tube = 50, // cycler shotgun, not normally available to crew
+
+				// Cluster grenades
+				/obj/item/grenade/clusterbuster = 50, // cluster flashbang
+				/obj/item/grenade/clusterbuster/teargas = 50
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol/eng
+	name = "7. eng gear"
+	loot = list(
+				/obj/item/storage/belt/utility/chief/full = 25,
+				/obj/item/rcd/combat = 25,
+				/obj/item/rpd/bluespace = 25,
+				/obj/item/tank/emergency_oxygen/double/full = 25,
+				/obj/item/slimepotion/speed = 25,
+				/obj/item/storage/backpack/holding = 25,
+				/obj/item/clothing/glasses/meson/night = 25, // NV mesons
+				/obj/item/clothing/glasses/material = 25, // shows objects, but not mobs, through walls
+				/obj/item/grenade/clusterbuster/metalfoam = 25 // cluster metal foam grenade
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol/largeitem
+	name = "8. largeitem"
+	lootcount = 1
+	loot = list(
+				/obj/machinery/disco = 20,
+				/obj/mecha/combat/durand/old = 20
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol/vehicle
+	name = "9. vehicle"
+	loot = list(
+				/obj/vehicle/motorcycle = 50,
+				/obj/vehicle/snowmobile = 50,
+				/obj/vehicle/snowmobile/blue = 50,
+				/obj/vehicle/space/speedbike/red = 50,
+				/obj/vehicle/space/speedbike = 50
+				)
+
+/obj/effect/spawner/lootdrop/trade_sol/vehicle/New()
+	if(!loot.len)
+		return
+	var/lootspawn = pickweight(loot)
+	var/obj/vehicle/V = new lootspawn(get_turf(src))
+	if(V.keytype)
+		new V.keytype(get_turf(src))
+	qdel(src)
+
+
+/obj/effect/spawner/lootdrop/trade_sol/serv
+	name = "10. service gear"
+	loot = list(
+				// Mining
+				/obj/item/mining_voucher = 100,
+				/obj/item/pickaxe/drill/jackhammer = 100,
+				/obj/item/gun/energy/kinetic_accelerator/experimental = 100,
+				/obj/item/borg/upgrade/modkit/aoe/turfs/andmobs = 100,
+
+				// Botanist
+				/obj/item/seeds/random/labelled = 100,
+
+				// Clown
+				/obj/item/grenade/clusterbuster/honk = 100,
+				/obj/item/bikehorn/golden = 100,
+
+				// Bartender
+				/obj/item/storage/box/bartender_rare_ingredients_kit = 100,
+
+				// Chef
+				/obj/item/storage/box/chef_rare_ingredients_kit = 100
+				// It would be nice to also have items for other service jobs: Mime, Librarian, Chaplain, etc
+				)
+
+
+
 /obj/effect/spawner/lootdrop/three_course_meal
 	name = "three course meal spawner"
 	lootcount = 3
@@ -159,6 +159,7 @@
 /obj/effect/spawner/random_spawners/syndicate/trap/pizzabomb
 	name = "50pc trap pizza"
 	result = list(/obj/item/pizzabox/meat = 1,
+		/obj/item/pizzabox/hawaiian = 1,
 		/obj/item/pizza_bomb/autoarm = 1)

 /obj/effect/spawner/random_spawners/syndicate/trap/medbot
@@ -169,7 +170,7 @@
 /obj/effect/spawner/random_spawners/syndicate/trap/mine
 	name = "50pc trap landmine"
 	result = list(/datum/nothing = 1,
-		/obj/effect/mine/explosive = 1)
+		/obj/effect/mine/depot = 1)

 /obj/effect/spawner/random_spawners/syndicate/trap/documents
 	name = "66pc trapped documents"
@@ -188,7 +189,6 @@
 	// Loot schema: costumes, toys, useless gimmick items, trapped items
 	result = list(/datum/nothing = 13,
 		/obj/item/storage/toolbox/syndicate = 1,
-		/obj/item/storage/toolbox/syndicate/trapped = 1,
 		/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
 		/obj/item/toy/cards/deck/syndicate = 1,
 		/obj/item/storage/secure/briefcase/syndie = 1,
@@ -176,7 +176,7 @@
 				return
 			var/obj/machinery/atmospherics/unary/vent_pump/exit_vent = pick(vents)
 			if(prob(50))
-				visible_message("<B>[src] scrambles into the ventillation ducts!</B>", \
+				visible_message("<B>[src] scrambles into the ventilation ducts!</B>", \
 								"<span class='notice'>You hear something squeezing through the ventilation ducts.</span>")

 			spawn(rand(20,60))
@@ -1,6 +1,6 @@
 //TODO: Flash range does nothing currently

-/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0, smoke = 1, cause = null)
+/proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0 ,silent = 0, smoke = 1, cause = null, breach = TRUE)
 	src = null	//so we don't abort once src is deleted
 	epicenter = get_turf(epicenter)

@@ -132,7 +132,10 @@
 							if(AM && AM.simulated)
 								AM.ex_act(dist)
 							CHECK_TICK
-					T.ex_act(dist)
+					if(breach)
+						T.ex_act(dist)
+					else
+						T.ex_act(3)

 			CHECK_TICK
 			//--- THROW ITEMS AROUND ---
@@ -532,10 +532,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 			itempush = 0 // too light to push anything
 		return A.hitby(src, 0, itempush)

-/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
+/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force)
 	thrownby = thrower
 	callback = CALLBACK(src, .proc/after_throw, callback) //replace their callback with our own
-	. = ..(target, range, speed, thrower, spin, diagonals_first, callback)
+	. = ..(target, range, speed, thrower, spin, diagonals_first, callback, force)

 /obj/item/proc/after_throw(datum/callback/callback)
 	if(callback) //call the original callback
@@ -45,7 +45,7 @@
 		eject_all()
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
 		QDEL_NULL(active_dummy)
-		to_chat(usr, "<span class='notice'>You deactivate \the [src].</span>")
+		to_chat(usr, "<span class='notice'>You deactivate [src].</span>")
 		var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'
 		flick("emppulse",T)
@@ -58,7 +58,7 @@
 		var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
 		C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, saved_underlays, src)
 		qdel(O)
-		to_chat(usr, "<span class='notice'>You activate \the [src].</span>")
+		to_chat(usr, "<span class='notice'>You activate [src].</span>")
 		var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'
 		flick("emppulse",T)
@@ -148,3 +148,102 @@
 /obj/effect/dummy/chameleon/Destroy()
 	master.disrupt(0)
 	return ..()
+
+/obj/item/borg_chameleon
+	name = "cyborg chameleon projector"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "shield0"
+	item_state = "electronic"
+	w_class = WEIGHT_CLASS_SMALL
+	var/active = FALSE
+	var/activationCost = 300
+	var/activationUpkeep = 50
+	var/disguise = "landmate"
+	var/mob/living/silicon/robot/syndicate/saboteur/S
+
+/obj/item/borg_chameleon/Destroy()
+	if(S)
+		S.cham_proj = null
+	return ..()
+
+/obj/item/borg_chameleon/dropped(mob/user)
+	. = ..()
+	disrupt(user)
+
+/obj/item/borg_chameleon/equipped(mob/user)
+	. = ..()
+	disrupt(user)
+
+/obj/item/borg_chameleon/attack_self(mob/living/silicon/robot/syndicate/saboteur/user)
+	if(user && user.cell && user.cell.charge >  activationCost)
+		if(isturf(user.loc))
+			toggle(user)
+		else
+			to_chat(user, "<span class='warning'>You can't use [src] while inside something!</span>")
+	else
+		to_chat(user, "<span class='warning'>You need at least [activationCost] charge in your cell to use [src]!</span>")
+
+/obj/item/borg_chameleon/proc/toggle(mob/living/silicon/robot/syndicate/saboteur/user)
+	if(active)
+		playsound(src, 'sound/effects/pop.ogg', 100, 1, -6)
+		to_chat(user, "<span class='notice'>You deactivate [src].</span>")
+		deactivate(user)
+	else
+		to_chat(user, "<span class='notice'>You activate [src].</span>")
+		var/start = user.filters.len
+		var/X
+		var/Y
+		var/rsq
+		var/i
+		var/f
+		for(i in 1 to 7)
+			do
+				X = 60 * rand() - 30
+				Y = 60 * rand() - 30
+				rsq = X * X + Y * Y
+			while(rsq < 100 || rsq > 900)
+			user.filters += filter(type = "wave", x = X, y = Y, size = rand() * 2.5 + 0.5, offset = rand())
+		for(i in 1 to 7)
+			f = user.filters[start+i]
+			animate(f, offset = f:offset, time = 0, loop = 3, flags = ANIMATION_PARALLEL)
+			animate(offset = f:offset - 1, time = rand() * 20 + 10)
+		if(do_after(user, 50, target = user) && user.cell.use(activationCost))
+			playsound(src, 'sound/effects/bamf.ogg', 100, 1, -6)
+			to_chat(user, "<span class='notice'>You are now disguised as a Nanotrasen engineering cyborg.</span>")
+			activate(user)
+		else
+			to_chat(user, "<span class='warning'>The chameleon field fizzles.</span>")
+			do_sparks(3, FALSE, user)
+			for(i in 1 to min(7, user.filters.len)) // removing filters that are animating does nothing, we gotta stop the animations first
+				f = user.filters[start + i]
+				animate(f)
+		user.filters = null
+
+/obj/item/borg_chameleon/process()
+	if(S)
+		if(!S.cell || !S.cell.use(activationUpkeep))
+			disrupt(S)
+	else
+		return PROCESS_KILL
+
+/obj/item/borg_chameleon/proc/activate(mob/living/silicon/robot/syndicate/saboteur/user)
+	processing_objects.Add(src)
+	S = user
+	user.base_icon = disguise
+	user.icon_state = disguise
+	user.cham_proj = src
+	active = TRUE
+	user.update_icons()
+
+/obj/item/borg_chameleon/proc/deactivate(mob/living/silicon/robot/syndicate/saboteur/user)
+	processing_objects.Remove(src)
+	S = user
+	user.base_icon = initial(user.base_icon)
+	user.icon_state = initial(user.icon_state)
+	active = FALSE
+	user.update_icons()
+
+/obj/item/borg_chameleon/proc/disrupt(mob/living/silicon/robot/syndicate/saboteur/user)
+	if(active)
+		to_chat(user, "<span class='danger'>Your chameleon field deactivates.</span>")
+		deactivate(user)
@@ -11,6 +11,7 @@
 	actions_types = list(/datum/action/item_action/toggle_light)
 	var/on = FALSE
 	var/brightness_on = 4 //luminosity when on
+	var/togglesound = 'sound/weapons/empty.ogg'

 /obj/item/flashlight/Initialize()
 	. = ..()
@@ -35,7 +36,7 @@

 		return 0
 	on = !on
-	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+	playsound(user, togglesound, 100, 1)
 	update_brightness(user)
 	for(var/X in actions)
 		var/datum/action/A = X
@@ -153,22 +154,24 @@ obj/item/flashlight/lamp/bananalamp
 /obj/item/flashlight/flare
 	name = "flare"
 	desc = "A red Nanotrasen issued flare. There are instructions on the side, it reads 'pull cord, make light'."
-	w_class = WEIGHT_CLASS_SMALL
-	brightness_on = 8 // Made it brighter (from 7 to 8).
-	light_color = "#ff0000" // changed colour to a more brighter red.
+	brightness_on = 8
+	light_color = "#ff0000"
 	icon_state = "flare"
 	item_state = "flare"
+	togglesound = 'sound/goonstation/misc/matchstick_light.ogg'
 	var/fuel = 0
 	var/on_damage = 7
 	var/produce_heat = 1500
+	var/fuel_lower = 800
+	var/fuel_upp = 1000

 /obj/item/flashlight/flare/New()
-	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
+	fuel = rand(fuel_lower, fuel_upp)
 	..()

 /obj/item/flashlight/flare/process()
 	var/turf/pos = get_turf(src)
-	if(pos)
+	if(pos && produce_heat)
 		pos.hotspot_expose(produce_heat, 5)
 	fuel = max(fuel - 1, 0)
 	if(!fuel || !on)
@@ -177,6 +180,10 @@ obj/item/flashlight/lamp/bananalamp
 			src.icon_state = "[initial(icon_state)]-empty"
 		processing_objects -= src

+/obj/item/flashlight/flare/Destroy()
+	processing_objects.Remove(src)
+	..()
+
 /obj/item/flashlight/flare/proc/turn_off()
 	on = 0
 	src.force = initial(src.force)
@@ -207,11 +214,84 @@ obj/item/flashlight/lamp/bananalamp
 	. = ..()
 	// All good, turn it on.
 	if(.)
-		user.visible_message("<span class='notice'>[user] activates the flare.</span>", "<span class='notice'>You pull the cord on the flare, activating it!</span>")
+		user.visible_message("<span class='notice'>[user] activates [src].</span>", "<span class='notice'>You activate [src].</span>")
 		src.force = on_damage
 		src.damtype = "fire"
 		processing_objects += src

+// GLOWSTICKS
+
+/obj/item/flashlight/flare/glowstick
+	name = "green glowstick"
+	desc = "A military-grade glowstick."
+	brightness_on = 4
+	color = LIGHT_COLOR_GREEN
+	icon_state = "glowstick"
+	item_state = "glowstick"
+	togglesound = 'sound/effects/bone_break_1.ogg'
+	produce_heat = 0
+	fuel_lower = 1600
+	fuel_upp = 2000
+
+/obj/item/flashlight/flare/glowstick/Initialize()
+	light_color = color
+	..()
+
+/obj/item/flashlight/flare/glowstick/update_icon()
+	item_state = "glowstick"
+	cut_overlays()
+	if(!fuel)
+		icon_state = "glowstick-empty"
+		cut_overlays()
+		update_brightness(0)
+	else if(on)
+		var/mutable_appearance/glowstick_overlay = mutable_appearance(icon, "glowstick-glow")
+		glowstick_overlay.color = color
+		add_overlay(glowstick_overlay)
+		item_state = "glowstick-on"
+		update_brightness(brightness_on)
+	else
+		icon_state = "glowstick"
+		cut_overlays()
+
+/obj/item/flashlight/flare/glowstick/red
+	name = "red glowstick"
+	color = LIGHT_COLOR_RED
+
+/obj/item/flashlight/flare/glowstick/blue
+	name = "blue glowstick"
+	color = LIGHT_COLOR_BLUE
+
+/obj/item/flashlight/flare/glowstick/orange
+	name = "orange glowstick"
+	color = LIGHT_COLOR_ORANGE
+
+/obj/item/flashlight/flare/glowstick/yellow
+	name = "yellow glowstick"
+	color = LIGHT_COLOR_YELLOW
+
+/obj/item/flashlight/flare/glowstick/pink
+	name = "pink glowstick"
+	color = LIGHT_COLOR_PINK
+
+/obj/item/flashlight/flare/glowstick/emergency
+	name = "emergency glowstick"
+	desc = "A cheap looking, mass produced glowstick. You can practically feel it was made on a tight budget."
+	color = LIGHT_COLOR_BLUE
+	fuel_lower = 30
+	fuel_upp = 90
+
+/obj/item/flashlight/flare/glowstick/random
+	name = "random colored glowstick"
+	icon_state = "random_glowstick"
+	color = null
+
+/obj/item/flashlight/flare/glowstick/random/Initialize()
+	..()
+	var/T = pick(typesof(/obj/item/flashlight/flare/glowstick) - /obj/item/flashlight/flare/glowstick/random - /obj/item/flashlight/flare/glowstick/emergency)
+	new T(loc)
+	return INITIALIZE_HINT_QDEL
+
 /obj/item/flashlight/flare/torch
 	name = "torch"
 	desc = "A torch fashioned from some leaves and a log."
@@ -301,101 +381,4 @@ obj/item/flashlight/lamp/bananalamp
 	anchored = TRUE
 	var/range = null
 	unacidable = TRUE
-	burn_state = LAVA_PROOF
-
-/obj/item/flashlight/glowstick
-	name = "green glowstick"
-	desc = "A military-grade glowstick."
-	w_class = WEIGHT_CLASS_SMALL
-	brightness_on = 4
-	color = LIGHT_COLOR_GREEN
-	icon_state = "glowstick"
-	item_state = "glowstick"
-	var/fuel = 0
-
-/obj/item/flashlight/glowstick/Initialize()
-	fuel = rand(1600, 2000)
-	light_color = color
-	. = ..()
-
-/obj/item/flashlight/glowstick/Destroy()
-	processing_objects.Remove(src)
-	. = ..()
-
-/obj/item/flashlight/glowstick/process()
-	fuel = max(fuel - 1, 0)
-	if(!fuel)
-		turn_off()
-		processing_objects.Remove(src)
-		update_icon()
-
-/obj/item/flashlight/glowstick/proc/turn_off()
-	on = FALSE
-	update_icon()
-
-/obj/item/flashlight/glowstick/update_icon()
-	item_state = "glowstick"
-	cut_overlays()
-	if(!fuel)
-		icon_state = "glowstick-empty"
-		cut_overlays()
-		update_brightness(0)
-	else if(on)
-		var/mutable_appearance/glowstick_overlay = mutable_appearance(icon, "glowstick-glow")
-		glowstick_overlay.color = color
-		add_overlay(glowstick_overlay)
-		item_state = "glowstick-on"
-		update_brightness(brightness_on)
-	else
-		icon_state = "glowstick"
-		cut_overlays()
-
-/obj/item/flashlight/glowstick/attack_self(mob/user)
-	if(!fuel)
-		to_chat(user, "<span class='notice'>[src] is spent.</span>")
-		return
-	if(on)
-		to_chat(user, "<span class='notice'>[src] is already lit.</span>")
-		return
-
-	. = ..()
-	if(.)
-		user.visible_message("<span class='notice'>[user] cracks and shakes [src].</span>", "<span class='notice'>You crack and shake [src], turning it on!</span>")
-		activate()
-
-/obj/item/flashlight/glowstick/proc/activate()
-	if(!on)
-		on = TRUE
-		processing_objects.Add(src)
-		update_icon()
-
-/obj/item/flashlight/glowstick/red
-	name = "red glowstick"
-	color = LIGHT_COLOR_RED
-
-/obj/item/flashlight/glowstick/blue
-	name = "blue glowstick"
-	color = LIGHT_COLOR_BLUE
-
-/obj/item/flashlight/glowstick/orange
-	name = "orange glowstick"
-	color = LIGHT_COLOR_ORANGE
-
-/obj/item/flashlight/glowstick/yellow
-	name = "yellow glowstick"
-	color = LIGHT_COLOR_YELLOW
-
-/obj/item/flashlight/glowstick/pink
-	name = "pink glowstick"
-	color = LIGHT_COLOR_PINK
-
-/obj/item/flashlight/glowstick/random
-	name = "random colored glowstick"
-	icon_state = "random_glowstick"
-	color = null
-
-/obj/item/flashlight/glowstick/random/Initialize()
-	..()
-	var/T = pick(typesof(/obj/item/flashlight/glowstick) - /obj/item/flashlight/glowstick/random)
-	new T(loc)
-	return INITIALIZE_HINT_QDEL
+	burn_state = LAVA_PROOF
@@ -102,4 +102,4 @@

 /obj/item/pizza_bomb/autoarm
 	timer_set = 1
-	timer = 10
+	timer = 30 // 3 seconds
@@ -8,6 +8,7 @@
 	var/emagged = 0
 	var/syndicate = 0
 	var/area_bypass = FALSE
+	var/cc_beacon = FALSE //set if allowed to teleport to even if on zlevel2

 /obj/item/radio/beacon/New()
 	..()
@@ -1,5 +1,5 @@

-/obj/item/encryptionkey/
+/obj/item/encryptionkey
 	name = "Standard Encryption Key"
 	desc = "An encyption key for a radio headset. Contains cypherkeys."
 	icon = 'icons/obj/radio.dmi'
@@ -256,9 +256,10 @@ var/global/list/default_medbay_channels = list(
 			break
 	if(jammed)
 		message = Gibberish(message, 100)
+	var/list/message_pieces = message_to_multilingual(message)
 	Broadcast_Message(connection, A,
 						0, "*garbled automated announcement*", src,
-						message, from, "Automated Announcement", from, "synthesized voice",
+						message_pieces, from, "Automated Announcement", from, "synthesized voice",
 						4, 0, zlevel, connection.frequency, follow_target = follow_target)
 	qdel(A)

@@ -25,6 +25,7 @@ var/list/world_uplinks = list()
 	var/job = null
 	var/show_descriptions = 0
 	var/temp_category
+	var/uplink_type = "traitor"

 /obj/item/uplink/nano_host()
 	return loc
@@ -327,6 +328,21 @@ var/list/world_uplinks = list()
 	if(hidden_uplink)
 		hidden_uplink.trigger(user)

+/obj/item/radio/uplink/nuclear/New()
+	..()
+	if(hidden_uplink)
+		hidden_uplink.uplink_type = "nuclear"
+	GLOB.nuclear_uplink_list += src
+
+/obj/item/radio/uplink/nuclear/Destroy()
+	GLOB.nuclear_uplink_list -= src
+	return ..()
+
+/obj/item/radio/uplink/sst/New()
+	..()
+	if(hidden_uplink)
+		hidden_uplink.uplink_type = "sst"
+
 /obj/item/multitool/uplink/New()
 	hidden_uplink = new(src)

@@ -340,4 +356,4 @@ var/list/world_uplinks = list()
 /obj/item/radio/headset/uplink/New()
 	..()
 	hidden_uplink = new(src)
-	hidden_uplink.uses = 20
+	hidden_uplink.uses = 20
@@ -123,6 +123,7 @@
 /obj/item/storage/pill_bottle/random_meds
 	name = "unlabelled pillbottle"
 	desc = "The sheer recklessness of this bottle's existence astounds you."
+	var/labelled = FALSE

 /obj/item/storage/pill_bottle/random_meds/New()
 	..()
@@ -137,11 +138,19 @@
 			P.reagents.add_reagent(R, 10)
 		else
 			P.reagents.add_reagent(R, rand(2, 5)*10)
-		P.name = "Unlabelled Pill"
-		P.desc = "Something about this pill entices you to try it, against your better judgement."
+		if(labelled)
+			P.name = "[R] Pill"
+			P.desc = "A pill containing [R]."
+		else
+			P.name = "Unlabelled Pill"
+			P.desc = "Something about this pill entices you to try it, against your better judgement."
 	pixel_x = rand(-10, 10)
 	pixel_y = rand(-10, 10)

+/obj/item/storage/pill_bottle/random_meds/labelled
+	name = "variety pillbottle"
+	labelled = TRUE
+

 // -------------------------------------
 //    Containers full of unknown crap
@@ -58,6 +58,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	new /datum/stack_recipe("turret frame", /obj/machinery/porta_turret_construct, 5, time = 25, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("firelock frame", /obj/structure/firelock_frame, 3, time = 50, one_per_turf = 1, on_floor = 1), \
 	new /datum/stack_recipe("meatspike frame", /obj/structure/kitchenspike_frame, 5, time = 25, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("reflector frame", /obj/structure/reflector, 5, time = 25, one_per_turf = 1, on_floor = 1),
 	null,
 	new /datum/stack_recipe_list("airlock assemblies", list(
 		new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1),
@@ -38,4 +38,7 @@
 	amount = 5

 /obj/item/stack/telecrystal/twenty
-	amount = 20
+	amount = 20
+
+/obj/item/stack/telecrystal/fifty
+	amount = 50
@@ -1143,6 +1143,37 @@ obj/item/toy/cards/deck/syndicate/black
 		return
 	..()

+/obj/item/toy/codex_gigas
+	name = "Toy Codex Gigas"
+	desc = "A tool to help you write fictional devils!"
+	icon = 'icons/obj/library.dmi'
+	icon_state = "demonomicon"
+	w_class = WEIGHT_CLASS_SMALL
+	var/cooldown = FALSE
+
+/obj/item/toy/codex_gigas/attack_self(mob/user)
+	if(!cooldown)
+		user.visible_message(
+			"<span class='notice'>[user] presses the button on \the [src].</span>",
+			"<span class='notice'>You press the button on \the [src].</span>",
+			"<span class='notice'>You hear a soft click.</span>")
+		var/list/messages = list()
+		var/datum/devilinfo/devil = randomDevilInfo()
+		messages += "Some fun facts about: [devil.truename]"
+		messages += "[lawlorify[LORE][devil.bane]]"
+		messages += "[lawlorify[LORE][devil.obligation]]"
+		messages += "[lawlorify[LORE][devil.ban]]"
+		messages += "[lawlorify[LORE][devil.banish]]"
+		playsound(loc, 'sound/machines/click.ogg', 20, 1)
+		cooldown = TRUE
+		for(var/message in messages)
+			user.loc.visible_message("<span class='danger'>[bicon(src)] [message]</span>")
+			sleep(10)
+		spawn(20)
+			cooldown = FALSE
+		return
+		..()
+
 /obj/item/toy/owl
 	name = "owl action figure"
 	desc = "An action figure modeled after 'The Owl', defender of justice."
@@ -1650,3 +1681,13 @@ obj/item/toy/cards/deck/syndicate/black
 	icon_state = "conch"
 	use_action = "pulls the string"
 	possible_answers = list("Yes.", "No.", "Try asking again.", "Nothing.", "I don't think so.", "Neither.", "Maybe someday.")
+
+/*
+ *Fake cuffs (honk honk)
+ */
+
+/obj/item/restraints/handcuffs/toy
+	desc = "Toy handcuffs. Plastic and extremely cheaply made."
+	throwforce = 0
+	breakouttime = 0 
+	ignoresClumsy = TRUE
@@ -456,20 +456,24 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
 /obj/item/rcd/proc/checkResource(amount, mob/user)
 	return matter >= amount

+/obj/item/rcd/borg
+	canRwall = 1
+	var/use_multiplier = 160
+
+/obj/item/rcd/borg/syndicate
+	use_multiplier = 80
+
 /obj/item/rcd/borg/useResource(amount, mob/user)
 	if(!isrobot(user))
 		return 0
 	var/mob/living/silicon/robot/R = user
-	return R.cell.use(amount * 160)
+	return R.cell.use(amount * use_multiplier)

 /obj/item/rcd/borg/checkResource(amount, mob/user)
 	if(!isrobot(user))
 		return 0
 	var/mob/living/silicon/robot/R = user
-	return R.cell.charge >= (amount * 160)
-
-/obj/item/rcd/borg
-	canRwall = 1
+	return R.cell.charge >= (amount * use_multiplier)

 /obj/item/rcd/proc/detonate_pulse()
 	audible_message("<span class='danger'><b>[src] begins to vibrate and \
@@ -319,6 +319,10 @@
 	name = "agent card"
 	initial_access = list(access_maint_tunnels, access_vox, access_external_airlocks)

+/obj/item/card/id/syndicate/command
+	initial_access = list(access_maint_tunnels, access_syndicate, access_syndicate_leader, access_syndicate_command, access_external_airlocks)
+	icon_state = "commander"
+
 /obj/item/card/id/syndicate/afterattack(var/obj/item/O as obj, mob/user as mob, proximity)
 	if(!proximity)
 		return
@@ -196,7 +196,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 		if(is_being_smoked) // if it's being smoked, transfer reagents to the mob
 			var/mob/living/carbon/C = loc
 			for (var/datum/reagent/R in reagents.reagent_list)
-				reagents.trans_to(C, REAGENTS_METABOLISM)
+				reagents.trans_id_to(C, R.id, max(REAGENTS_METABOLISM / reagents.reagent_list.len, 0.1)) //transfer at least .1 of each chem
 			if(!reagents.total_volume) // There were reagents, but now they're gone
 				to_chat(C, "<span class='notice'>Your [name] loses its flavor.</span>")
 		else // else just remove some of the reagents
@@ -232,7 +232,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	type_butt = /obj/item/cigbutt/roach
 	throw_speed = 0.5
 	item_state = "spliffoff"
-	smoketime = 180
+	smoketime = 250
 	chem_volume = 100

 /obj/item/clothing/mask/cigarette/rollie/New()
@@ -405,7 +405,7 @@
 					for(var/obj/item/organ/external/O in H.bodyparts)
 						total_brute	+= O.brute_dam
 						total_burn	+= O.burn_dam
-					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
+					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.mind && H.mind.is_revivable()) && (H.get_int_organ(/obj/item/organ/internal/heart) || H.get_int_organ(/obj/item/organ/internal/brain/slime)))
 						tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
 						tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
 						H.adjustOxyLoss(tobehealed)
@@ -512,7 +512,7 @@
 			var/total_burn	= 0
 			var/total_brute	= 0
 			if(do_after(user, 20 * toolspeed, target = M)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
-				if(H.stat == 2)
+				if(H.stat == DEAD)
 					var/health = H.health
 					M.visible_message("<span class='warning'>[M]'s body convulses a bit.")
 					playsound(get_turf(src), "bodyfall", 50, 1)
@@ -520,7 +520,7 @@
 					for(var/obj/item/organ/external/O in H.bodyparts)
 						total_brute	+= O.brute_dam
 						total_burn	+= O.burn_dam
-					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
+					if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations) && (H.mind && H.mind.is_revivable()))
 						tobehealed = min(health + threshold, 0) // It's HILARIOUS without this min statement, let me tell you
 						tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
 						H.adjustOxyLoss(tobehealed)
@@ -121,7 +121,7 @@

 	var/attack_log = "injected with the Isolated [name]"

-	if(buf.types & DNA2_BUF_SE)
+	if(buf && buf.types & DNA2_BUF_SE)
 		if(block)
 			if(GetState() && block == MONKEYBLOCK && ishuman(M))
 				attack_log = "injected with the Isolated [name] (MONKEY)"
@@ -109,6 +109,8 @@
 				message_say = "FOR THE REVOLOUTION!"
 			else if(role == "death commando" || role == ROLE_ERT)
 				message_say = "FOR NANOTRASEN!"
+			else if(role == ROLE_DEVIL)
+				message_say = "FOR INFERNO!"
 	user.say(message_say)
 	target = user
 	sleep(10)
@@ -2,7 +2,7 @@


 /obj/item/grenade/gas
-	name = "Plasma Fire Grenade"
+	name = "plasma fire grenade"
 	desc = "A compressed plasma grenade, used to start horrific plasma fires."
 	origin_tech = "materials=3;magnets=4;syndicate=3"
 	icon = 'icons/obj/grenade.dmi'
@@ -18,7 +18,33 @@
 		target_turf.air_update_turf()
 	qdel(src)

+/obj/item/grenade/gas/plasma
+	icon_state = "plasma"
+
 /obj/item/grenade/gas/knockout
-	name = "Knockout Grenade"
+	name = "knockout grenade"
 	desc = "A grenade that completely removes all air and heat from its detonation area."
-	spawn_contents = SPAWN_20C | SPAWN_N2O
+	spawn_contents = SPAWN_20C | SPAWN_N2O
+
+/obj/item/grenade/gluon
+	desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also wet any nearby floors."
+	name = "gluon grenade"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "gluon"
+	item_state = "flashbang"
+	var/range = 4
+	var/rad_damage = 60
+	var/stamina_damage = 30
+
+/obj/item/grenade/gluon/prime()
+	update_mob()
+	playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
+	for(var/turf/T in view(range, loc))
+		if(isfloorturf(T))
+			var/turf/simulated/F = T
+			F.MakeSlippery(TURF_WET_PERMAFROST)
+			for(var/mob/living/carbon/L in T)
+				L.adjustStaminaLoss(stamina_damage)
+				L.apply_effect(rad_damage, IRRADIATE)
+				L.adjust_bodytemperature(-230)
+	qdel(src)
@@ -526,20 +526,20 @@
 	update_icon()

 /obj/item/grenade/chem_grenade/facid
-	name = "acid grenade"
-	desc = "Used for melting armoured opponents."
+	payload_name = "acid smoke"
+	desc = "Use to chew up opponents from the inside out."
 	stage = READY

 /obj/item/grenade/chem_grenade/facid/New()
 	..()
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
-	var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
+	var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
+	var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)

-	B1.reagents.add_reagent("facid", 280)
+	B1.reagents.add_reagent("facid", 80)
 	B1.reagents.add_reagent("potassium", 20)
 	B2.reagents.add_reagent("phosphorus", 20)
 	B2.reagents.add_reagent("sugar", 20)
-	B2.reagents.add_reagent("facid", 260)
+	B2.reagents.add_reagent("facid", 60)

 	beakers += B1
 	beakers += B2
@@ -104,7 +104,7 @@
 	payload = /obj/item/grenade/chem_grenade/cleaner

 /obj/item/grenade/clusterbuster/teargas
-	name = "Oignon Grenade"
+	name = "Oignon Teargas Grenade"
 	payload = /obj/item/grenade/chem_grenade/teargas

 /obj/item/grenade/clusterbuster/facid
@@ -53,7 +53,7 @@


 //Bang
-	if((loc == M) || loc == M.loc)//Holding on person or being exactly where lies is significantly more dangerous and voids protection
+	if(get_turf(M) == get_turf(src))//Holding on person or being exactly where lies is significantly more dangerous and voids protection
 		M.Stun(10)
 		M.Weaken(10)
 	if(!ear_safety)
@@ -0,0 +1,50 @@
+/obj/item/grenade/frag
+	name = "frag grenade"
+	desc = "Fire in the hole."
+	icon_state = "frag"
+	item_state = "flashbang"
+	origin_tech = "materials=3;magnets=4"
+	var/range = 5
+	var/max_shrapnel = 4
+	var/embed_prob = 100 //reduced by armor
+	var/embedded_type = /obj/item/embedded/shrapnel
+
+/obj/item/grenade/frag/prime()
+	update_mob()
+	var/turf/epicenter = get_turf(src)
+	for(var/mob/living/carbon/human/H in epicenter)
+		if(H.resting) //grenade is jumped on but get real fucked up
+			embed_shrapnel(H, max_shrapnel)
+			range = 1
+	explosion(loc, 0, 1, range, breach = FALSE)
+	for(var/turf/T in view(range, loc))
+		for(var/mob/living/carbon/human/H in T)
+			var/shrapnel_amount = max_shrapnel - T.Distance(epicenter)
+			if(shrapnel_amount > 0)
+				embed_shrapnel(H, shrapnel_amount)
+	qdel(src)
+
+/obj/item/grenade/frag/proc/embed_shrapnel(mob/living/carbon/human/H, amount)
+	for(var/i = 0, i < amount, i++)
+		if(prob(embed_prob - H.getarmor(null, "bomb")))
+			var/obj/item/embedded/S = new embedded_type(src)
+			H.hitby(S, skipcatch = 1)
+			S.throwforce = 1
+			S.throw_speed = 1
+			S.sharp = FALSE
+		else
+			to_chat(H, "<span class='warning'>Shrapnel bounces off your armor!</span>")
+
+/obj/item/embedded/shrapnel
+	name = "shrapnel"
+	icon = 'icons/obj/shards.dmi'
+	throwforce = 10
+	throw_speed =  EMBED_THROWSPEED_THRESHOLD
+	embed_chance = 100
+	embedded_fall_chance = 0
+	w_class = WEIGHT_CLASS_SMALL
+	sharp = TRUE
+	hitsound = 'sound/weapons/pierce.ogg'
+
+/obj/item/embedded/shrapnel/New()
+	icon_state = pick("shrapnel1", "shrapnel2", "shrapnel3")
@@ -8,5 +8,5 @@

 /obj/item/grenade/syndieminibomb/prime()
 	update_mob()
-	explosion(src.loc,1,2,4,flame_range = 2)
-	qdel(src)
+	explosion(loc, 1, 2, 4, flame_range = 2)
+	qdel(src)
@@ -15,6 +15,7 @@
 	breakouttime = 600 //Deciseconds = 60s = 1 minutes
 	var/cuffsound = 'sound/weapons/handcuffs.ogg'
 	var/trashtype = null //For disposable cuffs
+	var/ignoresClumsy = FALSE

 /obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/user)
 	if(!user.IsAdvancedToolUser())
@@ -23,7 +24,7 @@
 	if(!istype(C))
 		return

-	if(CLUMSY in user.mutations && prob(50))
+	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)

@@ -448,6 +448,7 @@

 	if(praying)
 		to_chat(user, "<span class='notice'>You are already using [src].</span>")
+		return

 	user.visible_message("<span class='info'>[user] kneels[M == user ? null : " next to [M]"] and begins to utter a prayer to [ticker.Bible_deity_name].</span>", \
 		"<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [ticker.Bible_deity_name].</span>")
@@ -10,6 +10,16 @@
 	hidden_uplink.uses = 10
 	..()

+/obj/item/implant/uplink/sit/New()
+	..()
+	if(hidden_uplink)
+		hidden_uplink.uplink_type = "sit"
+
+/obj/item/implant/uplink/admin/New()
+	..()
+	if(hidden_uplink)
+		hidden_uplink.uplink_type = "admin"
+
 /obj/item/implant/uplink/implant(mob/source)
 	var/obj/item/implant/imp_e = locate(src.type) in source
 	if(imp_e && imp_e != src)
@@ -8,6 +8,7 @@
 *		Butcher's cleaver
 *		Rolling Pins
 *		Candy Moulds
+ *		Sushi Mat
 */

 /obj/item/kitchen
@@ -249,3 +250,17 @@
 	name = "sucker mould"
 	desc = "It has the shape of a sucker imprinted into it."
 	icon_state = "mould_loli"
+
+/* 
+ * Sushi Mat
+ */
+/obj/item/kitchen/sushimat
+	name = "Sushi Mat"
+	desc = "A wooden mat used for efficient sushi crafting."
+	icon_state = "sushi_mat"
+	force = 5
+	throwforce = 5
+	throw_speed = 3
+	throw_range = 3
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("rolled", "cracked", "battered", "thrashed")
@@ -30,6 +30,9 @@
 	var/whatdpipe = PIPE_DISPOSALS_STRAIGHT //What kind of disposals pipe is it?
 	var/spawndelay = RPD_COOLDOWN_TIME
 	var/walldelay = RPD_WALLBUILD_TIME
+	var/ranged = FALSE
+	var/primary_sound = 'sound/machines/click.ogg'
+	var/alt_sound = null

 /obj/item/rpd/New()
 	..()
@@ -41,11 +44,24 @@
 	QDEL_NULL(spark_system)
 	return ..()

+/obj/item/rpd/bluespace
+	name = "bluespace rapid pipe dispenser"
+	desc = "This device can rapidly dispense atmospherics and disposals piping, manipulate loose piping, and recycle any detached pipes it is applied to, at any range."
+	icon_state = "brpd"
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500, MAT_SILVER = 3000)
+	origin_tech = "engineering=4;materials=2;bluespace=3"
+	ranged = TRUE
+	primary_sound = 'sound/items/PSHOOM.ogg'
+	alt_sound = 'sound/items/PSHOOM_2.ogg'
+
 //Procs

 /obj/item/rpd/proc/activate_rpd(delay) //Maybe makes sparks and activates cooldown if there is a delay
-	playsound(loc, "sound/machines/click.ogg", 50, 1)
-	if(prob(15))
+	if(alt_sound && prob(3))
+		playsound(src, alt_sound, 50, 1)
+	else
+		playsound(src, primary_sound, 50, 1)
+	if(prob(15) && !ranged)
 		spark_system.start()
 	if(delay)
 		lastused = world.time
@@ -188,7 +204,7 @@ var/list/pipemenu = list(
 	..()
 	if(loc != user)
 		return
-	if(!proximity)
+	if(!proximity && !ranged)
 		return
 	if(world.time < lastused + spawndelay)
 		return
@@ -201,6 +217,8 @@ var/list/pipemenu = list(
 		if(target.rpd_act(user, src) == TRUE)
 			// If the object we are clicking on has a valid RPD interaction for just that specific object, do that and nothing else.
 			// Example: clicking on a pipe with a RPD in rotate mode should rotate that pipe and ignore everything else on the tile.
+			if(ranged)
+				user.Beam(T, icon_state="rped_upgrade", icon='icons/effects/effects.dmi', time=5)
 			return

 	// If we get this far, we have to check every object in the tile, to make sure that none of them block RPD usage on this tile.
@@ -212,6 +230,8 @@ var/list/pipemenu = list(
 			return

 	// If we get here, then we're effectively acting on the turf, probably placing a pipe.
+	if(ranged) //woosh beam if bluespaced at a distance
+		user.Beam(T,icon_state="rped_upgrade", icon='icons/effects/effects.dmi', time=5)
 	T.rpd_act(user, src)

 #undef RPD_COOLDOWN_TIME
@@ -98,6 +98,7 @@
 	new /obj/item/clothing/mask/gas/voice/clown(src)
 	new /obj/item/radio/headset/headset_service(src)
 	new /obj/item/pda/clown(src)
+	new /obj/item/storage/box/survival(src)
 	new /obj/item/reagent_containers/food/snacks/grown/banana(src)
 	new /obj/item/stamp/clown(src)
 	new /obj/item/toy/crayon/rainbow(src)
@@ -88,7 +88,7 @@
 	update_icon()

 /obj/item/storage/belt/utility/chief
-	name = "Chief Engineer's toolbelt"
+	name = "advanced toolbelt"
 	desc = "Holds tools, looks snazzy"
 	icon_state = "utilitybelt_ce"
 	item_state = "utility_ce"
@@ -139,7 +139,7 @@
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 17
 	use_to_pickup = 1
-	name = "Surgical Belt"
+	name = "surgical belt"
 	desc = "Can hold various surgical tools."
 	storage_slots = 9
 	use_item_overlays = 1
@@ -302,6 +302,48 @@
 	item_state = "utility"
 	use_item_overlays = 1 // So it will still show tools in it in case sec get lazy and just glance at it.

+/obj/item/storage/belt/grenade
+	name = "grenadier belt"
+	desc = "A belt for holding grenades."
+	icon_state = "assaultbelt"
+	item_state = "assault"
+	storage_slots = 30
+	max_combined_w_class = 60
+	display_contents_with_number = 1
+	can_hold = list(
+		/obj/item/grenade,
+		/obj/item/lighter,
+		/obj/item/reagent_containers/food/drinks/bottle/molotov
+		)
+
+/obj/item/storage/belt/grenade/full/New()
+	..()
+	new /obj/item/grenade/smokebomb(src) //4
+	new /obj/item/grenade/smokebomb(src)
+	new /obj/item/grenade/smokebomb(src)
+	new /obj/item/grenade/smokebomb(src)
+	new /obj/item/grenade/empgrenade(src) //2
+	new /obj/item/grenade/empgrenade(src)
+	new /obj/item/grenade/gluon(src) //4
+	new /obj/item/grenade/gluon(src)
+	new /obj/item/grenade/gluon(src)
+	new /obj/item/grenade/gluon(src)
+	new /obj/item/grenade/chem_grenade/facid(src) //1
+	new /obj/item/grenade/gas/plasma(src) //2
+	new /obj/item/grenade/gas/plasma(src)
+	new /obj/item/grenade/frag(src) //10
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/frag(src)
+	new /obj/item/grenade/syndieminibomb(src) //2
+	new /obj/item/grenade/syndieminibomb(src)
+
 /obj/item/storage/belt/military/abductor
 	name = "agent belt"
 	desc = "A belt used by abductor agents."
@@ -72,10 +72,11 @@
 		new /obj/item/clothing/mask/breath( src )
 		new /obj/item/tank/emergency_oxygen( src )
 		new /obj/item/reagent_containers/hypospray/autoinjector( src )
+		new /obj/item/flashlight/flare/glowstick/emergency( src )
 		return

 /obj/item/storage/box/survival_vox
-	icon_state = "box_civ"
+	icon_state = "box_vox"

 /obj/item/storage/box/survival_vox/New()
 	..()
@@ -83,9 +84,10 @@
 	new /obj/item/clothing/mask/breath/vox(src)
 	new /obj/item/tank/emergency_oxygen/nitrogen(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/flashlight/flare/glowstick/emergency(src)

 /obj/item/storage/box/survival_plasmaman
-	icon_state = "box_civ"
+	icon_state = "box_plasma"

 /obj/item/storage/box/survival_plasmaman/New()
 	..()
@@ -93,6 +95,7 @@
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/tank/emergency_oxygen/plasma(src)
 	new /obj/item/reagent_containers/hypospray/autoinjector(src)
+	new /obj/item/flashlight/flare/glowstick/emergency(src)

 /obj/item/storage/box/engineer
 	icon_state = "box_eng"
@@ -102,6 +105,7 @@
 		new /obj/item/clothing/mask/breath( src )
 		new /obj/item/tank/emergency_oxygen/engi( src )
 		new /obj/item/reagent_containers/hypospray/autoinjector( src )
+		new /obj/item/flashlight/flare/glowstick/emergency( src )
 		return

 /obj/item/storage/box/survival_mining
@@ -113,6 +117,18 @@
 		new /obj/item/tank/emergency_oxygen/engi(src)
 		new /obj/item/crowbar/red(src)
 		new /obj/item/reagent_containers/hypospray/autoinjector(src)
+		new /obj/item/flashlight/flare/glowstick/emergency(src)
+
+/obj/item/storage/box/survival_syndi
+	icon_state = "box_syndi"
+	New()
+		..()
+		contents = list()
+		new /obj/item/clothing/mask/gas/syndicate(src)
+		new /obj/item/tank/emergency_oxygen/syndi(src)
+		new /obj/item/reagent_containers/hypospray/autoinjector(src)
+		new /obj/item/reagent_containers/food/pill/initropidril(src)
+		new /obj/item/flashlight/flare/glowstick/red(src)

 /obj/item/storage/box/gloves
 	name = "box of latex gloves"
@@ -664,6 +680,56 @@
 		new /obj/item/clothing/head/syndicatefake(src)
 		new /obj/item/clothing/suit/syndicatefake(src)

+/obj/item/storage/box/enforcer_rubber
+	name = "enforcer pistol kit (rubber)"
+	desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'NON-LETHAL'."
+	icon_state = "box_ert"
+
+/obj/item/storage/box/enforcer_rubber/New()
+	..()
+	new /obj/item/gun/projectile/automatic/pistol/enforcer(src) // loaded with rubber by default
+	new /obj/item/ammo_box/magazine/enforcer(src)
+	new /obj/item/ammo_box/magazine/enforcer(src)
+
+/obj/item/storage/box/enforcer_lethal
+	name = "enforcer pistol kit (lethal)"
+	desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'LETHAL'."
+	icon_state = "box_ert"
+
+/obj/item/storage/box/enforcer_lethal/New()
+	..()
+	new /obj/item/gun/projectile/automatic/pistol/enforcer/lethal(src)
+	new /obj/item/ammo_box/magazine/enforcer/lethal(src)
+	new /obj/item/ammo_box/magazine/enforcer/lethal(src)
+
+/obj/item/storage/box/bartender_rare_ingredients_kit
+	name = "bartender rare reagents kit"
+	desc = "A box intended for experienced bartenders."
+
+/obj/item/storage/box/bartender_rare_ingredients_kit/New()
+	..()
+	var/list/reagent_list = list("sacid", "radium", "ether", "methamphetamine", "plasma", "gold", "silver", "capsaicin", "psilocybin")
+	for(var/reag in reagent_list)
+		var/obj/item/reagent_containers/glass/bottle/B = new(src)
+		B.reagents.add_reagent(reag, 30)
+		B.name = "[reag] bottle"
+
+/obj/item/storage/box/chef_rare_ingredients_kit
+	name = "chef rare reagents kit"
+	desc = "A box intended for experienced chefs."
+
+/obj/item/storage/box/chef_rare_ingredients_kit/New()
+	..()
+	new /obj/item/reagent_containers/food/condiment/soysauce(src)
+	new /obj/item/reagent_containers/food/condiment/enzyme(src)
+	new /obj/item/reagent_containers/food/condiment/pack/hotsauce(src)
+	new /obj/item/kitchen/knife/butcher(src)
+	var/list/reagent_list = list("msg", "triple_citrus", "salglu_solution", "nutriment", "gravy", "honey", "vitfro")
+	for(var/reag in reagent_list)
+		var/obj/item/reagent_containers/glass/bottle/B = new(src)
+		B.reagents.add_reagent(reag, 30)
+		B.name = "[reag] bottle"
+
 /obj/item/storage/box/mousetraps
 	name = "box of Pest-B-Gon mousetraps"
 	desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
@@ -330,3 +330,9 @@
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
+
+/obj/item/storage/pill_bottle/fakedeath/New()
+	..()
+	new /obj/item/reagent_containers/food/pill/fakedeath(src)
+	new /obj/item/reagent_containers/food/pill/fakedeath(src)
+	new /obj/item/reagent_containers/food/pill/fakedeath(src)
@@ -94,15 +94,11 @@
 	new /obj/item/multitool(src)
 	new /obj/item/clothing/gloves/combat(src)

-
-/obj/item/storage/toolbox/syndicate/trapped
-	name = "suspicious looking toolbox"
-	desc = "Danger. Very robust. Has a small red marker by the handle."
-
-/obj/item/storage/toolbox/syndicate/trapped/New()
-	..()
-	new /obj/item/grenade/chem_grenade/explosion/mine_armed(src)
-
+/obj/item/storage/toolbox/fakesyndi
+	name = "suspicous looking toolbox"
+	icon_state = "syndicate"
+	item_state = "toolbox_syndi"
+	desc = "Danger. Very Robust. The paint is still wet."

 /obj/item/storage/toolbox/drone
 	name = "mechanical toolbox"
@@ -1,85 +1,108 @@
 /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)))
-			if("bloodyspai")
+		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/gas/voice(src)
 				new /obj/item/clothing/under/chameleon(src)
 				new /obj/item/card/id/syndicate(src)
-				new /obj/item/storage/box/syndie_kit/emp(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

-			if("thief")
+			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/syndigaloshes(src)
+				new /obj/item/storage/box/syndie_kit/safecracking(src)
 				return

-			if("bond")
+			if("bond")	// 29TC + Healing Cocktail
 				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/storage/fancy/cigarettes/cigpack_syndicate(src)
-				new /obj/item/implanter/krav_maga(src)
-				new /obj/item/reagent_containers/food/drinks/drinkingglass/alliescocktail(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)
 				return

-			if("sabotage")
+			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/storage/box/syndie_kit/space(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("payday")
+			if("payday")	// 32TC
 				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/x4(src)
 				new /obj/item/card/id/syndicate(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("implant")
+			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("hacker")
+			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("darklord")
+			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/syndigaloshes(src)
+				new /obj/item/clothing/mask/gas/voice(src)
 				return

-			if("gadgets")
+			if("gadgets")	// 30TC
 				new /obj/item/clothing/gloves/color/yellow/power(src)
 				new /obj/item/pen/sleepy(src)
+				new /obj/item/clothing/shoes/syndigaloshes(src)
 				new /obj/item/clothing/glasses/thermal/syndi(src)
 				new /obj/item/flashlight/emp(src)
-				new /obj/item/clothing/shoes/syndigaloshes(src)
 				new /obj/item/stamp/chameleon(src)
 				new /obj/item/multitool/ai_detect(src)
 				return

+			if("professional")	// 30TC
+				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(src)
+				new /obj/item/storage/toolbox/syndicate(src)
+				new /obj/item/clothing/under/suit_jacket(src)
+				return
+
 /obj/item/storage/box/syndie_kit
 	name = "Box"
 	desc = "A sleek, sturdy box"
@@ -207,12 +230,12 @@

 /obj/item/storage/box/syndie_kit/caneshotgun/New()
 	..()
-	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
-	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
-	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
-	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
-	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
-	new /obj/item/ammo_casing/shotgun/dart/assassination(src)
+	new /obj/item/ammo_casing/shotgun/assassination(src)
+	new /obj/item/ammo_casing/shotgun/assassination(src)
+	new /obj/item/ammo_casing/shotgun/assassination(src)
+	new /obj/item/ammo_casing/shotgun/assassination(src)
+	new /obj/item/ammo_casing/shotgun/assassination(src)
+	new /obj/item/ammo_casing/shotgun/assassination(src)
 	new /obj/item/gun/projectile/revolver/doublebarrel/improvised/cane(src)

 /obj/item/storage/box/syndie_kit/mimery
@@ -283,4 +306,4 @@ To apply, hold the injector a short distance away from the outer thigh before ap
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/clothing/mask/balaclava(src)
 	new /obj/item/clothing/accessory/stethoscope(src)
-	new /obj/item/book/manual/engineering_hacking(src)
+	new /obj/item/book/manual/engineering_hacking(src)
@@ -27,6 +27,9 @@
 			to_chat(user, text("<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>"))
 			//playsound(usr, 'sound/effects/alert.ogg', 50, 1)

+obj/item/tank/oxygen/empty/New()
+	..()
+	air_contents.oxygen = null

 /obj/item/tank/oxygen/yellow
 	desc = "A tank of oxygen, this one is yellow."
@@ -142,11 +145,19 @@
 			to_chat(user, text("<span class='danger'>The meter on the [src.name] indicates you are almost out of air!</span>"))
 			user << sound('sound/effects/alert.ogg')

+obj/item/tank/emergency_oxygen/empty/New()
+	..()
+	air_contents.oxygen = null
+
 /obj/item/tank/emergency_oxygen/engi
 	name = "extended-capacity emergency oxygen tank"
 	icon_state = "emergency_engi"
 	volume = 6

+obj/item/tank/emergency_oxygen/engi/empty/New()
+	..()
+	air_contents.oxygen = null
+
 /obj/item/tank/emergency_oxygen/syndi
 	name = "suspicious emergency oxygen tank"
 	icon_state = "emergency_syndi"
@@ -158,6 +169,10 @@
 	icon_state = "emergency_double"
 	volume = 10

+obj/item/tank/emergency_oxygen/double/empty/New()
+	..()
+	air_contents.oxygen = null
+
 /obj/item/tank/emergency_oxygen/double/full
 	name = "pressurized double emergency oxygen tank"
 	desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen."
@@ -206,6 +206,7 @@
 	throw_speed = 1
 	throw_range = 5
 	w_class = WEIGHT_CLASS_SMALL
+	var/w_class_on = WEIGHT_CLASS_BULKY
 	force_unwielded = 3
 	force_wielded = 34
 	wieldsound = 'sound/weapons/saberon.ogg'
@@ -277,6 +278,7 @@
 /obj/item/twohanded/dualsaber/unwield()
 	..()
 	hitsound = "swing_hit"
+	w_class = initial(w_class)

 /obj/item/twohanded/dualsaber/IsReflect()
 	if(wielded)
@@ -288,6 +290,7 @@
 		return
 	..()
 	hitsound = 'sound/weapons/blade1.ogg'
+	w_class = w_class_on

 /obj/item/twohanded/dualsaber/attackby(obj/item/W, mob/user, params)
 	if(ismultitool(W))
@@ -755,4 +758,73 @@
 				qdel(A)
 				if(prob(4))
 					charged++
-					user.visible_message("<span class='notice'>The axe starts to emit an electric buzz!</span>")
+					user.visible_message("<span class='notice'>The axe starts to emit an electric buzz!</span>")
+
+/obj/item/twohanded/pitchfork
+	icon_state = "pitchfork0"
+	name = "pitchfork"
+	desc = "A simple tool used for moving hay."
+	force = 7
+	throwforce = 15
+	w_class = WEIGHT_CLASS_BULKY
+	force_unwielded = 7
+	force_wielded = 15
+	attack_verb = list("attacked", "impaled", "pierced")
+	hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/twohanded/pitchfork/demonic
+	name = "demonic pitchfork"
+	desc = "A red pitchfork, it looks like the work of the devil."
+	force = 19
+	throwforce = 24
+	force_unwielded = 19
+	force_wielded = 25
+
+/obj/item/twohanded/pitchfork/demonic/greater
+	force = 24
+	throwforce = 50
+	force_unwielded = 24
+	force_wielded = 34
+
+/obj/item/twohanded/pitchfork/demonic/ascended
+	force = 100
+	throwforce = 100
+	force_unwielded = 100
+	force_wielded = 500000 // Kills you DEAD.
+
+/obj/item/twohanded/pitchfork/update_icon()
+	icon_state = "pitchfork[wielded]"
+
+/obj/item/twohanded/pitchfork/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] impales \himself in \his abdomen with [src]! It looks like \he's trying to commit suicide...</span>")
+	return (BRUTELOSS)
+
+/obj/item/twohanded/pitchfork/demonic/pickup(mob/user)
+	if(istype(user, /mob/living))
+		var/mob/living/U = user
+		if(U.mind && !U.mind.devilinfo && (U.mind.soulOwner == U.mind)) //Burn hands unless they are a devil or have sold their soul
+			U.visible_message("<span class='warning'>As [U] picks [src] up, [U]'s arms briefly catch fire.</span>", \
+				"<span class='warning'>\"As you pick up the [src] your arms ignite, reminding you of all your past sins.\"</span>")
+			if(ishuman(U))
+				var/mob/living/carbon/human/H = U
+				H.apply_damage(rand(force/2, force), BURN, pick("l_arm", "r_arm"))
+			else
+				U.adjustFireLoss(rand(force/2,force))
+
+/obj/item/twohanded/pitchfork/demonic/attack(mob/target, mob/living/carbon/human/user)
+	if(user.mind && !user.mind.devilinfo && (user.mind.soulOwner != user.mind))
+		to_chat(user, "<span class ='warning'>The [src] burns in your hands.</span>")
+		user.apply_damage(rand(force/2, force), BURN, pick("l_arm", "r_arm"))
+	..()
+
+// It's no fun being the lord of all hell if you can't get out of a simple room
+/obj/item/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity)
+	if(!proximity || !wielded)
+		return
+	if(istype(target, /turf/simulated/wall))
+		var/turf/simulated/wall/W = target
+		user.visible_message("<span class='danger'>[user] blasts \the [target] with \the [src]!</span>")
+		playsound(target, 'sound/magic/Disintegrate.ogg', 100, 1)
+		W.devastate_wall(TRUE)
+		return 1
+	..()
@@ -87,6 +87,17 @@
 		return TRUE
 	return FALSE

+/obj/force_pushed(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction)
+	return TRUE
+
+/obj/move_crushed(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction)
+	collision_damage(pusher, force, direction)
+	return TRUE
+	
+/obj/proc/collision_damage(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction)
+	var/amt = max(0, ((force - (move_resist * MOVE_FORCE_CRUSH_RATIO)) / (move_resist * MOVE_FORCE_CRUSH_RATIO)) * 10)
+	take_damage(amt, BRUTE)
+
 /obj/blob_act(obj/structure/blob/B)
 	if(isturf(loc))
 		var/turf/T = loc
@@ -101,7 +101,9 @@
 	for(var/mob/M in loc)
 		if(itemcount >= storage_capacity)
 			break
-		if(istype (M, /mob/dead/observer))
+		if(istype(M, /mob/dead/observer))
+			continue
+		if(istype(M, /mob/living/simple_animal/bot/mulebot))
 			continue
 		if(M.buckled)
 			continue
@@ -422,4 +424,46 @@
 		user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)

 /obj/structure/closet/AllowDrop()
-	return TRUE
+	return TRUE
+
+/obj/structure/closet/bluespace
+	name = "bluespace closet"
+	desc = "A storage unit that moves and stores through the fourth dimension."
+	density = 0
+	icon_state = "bluespace"
+	icon_closed = "bluespace"
+	icon_opened = "bluespaceopen"
+	storage_capacity = 60
+	var/materials = list(MAT_METAL = 5000, MAT_PLASMA = 2500, MAT_TITANIUM = 500, MAT_BLUESPACE = 500)
+
+/obj/structure/closet/bluespace/CheckExit(atom/movable/AM)
+	UpdateTransparency(AM, loc)
+	return TRUE
+
+/obj/structure/closet/bluespace/proc/UpdateTransparency(atom/movable/AM, atom/location)
+	var/transparent = FALSE
+	for(var/atom/A in location)
+		if(A.density && A != src && A != AM)
+			transparent = TRUE
+			break
+	icon_opened = transparent ? "bluespaceopentrans" : "bluespaceopen"
+	icon_closed = transparent ? "bluespacetrans" : "bluespace"
+	icon_state = opened ? icon_opened : icon_closed
+
+/obj/structure/closet/bluespace/Crossed(atom/movable/AM)
+	if(AM.density)
+		icon_state = opened ? "bluespaceopentrans" : "bluespacetrans"
+
+/obj/structure/closet/bluespace/Move(NewLoc, direct) // Allows for "phasing" throug objects but doesn't allow you to stuff your EOC homebois in one of these and push them through walls.
+	var/turf/T = get_turf(NewLoc)
+	if(T.density)
+		return
+	for(var/atom/A in T.contents)
+		if(A.density && istype(A, /obj/machinery/door))
+			return
+	UpdateTransparency(src, NewLoc)
+	forceMove(NewLoc)
+
+/obj/structure/closet/bluespace/close()
+	. = ..()
+	density = 0
@@ -49,9 +49,9 @@

 /obj/structure/closet/lasertag/red/New()
 	..()
-	new /obj/item/gun/energy/laser/redtag(src)
-	new /obj/item/gun/energy/laser/redtag(src)
-	new /obj/item/gun/energy/laser/redtag(src)
+	new /obj/item/gun/energy/laser/tag/red(src)
+	new /obj/item/gun/energy/laser/tag/red(src)
+	new /obj/item/gun/energy/laser/tag/red(src)
 	new /obj/item/clothing/suit/redtag(src)
 	new /obj/item/clothing/suit/redtag(src)
 	new /obj/item/clothing/suit/redtag(src)
@@ -65,9 +65,9 @@

 /obj/structure/closet/lasertag/blue/New()
 	..()
-	new /obj/item/gun/energy/laser/bluetag(src)
-	new /obj/item/gun/energy/laser/bluetag(src)
-	new /obj/item/gun/energy/laser/bluetag(src)
+	new /obj/item/gun/energy/laser/tag/blue(src)
+	new /obj/item/gun/energy/laser/tag/blue(src)
+	new /obj/item/gun/energy/laser/tag/blue(src)
 	new /obj/item/clothing/suit/bluetag(src)
 	new /obj/item/clothing/suit/bluetag(src)
 	new /obj/item/clothing/suit/bluetag(src)
@@ -42,3 +42,4 @@
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/clothing/head/soft(src)
 	new /obj/item/door_remote/quartermaster(src)
+	new /obj/item/organ/internal/cyberimp/eyes/meson(src)
@@ -6,6 +6,7 @@
 	anchored = 1
 	health = 200
 	req_access = list()
+	layer = 2.9 // ensures the loot they drop always appears on top of them.
 	var/is_armory = FALSE
 	var/ignore_use = FALSE

@@ -36,6 +36,7 @@
 	new /obj/item/door_remote/chief_engineer(src)
 	new /obj/item/rpd(src)
 	new /obj/item/reagent_containers/food/drinks/mug/ce(src)
+	new /obj/item/organ/internal/cyberimp/eyes/meson(src)


 /obj/structure/closet/secure_closet/engineering_electrical
@@ -1,6 +1,6 @@
 /obj/structure/closet/secure_closet/clown
 	name = "clown's locker"
-	req_access = list()
+	req_access = list(access_clown)
 	icon_state = "clownsecure1"
 	icon_closed = "clownsecure"
 	icon_locked = "clownsecure1"
@@ -20,12 +20,13 @@
 	new /obj/item/reagent_containers/food/drinks/bottle/bottleofbanana(src)
 	new /obj/item/toy/crayon/rainbow(src)
 	new /obj/item/seeds/banana(src)
+	new /obj/item/restraints/handcuffs/toy(src)



 /obj/structure/closet/secure_closet/mime
 	name = "mime's locker"
-	req_access = list()
+	req_access = list(access_mime)
 	icon_state = "mimesecure1"
 	icon_closed = "mimesecure"
 	icon_locked = "mimesecure1"
@@ -45,4 +46,18 @@
 	new /obj/item/storage/backpack/mime(src)
 	new /obj/item/toy/crayon/mime(src)
 	new /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing(src)
-	new /obj/item/cane(src)
+	new /obj/item/cane(src)
+
+/obj/structure/closet/secure_closet/syndicate_officer
+	name = "officer's locker"
+	req_access = list(access_syndicate_command)
+
+/obj/structure/closet/secure_closet/syndicate_officer/New()
+	..()
+	new /obj/item/storage/box/syndie_kit/elite_hardsuit(src)
+	new /obj/item/gun/projectile/automatic/sniper_rifle/syndicate(src)
+	new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+	new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+	new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
+	new /obj/item/clothing/glasses/thermal(src)
+	new /obj/item/megaphone(src)
@@ -74,6 +74,7 @@
 	new /obj/item/laser_pointer(src)
 	new /obj/item/door_remote/research_director(src)
 	new /obj/item/reagent_containers/food/drinks/mug/rd(src)
+	new /obj/item/organ/internal/cyberimp/eyes/hud/diagnostic(src)


 /obj/structure/closet/secure_closet/research_reagents
@@ -123,6 +123,7 @@
 	new /obj/item/gun/energy/gun/hos(src)
 	new /obj/item/door_remote/head_of_security(src)
 	new /obj/item/reagent_containers/food/drinks/mug/hos(src)
+	new /obj/item/organ/internal/cyberimp/eyes/hud/security(src)


 /obj/structure/closet/secure_closet/warden
@@ -280,6 +281,7 @@
 	new /obj/item/clothing/under/lawyer/oldman(src)
 	new /obj/item/clothing/under/lawyer/black(src)
 	new /obj/item/clothing/under/lawyer/female(src)
+	new /obj/item/clothing/under/rank/centcom/representative(src)
 	new /obj/item/clothing/head/ntrep(src)
 	new /obj/item/clothing/shoes/sandal/fancy(src)
 	new /obj/item/storage/box/tapes(src)
@@ -433,3 +435,29 @@
 				icon_state = icon_closed
 		else
 			icon_state = icon_opened
+
+/obj/structure/closet/secure_closet/magistrate
+	name = "\improper Magistrate's locker"
+	req_access = list(access_magistrate)
+	icon_state = "magistratesecure1"
+	icon_closed = "magistratesecure"
+	icon_locked = "magistratesecure1"
+	icon_opened = "magistratesecureopen"
+	icon_broken = "magistratesecurebroken"
+	icon_off = "magistratesecureoff"
+
+/obj/structure/closet/secure_closet/magistrate/New()
+	..()
+	new /obj/item/book/manual/faxes(src)
+	new /obj/item/storage/secure/briefcase(src)
+	new /obj/item/flash(src)
+	new /obj/item/clothing/glasses/sunglasses(src)
+	new /obj/item/clothing/gloves/color/white(src)
+	new /obj/item/clothing/shoes/centcom(src)
+	new /obj/item/clothing/under/suit_jacket/really_black(src)
+	new /obj/item/clothing/under/rank/centcom/magistrate(src)
+	new /obj/item/clothing/suit/judgerobe(src)
+	new /obj/item/clothing/head/powdered_wig(src)
+	new /obj/item/gavelblock(src)
+	new /obj/item/gavelhammer(src)
+	new /obj/item/clothing/head/justice_wig(src)
@@ -47,11 +47,6 @@
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
 	new /obj/item/gun/projectile/automatic/shotgun/bulldog(src)
-	new /obj/item/pinpointer/nukeop(src)
-	new /obj/item/pinpointer/nukeop(src)
-	new /obj/item/pinpointer/nukeop(src)
-	new /obj/item/pinpointer/nukeop(src)
-	new /obj/item/pinpointer/nukeop(src)
 	new /obj/item/pda/syndicate(src)

 /obj/structure/closet/syndicate/resources/
@@ -413,6 +413,8 @@
 	new /obj/item/clothing/under/medigown(src)
 	new /obj/item/clothing/under/medigown(src)
 	new /obj/item/clothing/under/medigown(src)
+	new /obj/item/clothing/head/headmirror(src)
+	new /obj/item/clothing/head/headmirror(src)


 /obj/structure/closet/wardrobe/grey
@@ -9,17 +9,17 @@
 	var/area/syndicate_depot/core/depotarea
 	var/has_overloaded = FALSE

-/obj/structure/fusionreactor/Initialize()
-	..()
+/obj/structure/fusionreactor/New()
+	. = ..()
+	// Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
 	depotarea = areaMaster
 	if(istype(depotarea))
 		depotarea.reactor = src
-	return INITIALIZE_HINT_LATELOAD
-
-/obj/structure/fusionreactor/LateInitialize()
-	for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
-		if(!istype(T.depotarea))
-			T.depotarea = depotarea
+		for(var/obj/machinery/porta_turret/syndicate/T in range(50, loc))
+			if(!istype(T.depotarea))
+				T.depotarea = depotarea
+	else
+		log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")

 /obj/structure/fusionreactor/Destroy()
 	if(istype(depotarea))
@@ -84,8 +84,9 @@
 	var/max_fire_range = 9
 	var/area/syndicate_depot/core/depotarea

-/obj/effect/overload/Initialize()
+/obj/effect/overload/New()
 	. = ..()
+	// Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work!
 	processing_objects.Add(src)
 	depotarea = areaMaster
 	if(istype(depotarea))
@@ -93,6 +94,8 @@
 			depotarea.used_self_destruct = TRUE // Silences all further alerts from this point onwards.
 			depotarea.updateicon()
 		depotarea.shields_down()
+	else
+		log_debug("[src] at [x],[y],[z] failed depotarea istype check during New()! Either it was spawned outside the depot area (bad idea), or a bug is happening.")

 /obj/effect/overload/process()
 	var/turf/T = get_turf(src)
@@ -116,6 +119,8 @@
 		L.open()
 	for(var/mob/living/M in range(30, T))
 		M.gib()
+	for(var/obj/mecha/E in range(30, T))
+		E.Destroy()
 	explosion(get_turf(src), 25, 35, 45, 55, 1, 1, 60, 0, 0)
 	processing_objects.Remove(src)
 	qdel(src)
@@ -123,6 +123,13 @@ var/global/list/captain_display_cases = list()
 	req_access = list(access_captain)
 	start_showpiece_type = /obj/item/gun/energy/laser/captain

+/obj/structure/displaycase/stechkin
+	name = "officer's display case"
+	desc = "A display case containing a humble stechkin pistol. Never forget your roots."
+	locked = 1
+	req_access = list(access_syndicate_command)
+	start_showpiece_type = /obj/item/gun/projectile/automatic/pistol
+
 /obj/structure/displaycase/Destroy()
 	dump()
 	QDEL_NULL(circuit)
@@ -130,3 +130,51 @@
 	var/obj/structure/mirror/M = new /obj/structure/mirror(get_turf(user), get_dir(on_wall, user), 1)
 	transfer_prints_to(M, TRUE)
 	qdel(src)
+
+/obj/structure/mirror/magic
+	name = "magic mirror"
+	icon_state = "magic_mirror"
+
+/obj/structure/mirror/magic/attack_hand(mob/user)
+	if(!ishuman(user))
+		return
+
+	var/mob/living/carbon/human/H = user
+	var/choice = input(user, "Something to change?", "Magical Grooming") as null|anything in list("Name", "Body")
+
+	switch(choice)
+		if("Name")
+			var/newname = copytext(sanitize(input(H, "Who are we again?", "Name change", H.name) as null|text),1,MAX_NAME_LEN)
+
+			if(!newname)
+				return
+			H.real_name = newname
+			H.name = newname
+			if(H.dna)
+				H.dna.real_name = newname
+			if(H.mind)
+				H.mind.name = newname
+
+		if("Body")
+			var/list/race_list = list("Human", "Tajaran", "Skrell", "Unathi", "Diona", "Vulpkanin")
+			if(config.usealienwhitelist)
+				for(var/Spec in GLOB.whitelisted_species)
+					if(is_alien_whitelisted(H, Spec))
+						race_list += Spec
+			else
+				race_list += GLOB.whitelisted_species
+
+			var/datum/nano_module/appearance_changer/AC = ui_users[user]
+			if(!AC)
+				AC = new(src, user)
+				AC.name = "Magic Mirror"
+				AC.flags = APPEARANCE_ALL
+				AC.whitelist = race_list
+				ui_users[user] = AC
+			AC.ui_interact(user)
+
+/obj/structure/mirror/magic/attackby(obj/item/I, mob/living/user, params)
+	return
+
+/obj/structure/mirror/magic/shatter()
+	return //can't be broken. it's magic, i ain't gotta explain shit
@@ -0,0 +1,180 @@
+/obj/structure/reflector
+	name = "reflector frame"
+	icon = 'icons/obj/stock_parts.dmi'
+	icon_state = "box_0"
+	desc = "A frame to create a reflector.\n<span class='notice'>Use <b>5</b> sheets of <b>glass</b> to create a 1 way reflector.\nUse <b>10</b> sheets of <b>reinforced glass</b> to create a 2 way reflector.\nUse <b>1 diamond</b> to create a reflector cube.</span>"
+	anchored = 0
+	density = 1
+	layer = 3
+	var/finished = 0
+
+
+/obj/structure/reflector/bullet_act(obj/item/projectile/P)
+	var/turf/reflector_turf = get_turf(src)
+	var/turf/reflect_turf
+	var/new_dir = get_reflection(dir, P.dir)
+	if(!istype(P, /obj/item/projectile/beam))
+		return ..()
+	if(new_dir)
+		reflect_turf = get_step(reflect_turf, new_dir)
+	else
+		visible_message("<span class='notice'>[src] is hit by [P]!</span>")
+		new_dir = 0
+		return ..() //Hits as normal, explodes or emps or whatever
+
+	visible_message("<span class='notice'>[P] bounces off of [src]</span>")
+	reflect_turf = get_step(loc,new_dir)
+
+	P.original = reflect_turf
+	P.starting = reflector_turf
+	P.current = reflector_turf
+	P.yo = reflect_turf.y - reflector_turf.y
+	P.xo = reflect_turf.x - reflector_turf.x
+	new_dir = 0
+	return -1
+
+
+/obj/structure/reflector/attackby(obj/item/W, mob/user, params)
+	if(iswrench(W))
+		if(anchored)
+			to_chat(user, "Unweld [src] first!")
+			return
+		playsound(user, 'sound/items/Ratchet.ogg', 50, 1)
+		to_chat(user, "You begin to dismantle [src].")
+		if(do_after(user, 80, target = src))
+			playsound(user, 'sound/items/Ratchet.ogg', 50, 1)
+			to_chat(user, "You dismantle [src].")
+			new /obj/item/stack/sheet/metal(src.loc, 5)
+			qdel(src)
+	if(istype(W, /obj/item/weldingtool))
+		var/obj/item/weldingtool/WT = W
+		if(!anchored)
+			if(WT.remove_fuel(0,user))
+				playsound(user, 'sound/items/Welder2.ogg', 50, 1)
+				user.visible_message("[user.name] starts to weld [src.name] to the floor.", \
+					"<span class='notice'>You start to weld [src] to the floor...</span>", \
+					"<span class='italics'>You hear welding.</span>")
+				if(do_after(user,20, target = src))
+					if(!src || !WT.isOn())
+						return
+					anchored = 1
+					to_chat(user, "<span class='notice'>You weld [src] to the floor.</span>")
+		else
+			if(WT.remove_fuel(0,user))
+				playsound(user, 'sound/items/Welder2.ogg', 50, 1)
+				user.visible_message("[user] starts to cut [src] free from the floor.", \
+					"<span class='notice'>You start to cut [src] free from the floor...</span>", \
+					"<span class='italics'>You hear welding.</span>")
+				if(do_after(user,20, target = src))
+					if(!src || !WT.isOn())
+						return
+					anchored  = 0
+					to_chat(user, "<span class='notice'>You cut [src] free from the floor.</span>")
+	//Finishing the frame
+	if(istype(W,/obj/item/stack/sheet))
+		if(finished)
+			return
+		var/obj/item/stack/sheet/S = W
+		if(istype(W, /obj/item/stack/sheet/glass))
+			if(S.get_amount() < 5)
+				to_chat(user, "<span class='warning'>You need five sheets of glass to create a reflector!</span>")
+				return
+			else
+				S.use(5)
+				new /obj/structure/reflector/single (src.loc)
+				qdel(src)
+		if(istype(W,/obj/item/stack/sheet/rglass))
+			if(S.get_amount() < 10)
+				to_chat(user, "<span class='warning'>You need ten sheets of reinforced glass to create a double reflector!</span>")
+				return
+			else
+				S.use(10)
+				new /obj/structure/reflector/double (src.loc)
+				qdel(src)
+		if(istype(W, /obj/item/stack/sheet/mineral/diamond))
+			if(S.get_amount() >= 1)
+				S.use(1)
+				new /obj/structure/reflector/box (src.loc)
+				qdel(src)
+
+/obj/structure/reflector/proc/get_reflection(srcdir,pdir)
+	return 0
+
+
+/obj/structure/reflector/verb/rotate()
+	set name = "Rotate"
+	set category = "Object"
+	set src in oview(1)
+
+	if(usr.incapacitated())
+		return
+	if(anchored)
+		to_chat(usr, "<span class='warning'>It is fastened to the floor!</span>")
+		return 0
+	dir = turn(dir, 270)
+	return 1
+
+
+/obj/structure/reflector/AltClick(mob/user)
+	..()
+	if(user.incapacitated())
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
+		return
+	if(!in_range(src, user))
+		return
+	else
+		rotate()
+
+
+//TYPES OF REFLECTORS, SINGLE, DOUBLE, BOX
+
+//SINGLE
+
+/obj/structure/reflector/single
+	name = "reflector"
+	icon = 'icons/obj/reflector.dmi'
+	icon_state = "reflector"
+	desc = "A double sided angled mirror for reflecting lasers. This one does so at a 90 degree angle."
+	finished = 1
+	var/static/list/rotations = list("[NORTH]" = list("[SOUTH]" = WEST, "[EAST]" = NORTH),
+"[EAST]" = list("[SOUTH]" = EAST, "[WEST]" = NORTH),
+"[SOUTH]" = list("[NORTH]" = EAST, "[WEST]" = SOUTH),
+"[WEST]" = list("[NORTH]" = WEST, "[EAST]" = SOUTH) )
+
+/obj/structure/reflector/single/get_reflection(srcdir,pdir)
+	var/new_dir = rotations["[srcdir]"]["[pdir]"]
+	return new_dir
+
+//DOUBLE
+
+/obj/structure/reflector/double
+	name = "double sided reflector"
+	icon = 'icons/obj/reflector.dmi'
+	icon_state = "reflector_double"
+	desc = "A double sided angled mirror for reflecting lasers. This one does so at a 90 degree angle."
+	finished = 1
+	var/static/list/double_rotations = list("[NORTH]" = list("[NORTH]" = WEST, "[EAST]" = SOUTH, "[SOUTH]" = EAST, "[WEST]" = NORTH),
+"[EAST]" = list("[NORTH]" = EAST, "[WEST]" = SOUTH, "[SOUTH]" = WEST, "[EAST]" = NORTH),
+"[SOUTH]" = list("[NORTH]" = EAST, "[WEST]" = SOUTH, "[SOUTH]" = WEST, "[EAST]" = NORTH),
+"[WEST]" = list("[NORTH]" = WEST, "[EAST]" = SOUTH, "[SOUTH]" = EAST, "[WEST]" = NORTH) )
+
+/obj/structure/reflector/double/get_reflection(srcdir,pdir)
+	var/new_dir = double_rotations["[srcdir]"]["[pdir]"]
+	return new_dir
+
+//BOX
+
+/obj/structure/reflector/box
+	name = "reflector box"
+	icon = 'icons/obj/reflector.dmi'
+	icon_state = "reflector_box"
+	desc = "A box with an internal set of mirrors that reflects all laser fire in a single direction."
+	finished = 1
+	var/static/list/box_rotations = list("[NORTH]" = list("[SOUTH]" = NORTH, "[EAST]" = NORTH, "[WEST]" = NORTH, "[NORTH]" = NORTH),
+"[EAST]" = list("[SOUTH]" = EAST, "[EAST]" = EAST, "[WEST]" = EAST, "[NORTH]" = EAST),
+"[SOUTH]" = list("[SOUTH]" = SOUTH, "[EAST]" = SOUTH, "[WEST]" = SOUTH, "[NORTH]" = SOUTH),
+"[WEST]" = list("[SOUTH]" = WEST, "[EAST]" = WEST, "[WEST]" = WEST, "[NORTH]" = WEST) )
+
+/obj/structure/reflector/box/get_reflection(srcdir,pdir)
+	var/new_dir = box_rotations["[srcdir]"]["[pdir]"]
+	return new_dir
@@ -313,17 +313,6 @@
 	icon = 'icons/obj/statuelarge.dmi'
 	icon_state = "venus"

-/*
-/obj/structure/statue/snow
-	hardness = 0.5
-	material_drop_type = /obj/item/stack/sheet/mineral/snow
-
-/obj/structure/statue/snow/snowman
-	name = "snowman"
-	desc = "Several lumps of snow put together to form a snowman."
-	icon_state = "snowman"
-*/
-
 /obj/structure/statue/tranquillite
 	hardness = 0.5
 	material_drop_type = /obj/item/stack/sheet/mineral/tranquillite
@@ -349,8 +338,30 @@
 	desc = "Seems someone made a snowman here."
 	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "snowman"
-	anchored = 1
-	density = 1
+	anchored = TRUE
+	density = TRUE
+
+/obj/structure/snowman/built
+	desc = "Just like the ones you remember from childhood!"
+	max_integrity = 50
+
+/obj/structure/snowman/built/Destroy()
+	new /obj/item/reagent_containers/food/snacks/grown/carrot(drop_location())
+	new /obj/item/grown/log(drop_location())
+	new /obj/item/grown/log(drop_location())
+	return ..()
+
+/obj/structure/snowman/built/attackby(obj/item/I, mob/user)
+	if(istype(I, /obj/item/snowball) && obj_integrity < max_integrity)
+		to_chat(user, "<span class='notice'>You patch some of the damage on [src] with [I].</span>")
+		obj_integrity = max_integrity
+		qdel(I)
+	else
+		return ..()
+
+/obj/structure/snowman/built/fire_act()
+	qdel(src)
+

 /obj/structure/kidanstatue
 	name = "Obsidian Kidan warrior statue"