merge conflict fix, reset map

code/game/objects/items/devices/uplinks.dm

@@ -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

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -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),

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

@@ -38,4 +38,7 @@
 	amount = 5
 
 /obj/item/stack/telecrystal/twenty
-	amount = 20
+	amount = 20
+
+/obj/item/stack/telecrystal/fifty
+	amount = 50

code/game/objects/items/toys.dm

@@ -1650,3 +1650,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

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

@@ -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)
 

code/game/objects/items/weapons/implants/implantuplink.dm

@@ -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)

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

@@ -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)

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

@@ -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)

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

@@ -207,12 +207,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 +283,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)

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

@@ -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))