'merge

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -35,9 +35,6 @@ var/global/sent_syndicate_infiltration_team = 0
 	var/tctext = input(src, "How much TC do you want to give each team member? Suggested: 20-30. They cannot trade TC.") as num
 	var/tcamount = text2num(tctext)
 	tcamount = between(0, tcamount, 1000)
-	var/spawn_sit_mgmt = 0
-	if(alert("Spawn a syndicate mob for you, so you can brief them before they go?",,"Yes","No")=="Yes")
-		spawn_sit_mgmt = 1
 	if(sent_syndicate_infiltration_team == 1)
 		if(alert("A Syndicate Infiltration Team has already been sent. Sure you want to send another?",,"Yes","No")=="No")
 			return
@@ -85,7 +82,7 @@ var/global/sent_syndicate_infiltration_team = 0
 		var/mob/living/carbon/human/new_syndicate_infiltrator = create_syndicate_infiltrator(L, syndicate_leader_selected, tcamount, 0)
 		if(infiltrators.len)
 			var/mob/theguy = pick(infiltrators)
-			if(!spawn_sit_mgmt || theguy.key != key)
+			if(theguy.key != key)
 				new_syndicate_infiltrator.key = theguy.key
 				new_syndicate_infiltrator.internal = new_syndicate_infiltrator.s_store
 				new_syndicate_infiltrator.update_action_buttons_icon()
@@ -99,7 +96,7 @@ var/global/sent_syndicate_infiltration_team = 0
 			new_syndicate_infiltrator.loc = warpto.loc
 			sit_spawns_leader -= warpto
 			team_leader = new_syndicate_infiltrator
-			to_chat(new_syndicate_infiltrator, "<span class='danger'>As team leader, it is up to you to organize your team! Give the job to someone else if you can't handle it. Only your ID opens the exit door.</span>")
+			to_chat(new_syndicate_infiltrator, "<span class='danger'>As team leader, it is up to you to organize your team! Give the job to someone else if you can't handle it.</span>")
 		else
 			to_chat(new_syndicate_infiltrator, "<span class='danger'>Your team leader is: [team_leader]. They are in charge!</span>")
 		teamsize--
@@ -114,23 +111,6 @@ var/global/sent_syndicate_infiltration_team = 0
 		num_spawned++
 		if(!teamsize)
 			break
-	if(spawn_sit_mgmt)
-		for(var/obj/effect/landmark/L in sit_spawns_mgmt)
-			var/mob/living/carbon/human/syndimgmtmob = create_syndicate_infiltrator(L, 1, 100, 1)
-			syndimgmtmob.key = key
-			syndimgmtmob.internal = syndimgmtmob.s_store
-			syndimgmtmob.update_action_buttons_icon()
-			syndimgmtmob.faction += "syndicate"
-			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
-			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite, slot_wear_suit)
-			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite, slot_head)
-			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate, slot_wear_mask)
-			var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
-			opshud.join_hud(syndimgmtmob.mind.current)
-			set_antag_hud(syndimgmtmob.mind.current, "hudoperative")
-			syndimgmtmob.mind.special_role = "Syndicate Management Consultant"
-			syndimgmtmob.regenerate_icons()
-			to_chat(syndimgmtmob, "<span class='userdanger'>You have spawned as Syndicate Management. You should brief them on their mission before they go.</span>")
 	message_admins("[key_name_admin(src)] has spawned a Syndicate Infiltration Team.", 1)
 	log_admin("[key_name(src)] used Spawn Syndicate Infiltration Team.")
 	feedback_add_details("admin_verb","SPAWNSIT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

code/modules/antagonists/wishgranter/wishgranter.dm

@@ -70,9 +70,6 @@
 	H.dna.SetSEState(JUMPBLOCK, TRUE)
 	genemutcheck(H, JUMPBLOCK, null, MUTCHK_FORCED)
 
-	H.dna.SetSEState(SUPERFARTBLOCK, TRUE)
-	genemutcheck(H, SUPERFARTBLOCK, null, MUTCHK_FORCED)
-
 	H.dna.SetSEState(IMMOLATEBLOCK, TRUE)
 	genemutcheck(H, IMMOLATEBLOCK, null, MUTCHK_FORCED)
 

code/modules/assembly/signaler.dm

@@ -148,6 +148,7 @@
 
 	for(var/mob/O in hearers(1, loc))
 		O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
+	return TRUE
 
 /obj/item/assembly/signaler/proc/set_frequency(new_frequency)
 	if(!radio_controller)
@@ -167,9 +168,9 @@
 	receiving = TRUE
 
 /obj/item/assembly/signaler/anomaly/receive_signal(datum/signal/signal)
-	..()
-	for(var/obj/effect/anomaly/A in orange(0, src))
-		A.anomalyNeutralize()
+	if(..())
+		for(var/obj/effect/anomaly/A in orange(0, src))
+			A.anomalyNeutralize()
 
 /obj/item/assembly/signaler/anomaly/attack_self()
 	return

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -99,8 +99,22 @@
 	name = "Santa's hat"
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
+	species_fit = list("Grey, Drask")
+	sprite_sheets = list(
+		"Grey" = 'icons/mob/species/Grey/head.dmi',
+		"Drask" = 'icons/mob/species/Drask/helmet.dmi'
+		)
 	flags = BLOCKHAIR | STOPSPRESSUREDMAGE
 	flags_cover = HEADCOVERSEYES
+/obj/item/clothing/head/helmet/space/santahat/attack_self(mob/user as mob)
+	if(src.icon_state == "santahat")
+		src.icon_state = "santahat_beard"
+		src.item_state = "santahat_beard"
+		to_chat(user, "Santa's beard expands out from the hat!")
+	else
+		src.icon_state = "santahat"
+		src.item_state = "santahat"
+		to_chat(user, "The beard slinks back into the hat...")
 
 /obj/item/clothing/suit/space/santa
 	name = "Santa's suit"

code/modules/crafting/recipes.dm

@@ -247,6 +247,14 @@
 	reqs = list(/obj/item/paper = 5)
 	category = CAT_MISC
 
+/datum/crafting_recipe/sushimat
+	name = "Sushi Mat"
+	result = /obj/item/kitchen/sushimat
+	time = 10
+	reqs = list(/obj/item/stack/sheet/wood = 1,
+				/obj/item/stack/cable_coil = 2)
+	category = CAT_MISC
+
 /datum/crafting_recipe/notreallysoap
 	name = "Homemade Soap"
 	result = /obj/item/soap/ducttape

code/modules/customitems/item_defines.dm

@@ -514,8 +514,6 @@
 		return
 	to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
 
-#undef USED_MOD_HELM
-#undef USED_MOD_SUIT
 
 /obj/item/fluff/merchant_sallet_modkit //Travelling Merchant: Trav Noble. This is what they spawn in with
 	name = "SG Helmet modkit"
@@ -584,8 +582,6 @@
 	else
 		to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
 
-#define USED_MOD_HELM 1
-#define USED_MOD_SUIT 2
 
 /obj/item/fluff/pyro_wintersec_kit //DarkLordpyro: Valthorne Haliber
 	name = "winter sec conversion kit"
@@ -639,6 +635,70 @@
 		return
 	to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
 
+
+/obj/item/fluff/sylus_conversion_kit //Decemviri: Sylus Cain
+	name = "cerberus pattern conversion kit"
+	desc = "A securirty hardsuit conversion kit."
+	icon_state = "modkit"
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/fluff/sylus_conversion_kit/afterattack(atom/target, mob/user, proximity)
+	if(!proximity || !ishuman(user) || user.incapacitated())
+		return
+	var/mob/living/carbon/human/H = user
+
+	if(istype(target, /obj/item/clothing/head/helmet/space/hardsuit/security))
+		if(used & USED_MOD_HELM)
+			to_chat(H, "<span class='notice'>The kit's helmet modifier has already been used.</span>")
+			return
+		to_chat(H, "<span class='notice'>You modify the appearance of [target].</span>")
+		used |= USED_MOD_HELM
+
+		var/obj/item/clothing/head/helmet/space/hardsuit/security/P = target
+		P.name = "cerberus pattern security hardsuit helmet"
+		P.desc = "A special helmet that protects against hazardous, low pressure environments. Has an additional layer of armor and rigging for combat duty."
+		P.icon = 'icons/obj/custom_items.dmi'
+		P.icon_state = "hardsuit0-secc"
+		P.item_state = "hardsuit0-secc"
+		P.sprite_sheets = null
+		P.item_color = "secc"
+		user.update_icons()
+
+		if(P == H.head)
+			H.update_inv_head()
+		if(used & USED_MOD_HELM && used & USED_MOD_SUIT)
+			qdel(src)
+		return
+
+	if(istype(target, /obj/item/clothing/suit/space/hardsuit/security))
+		if(used & USED_MOD_SUIT)
+			to_chat(user, "<span class='notice'>The kit's suit modifier has already been used.</span>")
+			return
+		to_chat(H, "<span class='notice'>You modify the appearance of [target].</span>")
+		used |= USED_MOD_SUIT
+
+		var/obj/item/clothing/suit/space/hardsuit/security/P = target
+		P.name = "cerberus pattern security hardsuit"
+		P.desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor and rigging for combat duty"
+		P.icon = 'icons/obj/custom_items.dmi'
+		P.icon_state = "hardsuit-secc"
+		P.item_state = "hardsuit-secc"
+		P.sprite_sheets = null
+		user.update_icons()
+
+		if(P == H.wear_suit)
+			H.update_inv_wear_suit()
+		if(used & USED_MOD_HELM && used & USED_MOD_SUIT)
+			qdel(src)
+		return
+
+	to_chat(user, "<span class='warning'>You can't modify [target]!</span>")
+
+
+#undef USED_MOD_HELM
+#undef USED_MOD_SUIT
+
+
 //////////////////////////////////
 //////////// Clothing ////////////
 //////////////////////////////////

code/modules/events/event_container.dm

@@ -170,6 +170,7 @@ var/list/event_last_fired = list()
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Brand Intelligence",		/datum/event/brand_intelligence,		50, 	list(ASSIGNMENT_ENGINEER = 25),	1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust",				/datum/event/dust,						50,		list(ASSIGNMENT_ENGINEER = 50)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Dimensional Tear",			/datum/event/tear,						0,		list(ASSIGNMENT_SECURITY = 35)),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Honknomoly",					/datum/event/tear/honk,						0),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Vent Clog",				/datum/event/vent_clog,					250),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Wormholes",				/datum/event/wormholes,					150),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Pyro Anomaly",				/datum/event/anomaly/anomaly_pyro,		75,	list(ASSIGNMENT_ENGINEER = 60)),

code/modules/events/koi_mirgration.dm

@@ -1,4 +1,4 @@
-/datum/event/carp_migration
+/datum/event/carp_migration/koi
 	spawned_mobs = list(
     /mob/living/simple_animal/hostile/retaliate/carp/koi = 95,
     /mob/living/simple_animal/hostile/retaliate/carp/koi/honk = 2,

code/modules/events/tear.dm

@@ -28,6 +28,7 @@
 	density = 0
 	anchored = 1
 	luminosity = 3
+	var/list/tear_critters = list()
 
 /obj/effect/tear/New()
 	..()
@@ -38,10 +39,10 @@
 	animation.master = src
 //	flick("newtear",usr)
 	spawn(15)
-		if(animation)	qdel(animation)
+		if(animation)
+			qdel(animation)
 
 	spawn(rand(30,120))
-		var/list/tear_critters = list()
 		for(var/T in typesof(/mob/living/simple_animal))
 			var/mob/living/simple_animal/SA = T
 			if(initial(SA.gold_core_spawnable) == CHEM_MOB_SPAWN_HOSTILE)

code/modules/events/tear_honk.dm

@@ -0,0 +1,41 @@
+/datum/event/tear
+	var/obj/effect/tear/honk/HE //i could just inherit but its being finicky.
+
+/datum/event/tear/honk/announce()
+	event_announcement.Announce("A Honknomoly has opened. Expected location: [impact_area.name].", "Honknomoly Alert", 'sound/items/airhorn.ogg')
+
+/datum/event/tear/honk/start()
+	var/turf/T = pick(get_area_turfs(impact_area))
+	if(T)
+		HE = new /obj/effect/tear/honk(T.loc)
+
+/datum/event/tear/end()
+	if(HE)
+		qdel(HE)
+
+/obj/effect/tear/honk
+	name="Honkmensional Tear"
+	desc="A tear in the dimensional fabric of sanity."
+	icon='icons/effects/tear.dmi'
+	icon_state="tear"
+	tear_critters = list(/mob/living/simple_animal/hostile/retaliate/clown/goblin)
+
+/obj/effect/tear/honk/New()
+	var/atom/movable/overlay/animation = null
+	animation = new(loc)
+	animation.icon_state = "newtear"
+	animation.icon = 'icons/effects/tear.dmi'
+	animation.master = src
+	spawn(15)
+		if(animation)
+			qdel(animation)
+
+	spawn(rand(30,120))
+
+		for(var/i in 1 to 6)
+			var/chosen = pick(tear_critters)
+			var/mob/living/simple_animal/C = new chosen
+			C.forceMove(get_turf(src))
+			if(prob(50))
+				for(var/j = 1, j <= rand(1, 3), j++)
+					step(C, pick(NORTH,SOUTH,EAST,WEST))

code/modules/food_and_drinks/food/foods/seafood.dm

@@ -97,6 +97,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+	name = "Ebi Makiroll"
+	desc = "A large unsliced roll of Ebi Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Ebi_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ebi
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Ebi
 	name = "Ebi Sushi"
 	desc = "A simple sushi consisting of cooked shrimp and rice."
@@ -105,6 +115,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+	name = "Ikura Makiroll"
+	desc = "A large unsliced roll of Ikura Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Ikura_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Ikura
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_Ikura
 	name = "Ikura Sushi"
 	desc = "A simple sushi consisting of salmon roe."
@@ -113,6 +133,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+	name = "Sake Makiroll"
+	desc = "A large unsliced roll of Ebi Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Sake_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Sake
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Sake
 	name = "Sake Sushi"
 	desc = "A simple sushi consisting of raw salmon and rice."
@@ -121,6 +151,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+	name = "Smoked Salmon Makiroll"
+	desc = "A large unsliced roll of Smoked Salmon Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "SmokedSalmon_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
 	name = "Smoked Salmon Sushi"
 	desc = "A simple sushi consisting of cooked salmon and rice."
@@ -129,6 +169,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Tamago_maki
+	name = "Tamago Makiroll"
+	desc = "A large unsliced roll of Tamago Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Tamago_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tamago
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Tamago
 	name = "Tamago Sushi"
 	desc = "A simple sushi consisting of egg and rice."
@@ -137,6 +187,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+	name = "Inari Makiroll"
+	desc = "A large unsliced roll of Inari Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Inari_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Inari
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Inari
 	name = "Inari Sushi"
 	desc = "A piece of fried tofu stuffed with rice."
@@ -145,6 +205,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+	name = "Masago Makiroll"
+	desc = "A large unsliced roll of Masago Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Masago_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Masago
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_Masago
 	name = "Masago Sushi"
 	desc = "A simple sushi consisting of goldfish roe."
@@ -153,6 +223,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+	name = "Tobiko Makiroll"
+	desc = "A large unsliced roll of Tobkio Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Tobiko_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_Tobiko
 	name = "Tobiko Sushi"
 	desc = "A simple sushi consisting of shark roe."
@@ -161,6 +241,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+	name = "Tobiko and Egg Makiroll"
+	desc = "A large unsliced roll of Tobkio and Egg Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "TobikoEgg_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8, "protein" = 4)
+
 /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
 	name = "Tobiko and Egg Sushi"
 	desc = "A sushi consisting of shark roe and an egg."
@@ -169,6 +259,16 @@
 	bitesize = 3
 	list_reagents = list("nutriment" = 2, "protein" = 1)
 
+/obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+	name = "Tai Makiroll"
+	desc = "A large unsliced roll of Tai Sushi."
+	icon = 'icons/obj/food/seafood.dmi'
+	icon_state = "Tai_maki"
+	slice_path = /obj/item/reagent_containers/food/snacks/sushi_Tai
+	slices_num = 4
+	bitesize = 3
+	list_reagents = list("nutriment" = 8)
+
 /obj/item/reagent_containers/food/snacks/sushi_Tai
 	name = "Tai Sushi"
 	desc = "A simple sushi consisting of catfish and rice."

code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm

@@ -82,6 +82,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Ebi
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Ebi_maki
+	name = "Ebi Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/boiled_shrimp = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Ebi_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Ikura
 	name = "Ikura Sushi"
 	reqs = list(
@@ -91,6 +101,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Ikura
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Ikura_maki
+	name = "Ikura Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/fish_eggs/salmon = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Ikura_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Inari
 	name = "Inari Sushi"
 	reqs = list(
@@ -100,6 +120,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Inari
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Inari_maki
+	name = "Inari Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/fried_tofu = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Inari_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Sake
 	name = "Sake Sushi"
 	reqs = list(
@@ -109,6 +139,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Sake
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Sake_maki
+	name = "Sake Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/salmonmeat = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Sake_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_SmokedSalmon
 	name = "Smoked Salmon Sushi"
 	reqs = list(
@@ -118,6 +158,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_SmokedSalmon
 	category = CAT_FOOD
 
+/datum/crafting_recipe/SmokedSalmon_maki
+	name = "Smoked Salmon Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/salmonsteak = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/SmokedSalmon_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Masago
 	name = "Masago Sushi"
 	reqs = list(
@@ -127,6 +177,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Masago
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Masago_maki
+	name = "Masago Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/fish_eggs/goldfish = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Masago_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Tobiko
 	name = "Tobiko Sushi"
 	reqs = list(
@@ -136,6 +196,16 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_Tobiko
 	category = CAT_FOOD
 
+/datum/crafting_recipe/Tobiko_maki
+	name = "Tobiko Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/fish_eggs/shark = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Tobiko_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_TobikoEgg
 	name = "Tobiko and Egg Sushi"
 	reqs = list(
@@ -145,6 +215,26 @@
 	result = /obj/item/reagent_containers/food/snacks/sushi_TobikoEgg
 	category = CAT_FOOD
 
+/datum/crafting_recipe/TobikoEgg_maki
+	name = "Tobiko Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
+		/obj/item/reagent_containers/food/snacks/egg = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+	category = CAT_FOOD
+
+/datum/crafting_recipe/Sake_maki
+	name = "Sake Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/sushi_Tobiko = 4,
+		/obj/item/reagent_containers/food/snacks/egg = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/TobikoEgg_maki
+	category = CAT_FOOD
+
 /datum/crafting_recipe/sushi_Tai
 	name = "Tai Sushi"
 	reqs = list(
@@ -153,3 +243,13 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/sushi_Tai
 	category = CAT_FOOD
+
+/datum/crafting_recipe/Tai_maki
+	name = "Tai Makiroll"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/boiledrice = 1,
+		/obj/item/reagent_containers/food/snacks/catfishmeat = 4,
+	)
+	tools = list(/obj/item/kitchen/sushimat)
+	result = /obj/item/reagent_containers/food/snacks/sliceable/Tai_maki
+	category = CAT_FOOD

code/modules/holiday/christmas.dm

@@ -6,6 +6,10 @@
 				new /obj/item/a_gift(T)
 	for(var/mob/living/simple_animal/pet/corgi/Ian/Ian in GLOB.mob_list)
 		Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
+//The following spawn is necessary as both the timer and the shuttle systems initialise after the events system does, so we can't add stuff to the shuttle system as it doesn't exist yet and we can't use a timer
+	spawn(60 SECONDS)
+		var/datum/supply_packs/xmas = SSshuttle.supply_packs["[/datum/supply_packs/misc/snow_machine]"]
+		xmas.special_enabled = TRUE
 
 /datum/holiday/xmas/handle_event()
 	spawnTree()

code/modules/mob/living/autohiss.dm

@@ -58,6 +58,16 @@
 		)
 	autohiss_exempt = list("Chittin")
 
+/datum/species/drask
+	autohiss_basic_map = list(
+			"o" = list ("oo", "ooo"),
+			"u" = list ("uu", "uuu")			
+		)
+	autohiss_extra_map = list(
+			"m" = list ("mm", "mmm")
+		)
+	autohiss_exempt = list("Orluum")
+
 
 /datum/species/proc/handle_autohiss(message, datum/language/lang, mode)
 	if(!autohiss_basic_map)

code/modules/mob/living/carbon/human/emote.dm

@@ -832,11 +832,7 @@
 				message = "<span class='danger'><b>[src]</b> snaps [p_their()] fingers right off!</span>"
 				playsound(loc, 'sound/effects/snap.ogg', 50, 1)
 
-		// Needed for M_TOXIC_FART
 		if("fart", "farts")
-			if(reagents.has_reagent("simethicone"))
-				return
-//			playsound(loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun
 			if(locate(/obj/item/storage/bible) in get_turf(src))
 				to_chat(viewers(src), "<span class='danger'>[src] farts on the Bible!</span>")
 				var/image/cross = image('icons/obj/storage.dmi', "bible")
@@ -844,29 +840,10 @@
 				for(var/client/X in GLOB.admins)
 					if(check_rights(R_EVENT, 0, X.mob))
 						to_chat(X, adminbfmessage)
-			else if(TOXIC_FARTS in mutations)
-				message = "<b>[src]</b> unleashes a [pick("horrible", "terrible", "foul", "disgusting", "awful")] fart."
-			else if(SUPER_FART in mutations)
-				message = "<b>[src]</b> unleashes a [pick("loud", "deafening")] fart."
 			else
 				message = "<b>[src]</b> [pick("passes wind", "farts")]."
 			m_type = 2
 
-			var/turf/location = get_turf(src)
-
-			// Process toxic farts first.
-			if(TOXIC_FARTS in mutations)
-				for(var/mob/living/carbon/C in range(location, 2))
-					if(C.internal != null && C.wear_mask && (C.wear_mask.flags & AIRTIGHT))
-						continue
-					if(C == src)
-						continue
-					C.reagents.add_reagent("jenkem", 1)
-
-			// Farting as a form of locomotion in space
-			if(SUPER_FART in mutations)
-				newtonian_move(dir)
-
 		if("hem")
 			message = "<b>[src]</b> hems."
 

code/modules/mob/living/carbon/human/species/plasmaman.dm

@@ -148,6 +148,9 @@
 		if("Mime")
 			suit=/obj/item/clothing/suit/space/eva/plasmaman/mime
 			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/mime
+		if("Syndicate Officer")
+			suit=/obj/item/clothing/suit/space/eva/plasmaman/nuclear
+			helm=/obj/item/clothing/head/helmet/space/eva/plasmaman/nuclear
 
 	if((H.mind.special_role == SPECIAL_ROLE_WIZARD) || (H.mind.special_role == SPECIAL_ROLE_WIZARD_APPRENTICE))
 		H.equip_to_slot(new /obj/item/clothing/suit/space/eva/plasmaman/wizard(H), slot_wear_suit)

code/modules/mob/living/carbon/superheroes.dm

@@ -9,13 +9,15 @@
 	var/class
 	var/list/default_genes = list(REGEN, BREATHLESS, COLDRES)
 	var/list/default_spells = list()
-
+	var/activated = FALSE //for wishgranters to not give an option if someone already has it.
+	
 /datum/superheroes/proc/create(var/mob/living/carbon/human/H)
 	assign_genes(H)
 	assign_spells(H)
 	equip(H)
 	fixflags(H)
 	assign_id(H)
+	H.mind.special_role = SPECIAL_ROLE_SUPER
 
 /datum/superheroes/proc/equip(var/mob/living/carbon/human/H)
 	H.rename_character(H.real_name, name)

code/modules/mob/living/silicon/pai/recruit.dm

@@ -32,6 +32,32 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 			log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)")
 			return
 
+	if(href_list["download"])
+		var/obj/item/paicard/card = locate(href_list["device"])
+		if(card.pai)
+			return
+		if(usr.incapacitated() || isobserver(usr) || !card.Adjacent(usr))
+			return
+		if(istype(card, /obj/item/paicard) && istype(candidate, /datum/paiCandidate))
+			var/mob/living/silicon/pai/pai = new(card)
+			if(!candidate.name)
+				pai.name = pick(GLOB.ninja_names)
+			else
+				pai.name = candidate.name
+			pai.real_name = pai.name
+			pai.key = candidate.key
+
+			card.setPersonality(pai)
+			card.looking_for_personality = 0
+
+			ticker.mode.update_cult_icons_removed(card.pai.mind)
+			ticker.mode.update_rev_icons_removed(card.pai.mind)
+
+			pai_candidates -= candidate
+			usr << browse(null, "window=findPai")
+
+
+	if(candidate)
 		if(candidate.key && usr.key && candidate.key != usr.key)
 			message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
 			log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)")
@@ -49,29 +75,6 @@ var/datum/paiController/paiController			// Global handler for pAI candidates
 		recruitWindow(O)
 		return
 
-	if(href_list["download"])
-		var/obj/item/paicard/card = locate(href_list["device"])
-		if(card.pai)
-			return
-		if(usr.incapacitated() || isobserver(usr) || !card.Adjacent(usr))
-			return
-		if(istype(card,/obj/item/paicard) && istype(candidate,/datum/paiCandidate))
-			var/mob/living/silicon/pai/pai = new(card)
-			if(!candidate.name)
-				pai.name = pick(GLOB.ninja_names)
-			else
-				pai.name = candidate.name
-			pai.real_name = pai.name
-			pai.key = candidate.key
-
-			card.setPersonality(pai)
-			card.looking_for_personality = 0
-
-			ticker.mode.update_cult_icons_removed(card.pai.mind)
-			ticker.mode.update_rev_icons_removed(card.pai.mind)
-
-			pai_candidates -= candidate
-			usr << browse(null, "window=findPai")
 
 	if(href_list["new"])
 		var/option = href_list["option"]

code/modules/mob/living/simple_animal/bot/ed209bot.dm

@@ -23,12 +23,13 @@
 	path_image_color = "#FF0000"
 	data_hud_type = DATA_HUD_SECURITY_ADVANCED
 
+	allow_pai = 0
+
 	var/lastfired = 0
 	var/shot_delay = 3 //.3 seconds between shots
 	var/lasercolor = ""
 	var/disabled = 0//A holder for if it needs to be disabled, if true it will not seach for targets, shoot at targets, or move, currently only used for lasertag
 
-
 	var/mob/living/carbon/target
 	var/oldtarget_name
 	var/threatlevel = 0
@@ -41,10 +42,9 @@
 	var/arrest_type = 0 //If true, don't handcuff
 	var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
 	var/shoot_sound = 'sound/weapons/Taser.ogg'
-	allow_pai = 0
 
 
-/mob/living/simple_animal/bot/ed209/New(loc,created_name,created_lasercolor)
+/mob/living/simple_animal/bot/ed209/New(loc, created_name, created_lasercolor)
 	..()
 	if(created_name)
 		name = created_name
@@ -52,29 +52,33 @@
 		lasercolor = created_lasercolor
 	icon_state = "[lasercolor]ed209[on]"
 	set_weapon() //giving it the right projectile and firing sound.
-	spawn(3)
-		var/datum/job/detective/J = new/datum/job/detective
-		access_card.access += J.get_access()
-		prev_access = access_card.access
+	setup_access()
 
-		if(lasercolor)
-			shot_delay = 6//Longer shot delay because JESUS CHRIST
-			check_records = 0//Don't actively target people set to arrest
-			arrest_type = 1//Don't even try to cuff
-			declare_arrests = 0 // Don't spam sec
-			bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
+	if(lasercolor)
+		shot_delay = 6//Longer shot delay because JESUS CHRIST
+		check_records = 0//Don't actively target people set to arrest
+		arrest_type = 1//Don't even try to cuff
+		declare_arrests = 0 // Don't spam sec
+		bot_core.req_access = list(access_maint_tunnels, access_theatre, access_robotics)
 
-			if(created_name == initial(name) || !created_name)
-				if(lasercolor == "b")
-					name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
-				else if (lasercolor == "r")
-					name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
+		if(created_name == initial(name) || !created_name)
+			if(lasercolor == "b")
+				name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT")
+			else if (lasercolor == "r")
+				name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
 
 	//SECHUD
 	var/datum/atom_hud/secsensor = huds[DATA_HUD_SECURITY_ADVANCED]
 	secsensor.add_hud_to(src)
 	permanent_huds |= secsensor
 
+
+/mob/living/simple_animal/bot/ed209/proc/setup_access()
+	if(access_card)
+		var/datum/job/detective/J = new/datum/job/detective
+		access_card.access += J.get_access()
+		prev_access = access_card.access
+
 /mob/living/simple_animal/bot/ed209/turn_on()
 	. = ..()
 	icon_state = "[lasercolor]ed209[on]"

code/modules/mob/living/simple_animal/bot/syndicate.dm

@@ -29,12 +29,14 @@
 
 /mob/living/simple_animal/bot/ed209/syndicate/New()
 	..()
-	if(access_card)
-		access_card.access = list(access_syndicate, access_syndicate_leader)
 	set_weapon()
 	update_icon()
 	spawn_turf = get_turf(src)
 
+/mob/living/simple_animal/bot/ed209/syndicate/setup_access()
+	if(access_card)
+		access_card.access = list(access_syndicate, access_syndicate_leader)
+		prev_access = access_card.access
 
 /mob/living/simple_animal/bot/ed209/syndicate/update_icon()
 	icon_state = initial(icon_state)
@@ -160,7 +162,7 @@
 	P.fire()
 
 /mob/living/simple_animal/bot/ed209/syndicate/explode()
-	if (!QDELETED(src))
+	if(!QDELETED(src))
 		if(depotarea)
 			depotarea.list_remove(src, depotarea.guard_list)
 		walk_to(src,0)

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -18,7 +18,7 @@
 	var/check_friendly_fire = 0 // Should the ranged mob check for friendlies when shooting
 	var/retreat_distance = null //If our mob runs from players when they're too close, set in tile distance. By default, mobs do not retreat.
 	var/minimum_distance = 1 //Minimum approach distance, so ranged mobs chase targets down, but still keep their distance set in tiles to the target, set higher to make mobs keep distance
-	
+
 //These vars are related to how mobs locate and target
 	var/robust_searching = 0 //By default, mobs have a simple searching method, set this to 1 for the more scrutinous searching (stat_attack, stat_exclusive, etc), should be disabled on most mobs
 	var/vision_range = 9 //How big of an area to search for targets in, a vision of 9 attempts to find targets as soon as they walk into screen view
@@ -41,6 +41,8 @@
 	/obj/structure/grille,
 	/obj/structure/girder,
 	/obj/structure/rack,
+	/obj/structure/computerframe,
+	/obj/machinery/constructable_frame,
 	/obj/structure/barricade) //turned into a typecache in New()
 	var/atom/targets_from = null //all range/attack/etc. calculations should be done from this atom, defaults to the mob itself, useful for Vehicles and such
 	var/list/emote_taunt = list()

code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm

@@ -29,3 +29,23 @@
 	heat_damage_per_tick = 15	//amount of damage applied if animal's body temperature is higher than maxbodytemp
 	cold_damage_per_tick = 10	//same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp
 	unsuitable_atmos_damage = 10
+
+
+/mob/living/simple_animal/hostile/retaliate/clown/goblin
+	name = "clown goblin"
+	desc = "A tiny walking mask and clown shoes. You want to honk his nose!"
+	icon_state = "clowngoblin"
+	icon_living = "clowngoblin"
+	icon_dead = null
+	response_help = "honks the"
+	speak = list("Honk!")
+	speak_emote = list("sqeaks")
+	emote_see = list("honks")
+	maxHealth = 100
+	health = 100
+
+	speed = -1
+	turns_per_move = 1
+
+	del_on_death = TRUE
+	loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/item/clothing/shoes/clown_shoes)

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -85,7 +85,7 @@
 	var/area/syndicate_depot/core/depotarea
 	var/raised_alert = FALSE
 	var/alert_on_death = FALSE
-	var/alert_on_timeout = FALSE
+	var/alert_on_timeout = TRUE
 	var/alert_on_spacing = TRUE
 	var/alert_on_shield_breach = FALSE
 	var/seen_enemy = FALSE
@@ -99,6 +99,7 @@
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/New()
 	..()
 	name = "[name] [pick(GLOB.last_names)]"
+	// Do not attempt to move this code to Initialize() or LateInitialize(). Doing so with other objects has caused bugs in the past, because assigning "depotarea" may not work there.
 	depotarea = areaMaster
 	spawn_turf = get_turf(src)
 
@@ -197,7 +198,6 @@
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/officer
 	name = "Syndicate Officer"
 	alert_on_death = TRUE
-	alert_on_timeout = TRUE
 	melee_block_chance = 60
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory
@@ -209,7 +209,6 @@
 	maxHealth = 250
 	health = 250
 	melee_block_chance = 80
-	alert_on_timeout = TRUE
 	alert_on_shield_breach = TRUE
 
 /mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/Initialize()

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -561,17 +561,16 @@
 /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
 	return
 
-/mob/living/simple_animal/update_sight(reset_sight = FALSE)
+/mob/living/simple_animal/update_sight()
 	if(!client)
 		return
 	if(stat == DEAD)
 		grant_death_vision()
 		return
 
-	if(reset_sight)
-		see_invisible = initial(see_invisible)
-		see_in_dark = initial(see_in_dark)
-		sight = initial(sight)
+	see_invisible = initial(see_invisible)
+	see_in_dark = initial(see_in_dark)
+	sight = initial(sight)
 
 	if(client.eye != src)
 		var/atom/A = client.eye

code/modules/mob/new_player/new_player.dm

@@ -295,6 +295,13 @@
 	else
 		return 0
 
+/mob/new_player/proc/IsSyndicateCommand(rank)
+	var/datum/job/job = job_master.GetJob(rank)
+	if(job.syndicate_command)
+		return 1
+	else
+		return 0
+
 /mob/new_player/proc/AttemptLateSpawn(rank,var/spawning_at)
 	if(src != usr)
 		return 0
@@ -336,6 +343,8 @@
 	if(IsAdminJob(rank))
 		if(IsERTSpawnJob(rank))
 			character.loc = pick(ertdirector)
+		else if(IsSyndicateCommand(rank))
+			character.loc = pick(syndicateofficer)
 		else
 			character.loc = pick(aroomwarp)
 		join_message = "has arrived"

code/modules/paperwork/faxmachine.dm

@@ -61,6 +61,7 @@ var/global/list/fax_blacklist = list()
 /obj/machinery/photocopier/faxmachine/emag_act(mob/user)
 	if(!emagged)
 		emagged = 1
+		req_one_access = list()
 		to_chat(user, "<span class='notice'>The transmitters realign to an unknown source!</span>")
 	else
 		to_chat(user, "<span class='warning'>You swipe the card through [src], but nothing happens.</span>")

code/modules/paperwork/photocopier.dm

@@ -62,6 +62,16 @@
 			if(toner <= 0)
 				break
 
+			if(copier_items_printed >= copier_max_items) //global vars defined in misc.dm
+				if(prob(10))
+					visible_message("<span class='warning'>The printer screen reads \"PC LOAD LETTER\".</span>")
+				else
+					visible_message("<span class='warning'>The printer screen reads \"PHOTOCOPIER NETWORK OFFLINE, PLEASE CONTACT SYSTEM ADMINISTRATOR\".</span>")
+				if(!copier_items_printed_logged)
+					message_admins("Photocopier cap of [copier_max_items] papers reached, all photocopiers are now disabled. This may be the cause of any lag.")
+					copier_items_printed_logged = TRUE
+				break
+
 			if(emag_cooldown > world.time)
 				return
 
@@ -86,7 +96,7 @@
 			else
 				to_chat(usr, "<span class='warning'>\The [copyitem] can't be copied by \the [src].</span>")
 				break
-
+			copier_items_printed++
 			use_power(active_power_usage)
 		updateUsrDialog()
 	else if(href_list["remove"])

code/modules/reagents/chemistry/reagents/food.dm

@@ -444,8 +444,6 @@
 	taste_message = "eggs"
 
 /datum/reagent/consumable/egg/on_mob_life(mob/living/M)
-	if(prob(8))
-		M.emote("fart")
 	if(prob(3))
 		M.reagents.add_reagent("cholesterol", rand(1,2))
 	..()
@@ -644,8 +642,6 @@
 	taste_message = "burritos"
 
 /datum/reagent/consumable/beans/on_mob_life(mob/living/M)
-	if(prob(10))
-		M.emote("fart")
 	return ..()
 
 /datum/reagent/consumable/bread

code/modules/reagents/chemistry/reagents/medicine.dm

@@ -844,13 +844,6 @@
 
 /datum/reagent/medicine/insulin/on_mob_life(mob/living/M)
 	M.reagents.remove_reagent("sugar", 5)
-	..()
-
-/datum/reagent/medicine/simethicone
-	name = "Simethicone"
-	id = "simethicone"
-	description = "This strange liquid seems to have no bubbles on the surface."
-	color = "#14AA46"
 
 /datum/reagent/medicine/teporone
 	name = "Teporone"

code/modules/reagents/chemistry/reagents/misc.dm

@@ -366,31 +366,6 @@
 			to_chat(H, "<span class='notice'>Hair bursts forth from your every follicle!")
 	..()
 
-/datum/reagent/fartonium
-	name = "Fartonium"
-	id = "fartonium"
-	description = "Oh god it never ends, IT NEVER STOPS!"
-	reagent_state = GAS
-	color = "#D06E27"
-	taste_message = "mexican cuisine"
-
-/datum/reagent/fartonium/on_mob_life(mob/living/M)
-	var/update_flags = STATUS_UPDATE_NONE
-	if(prob(66))
-		M.emote("fart")
-
-	if(holder.has_reagent("simethicone"))
-		if(prob(25))
-			to_chat(M, "<span class='danger'>[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]</span>")
-			update_flags |= M.adjustBruteLoss(1, FALSE)
-		if(prob(10))
-			M.custom_emote(1,"strains, but nothing happens.")
-			update_flags |= M.adjustBruteLoss(2, FALSE)
-		if(prob(5))
-			M.emote("scream")
-			update_flags |= M.adjustBruteLoss(4, FALSE)
-	return ..() | update_flags
-
 /datum/reagent/hugs
 	name = "Pure hugs"
 	id = "hugs"

code/modules/reagents/chemistry/recipes/medicine.dm

@@ -225,13 +225,6 @@
 	mix_message = "A minty and refreshing smell drifts from the effervescent mixture."
 	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
 
-/datum/chemical_reaction/simethicone
-	name = "simethicone"
-	id = "simethicone"
-	result = "simethicone"
-	required_reagents = list("hydrogen" = 1, "chlorine" = 1, "silicon" = 1, "oxygen" = 1)
-	result_amount = 4
-
 /datum/chemical_reaction/teporone
 	name = "Teporone"
 	id = "teporone"

code/modules/reagents/chemistry/recipes/others.dm

@@ -239,14 +239,6 @@
 	result_amount = 3
 	mix_message = "The liquid becomes amazingly furry and smells peculiar."
 
-/datum/chemical_reaction/fartonium
-	name = "Fartonium"
-	id = "fartonium"
-	result = "fartonium"
-	required_reagents = list("fake_cheese" = 1, "beans" = 1, "????" = 1, "egg" = 1)
-	result_amount = 2
-	mix_message = "The substance makes a little 'toot' noise and starts to smell pretty bad."
-
 /datum/chemical_reaction/soapification
 	name = "Soapification"
 	id = "soapification"

code/modules/research/designs/bluespace_designs.dm

@@ -80,3 +80,13 @@
 	materials = list(MAT_METAL = 150, MAT_GLASS = 100)
 	build_path = /obj/item/radio/beacon
 	category = list("Bluespace")
+
+/datum/design/rpd
+	name = "Bluespace Rapid Pipe Dispenser (BRPD)"
+	desc = "Similar to the Rapid Pipe Dispenser, lets you rapidly dispense pipes. Now at long range!"
+	req_tech = list("bluespace" = 3, "toxins" = 6)
+	id = "brpd"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 75000, MAT_GLASS = 37500, MAT_SILVER = 3000)
+	build_path = /obj/item/rpd/bluespace
+	category = list("Bluespace")

code/modules/research/designs/equipment_designs.dm

@@ -101,11 +101,21 @@
 	build_path = /obj/item/bikehorn/airhorn
 	category = list("Equipment")
 
+/datum/design/breath_mask
+	name = "Breath mask"
+	desc = "A close-fitting mask that can be connected to an air supply."
+	id = "breathmask"
+	req_tech = list("toxins" = 3)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 300, MAT_GLASS = 200)
+	build_path = /obj/item/clothing/mask/breath
+	category = list("Equipment")
+
 /datum/design/welding_mask
 	name = "Welding Gas Mask"
 	desc = "A gas mask with built in welding goggles and face shield. Looks like a skull, clearly designed by a nerd."
 	id = "weldingmask"
-	req_tech = list("materials" = 2, "engineering" = 3)
+	req_tech = list("materials" = 2, "engineering" = 3, "toxins" = 3)
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 3000, MAT_GLASS = 1000)
 	build_path = /obj/item/clothing/mask/gas/welding

code/modules/research/designs/misc_designs.dm

@@ -80,7 +80,7 @@
 	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	build_path = /obj/item/clothing/mask/muzzle/safety/shock
 	category = list("Miscellaneous")
-	
+
 /datum/design/data_disk
 	name = "Genetics Data Disk"
 	desc = "Disk that allows you to store genetic data."
@@ -90,3 +90,43 @@
 	materials = list(MAT_METAL=300, MAT_GLASS=100)
 	build_path = /obj/item/disk/data
 	category = list("Miscellaneous")
+
+/datum/design/emergency_oxygen
+	name = "Empty Emergency Oxygen Tank"
+	desc = "Used for emergencies. Onl contains very little oxygen once filled up."
+	id = "emergencyoxygen"
+	req_tech = list("toxins" = 3)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=500, MAT_GLASS=100)
+	build_path = /obj/item/tank/emergency_oxygen/empty
+	category = list("Miscellaneous")
+
+/datum/design/extended_oxygen
+	name = "Empty Extended Emergency Oxygen Tank"
+	desc = "Used for emergencies. Can contain a decent amount of oxygen once filled up."
+	id = "extendedoxygen"
+	req_tech = list("toxins" = 4)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=800, MAT_GLASS=100)
+	build_path = /obj/item/tank/emergency_oxygen/engi/empty
+	category = list("Miscellaneous")
+
+/datum/design/double_oxygen
+	name = "Empty Double Emergency Oxygen Tank"
+	desc = "Used for emergencies. Can contain a good amount of oxygen once filled up."
+	id = "doubleoxygen"
+	req_tech = list("toxins" = 5)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=1500, MAT_GLASS=200)
+	build_path = /obj/item/tank/emergency_oxygen/double/empty
+	category = list("Miscellaneous")
+
+/datum/design/oxygen_tank
+	name = "Empty Oxygen Tank"
+	desc = "A large, empty air tank."
+	id = "oxygentank"
+	req_tech = list("toxins" = 5)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=3000, MAT_GLASS=500)
+	build_path = /obj/item/tank/oxygen/empty
+	category = list("Miscellaneous")

code/modules/research/research.dm

@@ -271,6 +271,13 @@ research holder datum.
 	id = "programming"
 	max_level = 7
 
+/datum/tech/toxins //not meant to be raised by deconstruction, do not give objects toxins as an origin_tech
+	name = "Toxins Research"
+	desc = "Research into plasma based explosive devices. Upgrade through testing explosives in the toxins lab."
+	id = "toxins"
+	max_level = 7
+	rare = 2
+
 /datum/tech/syndicate
 	name = "Illegal Technologies Research"
 	desc = "The study of technologies that violate standard Nanotrasen regulations."

code/modules/shuttle/shuttle.dm

@@ -861,6 +861,8 @@
 /obj/machinery/computer/shuttle/sst
 	name = "Syndicate Strike Time Shuttle Console"
 	desc = "Used to call and send the SST shuttle."
+	icon_keyboard = "syndie_key"
+	icon_screen = "syndishuttle"
 	req_access = list(access_syndicate)
 	shuttleId = "sst"
 	possible_destinations = "sst_home;sst_away"
@@ -868,6 +870,8 @@
 /obj/machinery/computer/shuttle/sit
 	name = "Syndicate Infiltration Team Shuttle Console"
 	desc = "Used to call and send the SIT shuttle."
+	icon_keyboard = "syndie_key"
+	icon_screen = "syndishuttle"
 	req_access = list(access_syndicate)
 	shuttleId = "sit"
 	possible_destinations = "sit_arrivals;sit_engshuttle;sit_away"