Merge branch 'master' into upstream-merge-10092

code/__defines/misc_vr.dm

@@ -80,4 +80,4 @@
 #define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2
 #define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2
 #define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2
-#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2
+#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2

code/_helpers/global_lists_vr.dm

@@ -11,7 +11,7 @@ var/global/list/traits_costs = list()		// Just path = cost list, saves time in c
 var/global/list/all_traits = list()			// All of 'em at once (same instances)
 var/global/list/active_ghost_pods = list()
 
-var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference")	//TFF 5/8/19 - Suit Sensors global list
+var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference")
 
 //stores numeric player size options indexed by name
 var/global/list/player_sizes_list = list(
@@ -173,8 +173,8 @@ var/global/list/tf_vore_egg_types = list(
 	"Spotted pink"	= /obj/item/weapon/storage/vore_egg/pinkspots)
 
 var/global/list/edible_trash = list(/obj/item/broken_device,
-				/obj/item/clothing/accessory/collar,	//TFF 10/7/19 - add option to nom collars,
-				/obj/item/device/communicator,		//TFF 19/9/19 - add option to nom communicators and commwatches,
+				/obj/item/clothing/accessory/collar,
+				/obj/item/device/communicator,
 				/obj/item/clothing/mask,
 				/obj/item/clothing/glasses,
 				/obj/item/clothing/gloves,

code/datums/autolathe/general.dm

@@ -85,7 +85,6 @@
 	name = "welding mask"
 	path =/obj/item/clothing/head/welding
 
-//TFF 24/12/19 - Let people print more spray bottles if needed.
 /datum/category_item/autolathe/general/spraybottle
 	name = "spray bottle"
 	path = /obj/item/weapon/reagent_containers/spray

code/game/area/Space Station 13 areas_vr.dm

@@ -1,4 +1,5 @@
-//TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff.
+/area
+	var/limit_mob_size = TRUE //If mob size is limited in the area.
 
 /area/shuttle/belter
 	name = "Belter Shuttle"

code/game/machinery/adv_med.dm

@@ -257,9 +257,17 @@
 			for(var/obj/thing in E.implants)
 				var/implantSubData[0]
 				var/obj/item/weapon/implant/I = thing
-				implantSubData["name"] =  I.name
-				implantSubData["known"] = istype(I) && I.known_implant
-				implantData.Add(list(implantSubData))
+			//VOREStation Block Edit Start
+				var/obj/item/device/nif/N = thing
+				if(istype(I))
+					implantSubData["name"] =  I.name
+					implantSubData["known"] = istype(I) && I.known_implant
+					implantData.Add(list(implantSubData))
+				else
+					implantSubData["name"] =  N.name
+					implantSubData["known"] = istype(N) && N.known_implant
+					implantData.Add(list(implantSubData))
+			//VOREStation Block Edit End
 
 			organData["implants"] = implantData
 			organData["implants_len"] = implantData.len
@@ -464,8 +472,11 @@
 			var/unknown_body = 0
 			for(var/thing in e.implants)
 				var/obj/item/weapon/implant/I = thing
+				var/obj/item/device/nif/N = thing //VOREStation Add: NIFs
 				if(istype(I) && I.known_implant)
 					imp += "[I] implanted:"
+				if(istype(N) && N.known_implant) //VOREStation Add: NIFs
+					imp += "[N] implanted:"
 				else
 					unknown_body++
 

code/game/machinery/doorbell_vr.dm

@@ -43,7 +43,6 @@
 	else
 		icon_state = "dbchime-standby"
 
-//TFF 3/6/19 - Port Cit RP fix of infinite frames. ToDo: Make it so that you can completely deconstruct it and reconstruct it.
 /obj/machinery/doorbell_chime/attackby(obj/item/W as obj, mob/user as mob)
 	src.add_fingerprint(user)
 	if(default_deconstruction_screwdriver(user, W))

code/game/machinery/exonet_node.dm

@@ -16,7 +16,6 @@
 
 	var/list/logs = list() // Gets written to by exonet's send_message() function.
 
-//TFF 3/6/19 - Port Cit RP fix for infinite frames
 	circuit = /obj/item/weapon/circuitboard/telecomms/exonet_node
 // Proc: New()
 // Parameters: None

code/game/machinery/machinery.dm

@@ -428,7 +428,7 @@ Class Procs:
 	for(var/obj/I in contents)
 		if(istype(I,/obj/item/weapon/card/id))
 			I.forceMove(src.loc)
-	//TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK!
+	
 	if(!circuit)
 		return 0
 	var/obj/structure/frame/A = new /obj/structure/frame(src.loc)

code/game/machinery/vending_machines_vr.dm

@@ -3207,7 +3207,6 @@
 					/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10)
 	vend_delay = 15
 
-//TFF 19/12/19 - Brig version of a seed storage vendor
 /obj/machinery/seed_storage/brig
 	name = "Prisoners' food seed storage"
 	starting_seeds = list(

code/game/machinery/wall_frames.dm

@@ -105,7 +105,7 @@
 	desc = "Used for building lights."
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "tube-construct-item"
-	refund_amt = 2	//TFF 17/1/20 - Oversight fix for infinite steel produciton.
+	refund_amt = 2
 	build_machine_type = /obj/machinery/light_construct
 	reverse = 1
 

code/game/objects/effects/decals/posters/polarisposters.dm

@@ -291,7 +291,7 @@
 	The image seems important."
 	listing_name = "Safety - Mech Operation"
 
-//VOREStation Removal Start TFF 17/12/19 - lore not used in our station's own lore.
+//VOREStation Removal Start
 /*
 /datum/poster/nanotrasen/nt_4
 	icon_state = "ntposter04"

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

@@ -294,7 +294,7 @@
 	icon_state = "lamp"
 	force = 10
 	center_of_mass = list("x" = 13,"y" = 11)
-	brightness_on = 10	//TFF 27/11/19 - post refactor fix for intensity levels.
+	brightness_on = 10
 	w_class = ITEMSIZE_LARGE
 	power_use = 0
 	on = 1

code/game/objects/items/toys/toys.dm

@@ -950,7 +950,7 @@
 /obj/item/toy/plushie/mouse
 	name = "mouse plush"
 	desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend."
-	icon_state = "mouseplushie"	//TFF 12/11/19 - updated icon to show a sprite that doesn't replicate a dead mouse. Heck you for that! >:C
+	icon_state = "mouseplushie"
 	pokephrase = "Squeak!"
 
 /obj/item/toy/plushie/kitten

code/modules/admin/admin_verb_lists_vr.dm

@@ -155,6 +155,7 @@ var/list/admin_verbs_fun = list(
 	/client/proc/smite,
 	/client/proc/smite_vr, //VOREStation Add,
 	/client/proc/admin_lightning_strike,
+	/client/proc/resize //VOREStation Add,
 	)
 
 var/list/admin_verbs_spawn = list(

code/modules/admin/verbs/resize.dm

@@ -4,7 +4,7 @@
     set category = "Fun"
     if(!check_rights(R_ADMIN, R_FUN))
         return
-    
+
     var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) as num|null
     if(!size_multiplier)
         return //cancelled

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

@@ -44,7 +44,6 @@
 	display_name = "collar, holo"
 	path = /obj/item/clothing/accessory/collar/holo
 
-//TFF 17/6/19 - public loadout addition: Indigestible Holocollar
 /datum/gear/collar/holo/indigestible
 	display_name = "collar, holo (indigestible)"
 	path = /obj/item/clothing/accessory/collar/holo/indigestible

code/modules/client/preference_setup/vore/09_misc.dm

@@ -1,5 +1,3 @@
-//TFF 5/8/19 - moved /datum/preferences to preferences_vr.dm
-
 /datum/category_item/player_setup_item/vore/misc
 	name = "Misc Settings"
 	sort_order = 9
@@ -9,16 +7,15 @@
 	S["directory_tag"]			>> pref.directory_tag
 	S["directory_erptag"]		>> pref.directory_erptag
 	S["directory_ad"]			>> pref.directory_ad
-	S["sensorpref"]				>> pref.sensorpref	//TFF 5/8/19 - add sensor pref setting to load after saved
+	S["sensorpref"]				>> pref.sensorpref
 
 /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S)
 	S["show_in_directory"]		<< pref.show_in_directory
 	S["directory_tag"]			<< pref.directory_tag
 	S["directory_erptag"]		<< pref.directory_erptag
 	S["directory_ad"]			<< pref.directory_ad
-	S["sensorpref"]				<< pref.sensorpref	//TFF 5/8/19 - add sensor pref setting to be saveable
+	S["sensorpref"]				<< pref.sensorpref
 
-//TFF 5/8/19 - add new datum category to allow for setting multiple settings when this is selected in the loadout.
 /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character)
 	if(pref.sensorpref > 5 || pref.sensorpref < 1)
 		pref.sensorpref = 5
@@ -28,7 +25,7 @@
 	pref.show_in_directory		= sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory))
 	pref.directory_tag			= sanitize_inlist(pref.directory_tag, GLOB.char_directory_tags, initial(pref.directory_tag))
 	pref.directory_erptag			= sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag))
-	pref.sensorpref				= sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref))	//TFF - 5/8/19 - add santisation for sensor prefs
+	pref.sensorpref				= sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref))
 
 /datum/category_item/player_setup_item/vore/misc/content(var/mob/user)
 	. += "<br>"
@@ -36,7 +33,7 @@
 	. += "<b>Character Directory Vore Tag:</b> <a href='?src=\ref[src];directory_tag=1'><b>[pref.directory_tag]</b></a><br>"
 	. += "<b>Character Directory ERP Tag:</b> <a href='?src=\ref[src];directory_erptag=1'><b>[pref.directory_erptag]</b></a><br>"
 	. += "<b>Character Directory Advertisement:</b> <a href='?src=\ref[src];directory_ad=1'><b>Set Directory Ad</b></a><br>"
-	. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>"	//TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random
+	. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>"
 
 /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user)
 	if(href_list["toggle_show_in_directory"])
@@ -58,7 +55,6 @@
 		var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0)	//VOREStation Edit: separating out OOC notes
 		pref.directory_ad = msg
 		return TOPIC_REFRESH
-	//TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get.
 	else if(href_list["toggle_sensor_setting"])
 		var/new_sensorpref = input(user, "Choose your character's sensor preferences:", "Character Preferences", sensorpreflist[pref.sensorpref]) as null|anything in sensorpreflist
 		if (!isnull(new_sensorpref) && CanUseTopic(user))

code/modules/clothing/clothing_vr.dm

@@ -154,7 +154,6 @@
 		SPECIES_VOX = 'icons/mob/species/vox/suit.dmi',
 		SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi')
 
-//TFF 5/8/19 - sets Vorestation /obj/item/clothing/under sensor setting default?
 /obj/item/clothing/under
 	sensor_mode = 3
 	var/sensorpref = 5
@@ -165,7 +164,6 @@
 		SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'/*ywedit*/
 		)
 
-//TFF 5/8/19 - define numbers and specifics for suit sensor settings
 /obj/item/clothing/under/New(var/mob/living/carbon/human/H)
 	..()
 	sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1)

code/modules/clothing/under/color.dm

@@ -30,8 +30,6 @@
 	icon_state = "grey"
 	rolled_sleeves = 0
 
-//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings.
-//TFF 5/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly.
 /obj/item/clothing/under/color/orange
 	name = "orange jumpsuit"
 	icon_state = "orange"

code/modules/events/rogue_drones.dm

@@ -22,7 +22,7 @@
 /datum/event/rogue_drone/announce()
 	var/msg
 	var/rng = rand(1,5)
-	//CHOMPStation Edit Start TFF 14/1/20 - Virgo 3b -> Sif
+	//CHOMPStation Edit Start 
 	switch(rng)
 		if(1)
 			msg = "A combat drone wing operating in close orbit above Sif has failed to return from a anti-piracy sweep.  If any are sighted, \

code/modules/food/food/snacks_vr.dm

@@ -58,7 +58,7 @@
 	desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries."
 	icon = 'icons/obj/food_vr.dmi'
 	icon_state = "roastbeef"
-	trash = /obj/item/trash/plate	//TFF 30/11/19 - Roast beef are put on plates, not waffle trays, you dunce~
+	trash = /obj/item/trash/plate
 	nutriment_amt = 8
 	nutriment_desc = list("cooked meat" = 5)
 

code/modules/holomap/holomap_area.dm

@@ -33,7 +33,6 @@
 
 /area/engineering
 	holomap_color = HOLOMAP_AREACOLOR_ENGINEERING
-//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
 /area/engineering/atmos_intake
 	holomap_color = null
 /area/maintenance/substation/engineering

code/modules/hydroponics/seed_machines.dm

@@ -94,7 +94,6 @@
 			to_chat(user, "You load [W] into [src].")
 		return
 
-//TFF 3/6/19 - fix infinite frame creation, ported from Cit RP - also allow movement of hydroponic-related machines.
 	if(default_deconstruction_screwdriver(user, W))
 		return
 	if(W.is_wrench())

code/modules/mob/living/bot/farmbot.dm

@@ -10,7 +10,7 @@
 	icon_state = "farmbot0"
 	health = 50
 	maxHealth = 50
-	req_one_access = list(access_robotics, access_hydroponics, access_xenobiology)	//TFF 11/7/19 - adds Xenobio access on behalf of Nalarac
+	req_one_access = list(access_robotics, access_hydroponics, access_xenobiology)
 
 	var/action = "" // Used to update icon
 	var/waters_trays = 1

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

@@ -492,6 +492,7 @@ This function restores all organs.
 	switch(damagetype)
 		if(BRUTE)
 			damageoverlaytemp = 20
+			if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} //CHOMPSTATION edit. Fixes NIF armour.
 			damage = damage*species.brute_mod
 
 			for(var/datum/modifier/M in modifiers)
@@ -504,6 +505,7 @@ This function restores all organs.
 				UpdateDamageIcon()
 		if(BURN)
 			damageoverlaytemp = 20
+			if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} //CHOMPSTATION edit. Fixes NIF armour.
 			damage = damage*species.burn_mod
 
 			for(var/datum/modifier/M in modifiers)

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

@@ -7,7 +7,6 @@
 	var/impersonate_bodytype //For impersonating a bodytype
 	var/ability_flags = 0	//Shadekin abilities/potentially other species-based?
 	var/sensorpref = 5		//Suit sensor loadout pref
-	var/unnaturally_resized = FALSE 		//If one became larger than 200%, or smaller than 25%. This flag is needed for the case when admins want someone to be very big or very small outside of dorms.
 	var/wings_hidden = FALSE
 	var/nutrition_hidden = FALSE // Chomp Edit
 

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

@@ -97,6 +97,7 @@
 			var/their_slowdown = max(H.calculate_item_encumbrance(), 1)
 			item_tally = max(item_tally, their_slowdown) // If our slowdown is less than theirs, then we become as slow as them (before species modifires).
 
+	item_tally /= 2 //VOREStation Add
 	item_tally *= species.item_slowdown_mod
 
 	. += item_tally

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

@@ -104,7 +104,8 @@
 		else if (E.is_dislocated())
 			stance_damage += 0.5
 
-		if(E) limb_pain = E.organ_can_feel_pain()
+		if(E && (!E.is_usable() || E.is_broken() || E.is_dislocated())) //VOREStation Edit
+			limb_pain = E.organ_can_feel_pain()
 
 	// Canes and crutches help you stand (if the latter is ever added)
 	// One cane mitigates a broken leg+foot, or a missing foot.

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

@@ -62,8 +62,6 @@
 
 	//No need to update all of these procs if the guy is dead.
 	fall() //VORESTATION EDIT. Prevents people from floating
-	if(unnaturally_resized)	//VORESTATION EDIT.
-		handle_unnatural_size()
 	if(stat != DEAD && !stasis)
 		//Updates the number of stored chemicals for powers
 		handle_changeling()

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

@@ -78,10 +78,3 @@
 	// Moving around increases germ_level faster
 	if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8))
 		germ_level++
-
-/mob/living/carbon/human/proc/handle_unnatural_size()
-	if(!in_dorms())
-		if(src.size_multiplier > 2)
-			src.resize(2)
-		else if (src.size_multiplier < 0.25)
-			src.resize(0.25)

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

@@ -416,7 +416,6 @@
 		H.visible_message( \
 			"<span class='notice'>[H] shakes [target]'s hand.</span>", \
 			"<span class='notice'>You shake [target]'s hand.</span>", )
-	//TFF 15/12/19 - Port nose booping from CHOMPStation
 	else if(H.zone_sel.selecting == "mouth")
 		H.visible_message( \
 			"<span class='notice'>[H] boops [target]'s nose.</span>", \

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

@@ -53,6 +53,9 @@
 
 	var/datum/species/new_copy = new to_copy.type()
 
+	for(var/organ in to_copy.has_limbs)
+		var/list/organ_data = to_copy.has_limbs[organ]
+		new_copy.has_limbs[organ] = organ_data.Copy()
 	new_copy.traits = traits
 
 	//If you had traits, apply them

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

@@ -1120,13 +1120,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 		return
 
 	//If you are FBP with wing style and didn't set a custom one
-	if(synthetic && synthetic.includes_wing && !wing_style)
+	if(synthetic && synthetic.includes_wing && !wing_style && !wings_hidden) //VOREStation Edit
 		var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing?
 		wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD)
 		return image(wing_s)
 
 	//If you have custom wings selected
-	if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL))
+	if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL) && !wings_hidden) //VOREStation Edit
 		var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state)
 		if(wing_style.do_colouration)
 			wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode)

code/modules/mob/living/living_defines_vr.dm

@@ -6,6 +6,7 @@
 	appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER
 	var/hunger_rate = DEFAULT_HUNGER_FACTOR
 	var/resizable = TRUE
+	var/size_uncapped = FALSE //Determines if a mob's size obedies the resize cap, used for adminbus resize.
 
 //custom say verbs
 	var/custom_say = null

code/modules/mob/living/say.dm

@@ -8,7 +8,7 @@ var/list/department_radio_keys = list(
 	  ":n" = "Science",		".n" = "Science",
 	  ":m" = "Medical",		".m" = "Medical",
 	  ":e" = "Engineering", ".e" = "Engineering",
-	  ":k" = "Response Team",	".k" = "Response Team",	//TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such.,
+	  ":k" = "Response Team",	".k" = "Response Team",
 	  ":s" = "Security",	".s" = "Security",
 	  ":w" = "whisper",		".w" = "whisper",
 	  ":t" = "Mercenary",	".t" = "Mercenary",
@@ -27,7 +27,7 @@ var/list/department_radio_keys = list(
 	  ":N" = "Science",		".N" = "Science",
 	  ":M" = "Medical",		".M" = "Medical",
 	  ":E" = "Engineering",	".E" = "Engineering",
-	  ":k" = "Response Team",	".k" = "Response Team",	//TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such.,
+	  ":k" = "Response Team",	".k" = "Response Team",
 	  ":S" = "Security",	".S" = "Security",
 	  ":W" = "whisper",		".W" = "whisper",
 	  ":T" = "Mercenary",	".T" = "Mercenary",

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

@@ -56,7 +56,7 @@
 		"Chirp" = list("chirps","chirrups","cheeps"),
 		"Feline" = list("purrs","yowls","meows"),
 		"Canine" = list("yaps","barks","woofs"),
-		"Rodent" = list("squeaks", "SQUEAKS", "sqiks")	//VOREStation Edit - TFF 22/11/19 - CHOMPStation port of pAI additions,
+		"Rodent" = list("squeaks", "SQUEAKS", "sqiks")	//VOREStation Edit
 		)
 
 	var/obj/item/weapon/pai_cable/cable		// The cable we produce and use when door or camera jacking
@@ -333,8 +333,7 @@
 
 	close_up()
 
-//VOREStation Removal Start - TFF 22/11/19 - Refactored in pai_vr.dm
-/*
+/* //VOREStation Removal Start
 /mob/living/silicon/pai/proc/choose_chassis()
 	set category = "pAI Commands"
 	set name = "Choose Chassis"

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

@@ -1,7 +1,6 @@
 /mob/living/silicon/pai
 	var/people_eaten = 0
 	icon = 'icons/mob/pai_vr.dmi'
-	//TFF 22/11/19 - CHOMPStation port of pAI additions.
 	var/global/list/wide_chassis = list(
 		"rat",
 		"panther"
@@ -36,7 +35,6 @@
 	else if(people_eaten && resting)
 		icon_state = "[chassis]_rest_full"
 
-	//TFF 22/11/19 - CHOMPStation port of pAI additions.
 	if(chassis in wide_chassis)
 		icon = 'icons/mob/pai_vr64x64.dmi'
 		pixel_x = -16
@@ -58,7 +56,6 @@
 	else if(people_eaten && resting)
 		icon_state = "[chassis]_rest_full"
 
-	//TFF 22/11/19 - CHOMPStation port of pAI additions.
 	if(chassis in wide_chassis)
 		icon = 'icons/mob/pai_vr64x64.dmi'
 		pixel_x = -16

code/modules/mob/new_player/preferences_setup_vr.dm

@@ -1,3 +1,2 @@
-//TFF 5/8/19 - add randomised sensor setting for random button clicking
 /datum/preferences/randomize_appearance_and_body_for(var/mob/living/carbon/human/H)
 	sensorpref = rand(1,5)

code/modules/mob/new_player/sprite_accessories_taur.dm

@@ -146,7 +146,6 @@
 	suit_sprites = 'icons/mob/taursuits_wolf.dmi'
 	icon_sprite_tag = "wolf"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/fatwolf
 	name = "Fat Wolf (Taur)"
 	icon_state = "fatwolf_s"
@@ -158,7 +157,6 @@
 	extra_overlay = "wolf_markings"
 	//icon_sprite_tag = "wolf2c"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c
 	name = "Fat Wolf dual-color (Taur)"
 	icon_state = "fatwolf_s"
@@ -245,7 +243,6 @@
 	suit_sprites = 'icons/mob/taursuits_feline.dmi'
 	icon_sprite_tag = "feline"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/fatfeline
 	name = "Fat Feline (Taur)"
 	icon_state = "fatfeline_s"
@@ -262,7 +259,6 @@
 	extra_overlay = "feline_markings"
 	//icon_sprite_tag = "feline2c"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/feline/fatfeline_2c
 	name = "Fat Feline dual-color (Taur)"
 	icon_state = "fatfeline_s"

code/modules/mob/new_player/sprite_accessories_taur_vr.dm

@@ -57,7 +57,6 @@
 	suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi'
 	icon_sprite_tag = "wolf"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/fatwolf
 	name = "Fat Wolf (Taur)"
 	icon_state = "fatwolf_s"
@@ -70,18 +69,6 @@
 	extra_overlay2 = "wolf_markings_2"
 	//icon_sprite_tag = "wolf2c"
 
-//MTosh 08/01/2020 - CHOMPstation Moved Synth Wolf up under wolf dual-color, and Fat Wolf below Synth Wolf, to better group original vorestation wolf taurs/differentiate from Chompstation Fat Taurs
-/datum/sprite_accessory/tail/taur/wolf/synthwolf
-	name = "SynthWolf dual-color (Taur)"
-	icon_state = "synthwolf_s"
-	extra_overlay = "synthwolf_markings"
-
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
-//Mtosh 08/01/2020 - CHOMPStation changed datum tree from "tail/taur/fatwolf" to "tail/taur/wolf/fatwolf" in order to fix bug involving taur duty vest.
-/datum/sprite_accessory/tail/taur/wolf/fatwolf
-	name = "Fat Wolf (Taur)"
-	icon_state = "fatwolf_s"
-
 /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c
 	name = "Fat Wolf 3-color (Taur)"
 	icon_state = "fatwolf_s"
@@ -287,7 +274,6 @@
 	suit_sprites = 'icons/mob/taursuits_feline_vr.dmi'
 	icon_sprite_tag = "feline"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/fatfeline
 	name = "Fat Feline (Taur)"
 	icon_state = "fatfeline_s"
@@ -305,7 +291,6 @@
 	extra_overlay2 = "feline_markings_2"
 	//icon_sprite_tag = "feline2c"
 
-//TFF 22/11/19 - CHOMPStation port of fat taur sprites
 /datum/sprite_accessory/tail/taur/feline/fatfeline_2c
 	name = "Fat Feline 3-color (Taur)"
 	icon_state = "fatfeline_s"

code/modules/nifsoft/software/10_combat.dm

@@ -7,7 +7,7 @@
 	illegal = TRUE
 	wear = 3
 	access = 999 //Prevents anyone from buying it without an emag.
-	activates = FALSE //It's armor.
+	//CHOMPSTATION edit. Makes NIF armour toggleable.
 	combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled
 
 /datum/nifsoft/burn_armor
@@ -19,7 +19,7 @@
 	illegal = TRUE
 	wear = 3
 	access = 999 //Prevents anyone from buying it without an emag.
-	activates = FALSE //It's armor.
+	//CHOMPSTATION edit. Makes NIF armour toggleable.
 	combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled
 
 /datum/nifsoft/painkillers

code/modules/planet/virgo4_vr.dm

@@ -32,35 +32,35 @@ var/datum/planet/virgo4/planet_virgo4 = null
 	var/min = 0
 
 	switch(sun_position)
-		if(0 to 0.30) // Night
-			low_brightness = 0.1
+		if(0 to 0.20) // Night
+			low_brightness = 0.3
 			low_color = "#000066"
 
-			high_brightness = 0.2
+			high_brightness = 0.5
 			high_color = "#66004D"
 			min = 0
 
-		if(0.30 to 0.40) // Twilight
-			low_brightness = 0.4
+		if(0.20 to 0.30) // Twilight
+			low_brightness = 0.5
 			low_color = "#66004D"
 
-			high_brightness = 0.6
+			high_brightness = 0.9
 			high_color = "#CC3300"
 			min = 0.40
 
-		if(0.40 to 0.50) // Sunrise/set
-			low_brightness = 0.7
+		if(0.30 to 0.40) // Sunrise/set
+			low_brightness = 0.9
 			low_color = "#CC3300"
 
-			high_brightness = 0.9
+			high_brightness = 3.0
 			high_color = "#FF9933"
 			min = 0.50
 
-		if(0.50 to 1.00) // Noon
-			low_brightness = 1
+		if(0.40 to 1.00) // Noon
+			low_brightness = 3.0
 			low_color = "#DDDDDD"
 
-			high_brightness = 2
+			high_brightness = 10.0
 			high_color = "#FFFFFF"
 			min = 0.70
 

code/modules/power/tesla/coil.dm

@@ -95,7 +95,6 @@
 	playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5)
 	tesla_zap(src, 10, power/(coeff/2))
 
-//TFF 3/6/19 - Port Cit RP fix for infinite frames
 /obj/machinery/power/grounding_rod
 	name = "grounding rod"
 	desc = "Keep an area from being fried from Edison's Bane."

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm

@@ -1483,7 +1483,7 @@
 
 /datum/reagent/qerr_quem
 	name = "Qerr-quem"
-	id = "querr_quem"
+	id = "qerr_quem"
 	description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish."
 	taste_description = "mint"
 	reagent_state = LIQUID

code/modules/reagents/reagent_containers/spray.dm

@@ -6,7 +6,6 @@
 	item_state = "cleaner"
 	center_of_mass = list("x" = 16,"y" = 10)
 	flags = OPENCONTAINER|NOBLUDGEON
-	//TFF 24/12/19 - Let people print more spray bottles if needed.
 	matter = list("glass" = 300, DEFAULT_WALL_MATERIAL = 300)
 	slot_flags = SLOT_BELT
 	throwforce = 3

code/modules/turbolift/turbolift_console_vr.dm

@@ -1,5 +1,3 @@
-// TFF 6/10/20 - Just a little thing to prevent the button
-				// and console from being destroyed by explosions.
 /obj/structure/lift/button/ex_act()
 	return
 

code/modules/vehicles/Securitrain_vr.dm

@@ -23,7 +23,7 @@
 
 	var/car_limit = 0	//how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching.
 	active_engines = 1
-	var/obj/item/weapon/key/key	//TFF 19/1/20 - Bugfix for key being prevented from getting used again
+	var/obj/item/weapon/key/key
 	var/key_type = /obj/item/weapon/key/security
 	var/siren = 0 //This is for eventually getting the siren sprite to work.
 
@@ -62,7 +62,7 @@
 /obj/vehicle/train/security/engine/New()
 	..()
 	cell = new /obj/item/weapon/cell/high(src)
-	key = new key_type(src)	//TFF 19/1/20 - Bugfix for key being prevented from getting used again
+	key = new key_type(src)
 	var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs
 	overlays += I
 	turn_off()	//so engine verbs are correctly set
@@ -91,7 +91,7 @@
 		..()
 
 /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, key_type))	//TFF 19/1/20 - Bugfix for key being prevented from getting used again
+	if(istype(W, key_type))
 		if(!key)
 			user.drop_item()
 			W.forceMove(src)

code/modules/vore/eating/living_vr.dm

@@ -208,12 +208,12 @@
 
 	return TRUE
 
-/mob/living/proc/apply_vore_prefs()
+/mob/living/proc/apply_vore_prefs(var/full_vorgans = FALSE) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization.
 	if(!client || !client.prefs_vr)
 		return FALSE
 	if(!client.prefs_vr.load_vore())
 		return FALSE
-	if(!copy_from_prefs_vr())
+	if(!copy_from_prefs_vr(full_vorgans = full_vorgans)) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization.
 		return FALSE
 
 	return TRUE
@@ -259,7 +259,7 @@
 //
 //	Proc for applying vore preferences, given bellies
 //
-/mob/living/proc/copy_from_prefs_vr(var/bellies = TRUE)
+/mob/living/proc/copy_from_prefs_vr(var/bellies = TRUE, var/full_vorgans = FALSE) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization.
 	if(!client || !client.prefs_vr)
 		to_chat(src,"<span class='warning'>You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.</span>")
 		return FALSE
@@ -291,7 +291,8 @@
 		vore_organs.Cut()
 		for(var/entry in P.belly_prefs)
 			list_to_object(entry,src)
-			break //CHOMPedit: Belly load optimization. Only load first belly, save the rest for vorepanel.
+			if(!full_vorgans) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization.
+				break //CHOMPedit: Belly load optimization. Only load first belly, save the rest for vorepanel.
 
 	return TRUE
 
@@ -706,7 +707,6 @@
 				to_chat(src, "<span class='notice'>You can taste the flavor of garbage and leftovers. Delicious?</span>")
 			else
 				to_chat(src, "<span class='notice'>You can taste the flavor of gluttonous waste of food.</span>")
-		//TFF 10/7/19 - Add custom flavour for collars for trash can trait.
 		else if (istype(I,/obj/item/clothing/accessory/collar))
 			visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
 			to_chat(src, "<span class='notice'>You can taste the submissiveness in the wearer of [I]!</span>")

code/modules/vore/eating/vorepanel_vr.dm

@@ -356,7 +356,7 @@
 			var/alert = alert("Are you sure you want to reload character slot preferences? This will remove your current vore organs and eject their contents.","Confirmation","Reload","Cancel")
 			if(alert != "Reload")
 				return FALSE
-			if(!host.apply_vore_prefs())
+			if(!host.apply_vore_prefs(TRUE)) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization.
 				alert("ERROR: Chomp-specific preferences failed to apply!","Error")
 			else
 				to_chat(usr,"<span class='notice'>Chomp-specific preferences applied from active slot!</span>")

code/modules/vore/fluffstuff/custom_items_vr.dm

@@ -340,7 +340,7 @@
 	name = "Mouse Plushie"
 	desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend."
 	slot_flags = SLOT_HEAD
-	icon_state = "mouse_brown"	//TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C
+	icon_state = "mouse_brown"
 	item_state = "mouse_brown_head"
 	icon = 'icons/vore/custom_items_vr.dmi'
 	icon_override = 'icons/vore/custom_items_vr.dmi'

code/modules/vore/resizing/resize_vr.dm

@@ -1,16 +1,5 @@
-
-//these aren't defines so they can stay in this file
-var/const/RESIZE_HUGE = 2
-var/const/RESIZE_BIG = 1.5
-var/const/RESIZE_NORMAL = 1
-var/const/RESIZE_SMALL = 0.5
-var/const/RESIZE_TINY = 0.25
-
-//average
-var/const/RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2
-var/const/RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2
-var/const/RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2
-var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
+GLOBAL_LIST_EMPTY(size_uncapped_mobs)
+GLOBAL_VAR(size_uncapped_mobs_timer)
 
 // Adding needed defines to /mob/living
 // Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff.
@@ -60,72 +49,12 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
 /mob/living/get_effective_size()
 	return size_multiplier
 
-<<<<<<< HEAD
-/**
- * Resizes the mob immediately to the desired mod, animating it growing/shrinking.
- * It can be used by anything that calls it.
- */
-/atom/movable/proc/in_dorms()
-	var/area/A = get_area(src)
-	return istype(A, /area/crew_quarters/sleep)
-
-||||||| parent of 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
-/**
- * Resizes the mob immediately to the desired mod, animating it growing/shrinking.
- * It can be used by anything that calls it.
- */
-
-=======
->>>>>>> 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
 /atom/movable/proc/size_range_check(size_select)		//both objects and mobs needs to have that
-	if((!in_dorms() && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1))
+	var/area/A = get_area(src) //Get the atom's area to check for size limit.
+	if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1))
 		return FALSE
 	return TRUE
 
-<<<<<<< HEAD
-/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/mark_unnatural_size = TRUE)
-||||||| parent of 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
-/proc/add_to_uncapped_list(var/mob/living/L)
-	if(L.size_uncapped)
-		return
-	if(!GLOB.size_uncapped_mobs.len)
-		GLOB.size_uncapped_mobs_timer = addtimer(CALLBACK(GLOBAL_PROC, .check_uncapped_list), 2 SECONDS, TIMER_LOOP | TIMER_UNIQUE | TIMER_STOPPABLE)
-	GLOB.size_uncapped_mobs |= weakref(L)
-
-/proc/remove_from_uncapped_list(var/mob/living/L)
-	if(!GLOB.size_uncapped_mobs.len)
-		return
-
-	GLOB.size_uncapped_mobs -= weakref(L)
-
-	if(!GLOB.size_uncapped_mobs.len)
-		deltimer(GLOB.size_uncapped_mobs_timer)
-		GLOB.size_uncapped_mobs_timer = null
-
-/proc/check_uncapped_list()
-	for(var/weakref/wr in GLOB.size_uncapped_mobs)
-		var/mob/living/L = wr.resolve()
-		var/area/A = get_area(L)
-		if(!istype(L))
-			GLOB.size_uncapped_mobs -= wr
-			continue
-		
-		if((A.limit_mob_size && !L.size_uncapped) && (L.size_multiplier <= RESIZE_TINY || L.size_multiplier >= RESIZE_HUGE))
-			L.resize(L.size_multiplier)
-			GLOB.size_uncapped_mobs -= wr
-
-	if(!GLOB.size_uncapped_mobs.len)
-		deltimer(GLOB.size_uncapped_mobs_timer)
-		GLOB.size_uncapped_mobs_timer = null
-
-/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE)
-	if(!uncapped)
-		new_size = clamp(new_size, RESIZE_TINY, RESIZE_HUGE)
-		src.size_uncapped = FALSE
-		remove_from_uncapped_list(src)
-	else
-		add_to_uncapped_list(src)
-=======
 /atom/movable/proc/has_large_resize_bounds()
 	var/area/A = get_area(src) //Get the atom's area to check for size limit.
 	return !A.limit_mob_size
@@ -182,19 +111,11 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
 	else if(is_extreme_size(new_size))
 		add_to_uncapped_list(src)
 	
->>>>>>> 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
 	if(size_multiplier == new_size)
 		return 1
 
 	size_multiplier = new_size //Change size_multiplier so that other items can interact with them
 
-	if(ishuman(src))
-		var/mob/living/carbon/human/H = src
-		if(new_size > 2 || new_size < 0.25)
-			if(mark_unnatural_size)		//Will target size be reverted to ordinary bounds when out of dorms or not?
-				H.unnaturally_resized = TRUE
-		else
-			H.unnaturally_resized = FALSE
 	if(animate)
 		var/change = new_size - size_multiplier
 		var/duration = (abs(change)+0.25) SECONDS

code/modules/vore/resizing/sizegun_vr.dm

@@ -96,20 +96,8 @@
 	var/ignoring_prefs = (target == firer ? TRUE : FALSE) // Resizing yourself
 	
 	if(istype(M))
-<<<<<<< HEAD
-		if(!M.in_dorms() || !istype(M, /mob/living/carbon/human))
-			if(!M.resize(clamp(set_size,0.25,2)))
-				to_chat(M, "<font color='blue'>The beam fires into your body, changing your size!</font>")
-		else
-			if(!M.resize(clamp(set_size,0.01,6)))
-				to_chat(M, "<font color='blue'>The beam fires into your body, changing your size!</font>")
-||||||| parent of 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
-		if(!M.resize(set_size))
-			to_chat(M, "<font color='blue'>The beam fires into your body, changing your size!</font>")
-=======
 		if(!M.resize(set_size, uncapped = M.has_large_resize_bounds(), ignore_prefs = ignoring_prefs))
 			to_chat(M, "<font color='blue'>The beam fires into your body, changing your size!</font>")
->>>>>>> 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
 		M.updateicon()
 		return
 	return 1
@@ -118,15 +106,7 @@
 	var/mob/living/M = target
 	
 	if(istype(M))
-<<<<<<< HEAD
-		M.resize(set_size, TRUE, FALSE)
-||||||| parent of 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
-		M.resize(set_size, TRUE, TRUE)
-		if(set_size >= RESIZE_TINY && set_size <= RESIZE_HUGE)
-			M.size_uncapped = FALSE
-		M.size_uncapped = TRUE
-=======
-
+  
 		var/can_be_big = M.has_large_resize_bounds()
 		var/very_big = is_extreme_size(set_size)
 
@@ -141,7 +121,6 @@
 		
 		M.resize(set_size, uncapped = TRUE, ignoring_prefs = TRUE) // Always ignores prefs, caution is advisable
 
->>>>>>> 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
 		to_chat(M, "<font color='blue'>The beam fires into your body, changing your size!</font>")
 		M.updateicon()
 		return

code/modules/xenoarcheaology/finds/finds.dm

@@ -21,7 +21,7 @@
 	icon_state = "strange"
 	var/datum/geosample/geologic_data
 	origin_tech = list(TECH_MATERIAL = 5)
-	w_class = ITEMSIZE_SMALL	//TFF 25/11/19 - fixes the strange rocks to be small size like before and not normal.
+	w_class = ITEMSIZE_SMALL
 
 /obj/item/weapon/strangerock/New(loc, var/inside_item_type = 0)
 	pixel_x = rand(0,16)-8

maps/expedition_vr/space/_debrisfield.dm

@@ -71,8 +71,6 @@
 	icon_state = "debrisexplored"
 	forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')
 
-//TFF 26/12/19 - Sub-areas for the APCs.
-
 /area/submap/debrisfield/derelict/ai_access_port
 	name = "POI - Abandoned Derelict AI Acess Port"
 

maps/gateway_vr/listeningpost.dm

@@ -2,30 +2,29 @@
 	initial_generic_waypoints = list("tether_excursion_listeningpost")
 	scanner_name = "Strange Asteroid"
 	scanner_desc = @{"[i]Registration[/i]: UNKNOWN
-[i]Class[/i]: Installation
-[i]Transponder[/i]: None Detected
-[b]Notice[/b]: Emitting encrypted radio-frequency traffic"}
+[i]Class[/i]: Wreckage
+[i]Transponder[/i]: None Detected"}
 
-/obj/item/weapon/paper/listneningpost/mission
+/obj/item/weapon/paper/listeningpost/mission
 	name = "\improper Operation: Watchtower"
 	info = {"<b>Mission Details</b>: You have been assigned to a newly constructed listening post
-			constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations.
+			constructed within an asteroid in Nanotrasen space to monitor their phoron mining operations.
 			Accurate intel is crucial to the success of our operatives onboard, do not fail us."}
 
-/obj/item/weapon/paper/listneningpost/reciept
+/obj/item/weapon/paper/listeningpost/reciept
 	name = "\improper SpacEx reciept"
 	info = {"1 x Stechtkin pistol plus ammo - $600<br>1 x silencer - $200<br>shipping charge - $4360<br>total - $5160"}
 
 
 //////// 2558 ////////
 
-/obj/item/weapon/paper/listneningpost/year2558/april
+/obj/item/weapon/paper/listeningpost/year2558/april
 	name = "\improper April 2558 report"
 	info = {"A good start to the operation: intercepted Nanotrasen military communications.
 			A convoy is scheduled to transfer nuclear warheads to a new military base. This
 			is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."}
 
-/obj/item/weapon/paper/listneningpost/year2558/may
+/obj/item/weapon/paper/listeningpost/year2558/may
 	name = "\improper May 2558 report"
 	info = {"I have intercepted faint transmissions from what appears to be some sort of pirate
 			radio station. They do not appear to be relevant to my assignment. I also learned that
@@ -33,34 +32,34 @@
 			attack in March. Ever since Townes got killed, we've lost our eyes on the inside at
 			Nanotrasen. Hence my being here..."}
 
-/obj/item/weapon/paper/listneningpost/year2558/june
+/obj/item/weapon/paper/listeningpost/year2558/june
 	name = "\improper June 2558 Report"
 	info = {"Sounds like Nanotrasen stepped up their recruitment efforts. Virgo is no longer a
 			secluded research station, and its scientists are no longer hand-picked. This could
 			be a major oppertunity for us to start snooping around."}
 
-/obj/item/weapon/paper/listneningpost/year2558/july
+/obj/item/weapon/paper/listeningpost/year2558/july
 	name = "\improper July 2558 Report"
 	info = {"The crew has at least tripled in size since NT got rid of the application-based
 			process of recruitment. We've managed to find a few people interested in aiding
 			our cause. From atmospherics sabotoge to straight up bombing the place, we've got
 			several people ready to go in posing as nothing but more grey tide. It's perfect."}
 
-/obj/item/weapon/paper/listneningpost/year2558/august
+/obj/item/weapon/paper/listeningpost/year2558/august
 	name = "\improper August 2558 Report"
 	info = {"Sounds like our agents have been successful in rattling things up. With their recuitment
 			policies laxed, we've been able to carry out several attacks on the VORE. It sounds like
 			we're the least of their problems, though. They've discovered a new technology. Something
 			they're calling Redspace."}
 
-/obj/item/weapon/paper/listneningpost/year2558/september
+/obj/item/weapon/paper/listeningpost/year2558/september
 	name = "\improper September 2558 Report"
 	info = {"Something REALLY BAD is brewing at the VORE. This Redspace shit seems to have attracted
 			the attention of the cult of Nar-Sie. I think Nanotrasen is trying to weaponize it. We
 			need to put a stop to this before Nanotrasen can use these weapons against innocent
 			people and rival companies."}
 
-/obj/item/weapon/paper/listneningpost/year2558/october
+/obj/item/weapon/paper/listeningpost/year2558/october
 	name = "\improper October 2558 Report"
 	info = {"Oh my god, if it weren't for the impending doom, I'd be laughing my ass off at
 			all the hell VORE has put up with this month. Near mutiny over a retarded clown,
@@ -71,7 +70,7 @@
 			in an army from another dimension. We have no time left. We have to strike while
 			there's still something worth saving."}
 
-/obj/item/weapon/paper/listneningpost/year2558/november
+/obj/item/weapon/paper/listeningpost/year2558/november
 	name = "\improper November 2558 Report"
 	info = {"Maybe these VORE people aren't so bad after all. Mike says they actually HELPED during
 			our (apparently failed) attack on the Citadel. Shame they work for an evil corporation
@@ -80,7 +79,7 @@
 			crazy guy showed up on the station claiming he's from 1945. The crew seems to think it's
 			legit though. Maybe he is. I don't think he is though. I'll keep monitoring the situation."}
 
-/obj/item/weapon/paper/listneningpost/year2558/december
+/obj/item/weapon/paper/listeningpost/year2558/december
 	name = "\improper December 2558 Report"
 	info = {"We hired a merc to capture their top Redspace scientist Kisuke Gema. Unfortunately, Colonel
 			Morgan was a fucking idiot as usual and turned his back for half a second, and the nerd cut
@@ -92,7 +91,7 @@
 
 //////// 2559 ////////
 
-/obj/item/weapon/paper/listneningpost/year2559/january
+/obj/item/weapon/paper/listeningpost/year2559/january
 	name = "\improper January 2559 Report"
 	info = {"So, this guy from 1945 is legit. His name is Chase Monroe and he's a former Seargent in
 			the USCM or something. Although I feel like the USCM didn't exist in 1945. Also a pirate
@@ -101,7 +100,7 @@
 			blow several bombs on the station, and even steal the nuke. VORE's security forces are
 			showing serious signs of weakness. Maybe we could exploit this."}
 
-/obj/item/weapon/paper/listneningpost/year2559/february
+/obj/item/weapon/paper/listeningpost/year2559/february
 	name = "\improper February 2559 Report"
 	info = {"Sounds like the World War 2 guy from Earth brought some unwanted friends along. Early
 			in the month, a battlecruiser showed up out of nowhere and started shooting up the station
@@ -110,7 +109,7 @@
 			the Soviets got a beef with these guys too. Sounds like they jacked one of the Soviet's ships.
 			Makes sense, because a battleship like that doesn't just appear out of nowhere."}
 
-/obj/item/weapon/paper/listneningpost/year2559/march
+/obj/item/weapon/paper/listeningpost/year2559/march
 	name = "\improper March 2559 Report"
 	info = {"Hard to believe it's already been a year. NT's private navy has been running exercises more
 			often than usual. They also replaced the Icarus with a new and more heavily armed cruiser called
@@ -121,7 +120,7 @@
 			say about Nanotrasen. The Truth will set us free. The truth about all the atrocities Nanotrasen
 			has done over the years."}
 
-/obj/item/weapon/paper/listneningpost/year2559/april
+/obj/item/weapon/paper/listeningpost/year2559/april
 	name = "\improper April 2559 Report"
 	info = {"We were approached today by a man calling himself the 'Werwolf', alleged to be part of that group
 			that attacked Nanotrasen in early February. We never understood his motives WHY he attacked them.
@@ -131,13 +130,13 @@
 			I think we're going to take the deal. When I get confirmation, I'll forward a line to Mike and Dave to
 			make the trade."}
 
-/obj/item/weapon/paper/listneningpost/year2559/may
+/obj/item/weapon/paper/listeningpost/year2559/may
 	name = "\improper May 2559 Report"
 	info = {"V.O.R.E. found something. An abandoned space station with a weapon called a mind flayer. There's also
 			rumor about some sort of a secret weapon NT was developing; a singularity bomb. Nothing of else of
 			real interest to report."}
 
-/obj/item/weapon/paper/listneningpost/year2559/june
+/obj/item/weapon/paper/listeningpost/year2559/june
 	name = "\improper June 2559 Report"
 	info = {"The WW2 guy is dead. Went out in a blaze of glory killing Space Axis. Mike and Dave are pissed.
 			They apparently broke protocol and went to help the V.O.R.E. crew in the attack, and they want to
@@ -146,7 +145,7 @@
 			NanoTrasen to deal with. Curiously, NanoTrasen refuses to officially support helping to remove this
 			threat. Possible collaberation?"}
 
-/obj/item/weapon/paper/listneningpost/year2559/july
+/obj/item/weapon/paper/listeningpost/year2559/july
 	name = "\improper July 2559 Report"
 	info = {"USDF ships have been spotted in the area. Admiral Glenn Pink is on board. This guy went MIA almost
 			ten years ago, and now he's back? Why? Apparently he's got some kind of connection with V.O.R.E.'s
@@ -154,7 +153,7 @@
 			plot. I don't know who this Admiral Pink is, but I guess Ace has at least a couple friends in high
 			places."}
 
-/obj/item/weapon/paper/listneningpost/year2559/august
+/obj/item/weapon/paper/listeningpost/year2559/august
 	name = "\improper August 2559 Report"
 	info = {"So, the reason Admiral Pink showed up in the last report was because these Space Axis hijacked
 			one of his vessels; the USDF Jormungandr or something. Well, the crazy bastards took it back.
@@ -166,27 +165,27 @@
 			arm was destroyed, and with it, all of his genetic information to get around his cloning disorder.
 			So he's finally out of our hair."}
 
-/obj/item/weapon/paper/listneningpost/year2559/september
+/obj/item/weapon/paper/listeningpost/year2559/september
 	name = "\improper September 2559 Report"
 	info = {"Of course it's not that simple. The nerd is back from the dead. Wonderful. I don't know how but
 			he's back, or they have a fake Kisuke Gema, or whatever bullshit. In other news, the station has
 			been slated for demolition. They're shipping a new Mark-3 Exodus-class station from Bay Shipyards
 			all the way from the NanoTrasen branch in Nyx. The demolition keeps getting delayed."}
 
-/obj/item/weapon/paper/listneningpost/year2559/october
+/obj/item/weapon/paper/listeningpost/year2559/october
 	name = "\improper October 2559 Report"
 	info = {"Station was demolished and operations were put on pause for a whole week. In other news, captain
 			Ace reportedly got a promotion to CentCom but something went wrong. The stronger loyalty implant
 			had a negative effect on him and almost killed him. He was quickly demoted back to Captain. This
 			could be useful information later. Recommend command investigate thoroughly."}
 
-/obj/item/weapon/paper/listneningpost/year2559/november
+/obj/item/weapon/paper/listeningpost/year2559/november
 	name = "\improper November 2559 Report"
 	info = {"A clown federation owned vessel called the Calypso was discovered in the Virgo system. It was a
 			ghost ship. Allegedly everyone on board perished due to a joke so funny that everyone laughed
 			themselves to madness, then death. NanoTrasen is trying to cover it up. No one knows why."}
 
-/obj/item/weapon/paper/listneningpost/year2559/december
+/obj/item/weapon/paper/listeningpost/year2559/december
 	name = "\improper December 2559 Report"
 	info = {"The V.O.R.E. discovered a new gateway location; a clown temple. We need to send someone to see
 			this. Reportedly it's full of tunnel clowns and these mutants called cluwnes. A clown researcher
@@ -199,25 +198,26 @@
 			and see if he wants a job. Ask our contacts on station. Surely one of them knows who's behind
 			the heist."}
 
-/obj/item/weapon/paper/listneningpost/year2560/january
+/obj/item/weapon/paper/listeningpost/year2560/january
 	name = "\improper January 2560 Report"
 	info = {"A group of Akula pirates tried to kidnap Kisuke Gema. They succeded, but their leader died of
 			his injuries soon after. The other pirates defected. I wonder why?"}
 
-/obj/item/weapon/paper/listneningpost/year2560/february
+/obj/item/weapon/paper/listeningpost/year2560/february
 	name = "\improper February 2560 Report"
 	info = {"There were a few incidents regarding a redspace anomaly in the chapel but the effects have long
 			since subsided. Nothing of major interest otherwise."}
 
-/obj/item/weapon/paper/listneningpost/year2560/march
+/obj/item/weapon/paper/listeningpost/year2560/march
 	name = "\improper March 2560 Report"
 	info = {"Very quiet month. Nothing of interest to report. Perhaps the calm before the storm?"}
 
-/obj/item/weapon/paper/listneningpost/year2560/april
+/obj/item/weapon/paper/listeningpost/year2560/april
 	name = "\improper April 2560 Report"
 	info = {"A loud, painfully high pitched SSTV signal came across global comms. It seems to be a distress signal
 			of some kind. To what, I have no idea. Efforts to trace the signal's origin have fallen inconclusive."}
 
+<<<<<<< HEAD
 /obj/item/weapon/paper/listneningpost/oddreport
 	name = "\improper Odd Report"
 	info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without
@@ -227,3 +227,28 @@
 	will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that
 	stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should
 	it ever rear it's ugly head again. -Donk Co. Operative #451"}
+||||||| parent of a56a61c33d... Merge pull request #10110 from Heroman3003/Listening-Post
+/obj/item/weapon/paper/listneningpost/oddreport
+	name = "\improper Odd Report"
+	info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without
+	results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic
+	solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent.
+	If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space
+	will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that
+	stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should
+	it ever rear it's ugly head again. -Donk Co. Operative #451"}
+=======
+/obj/item/weapon/paper/crumpled/listeningpost/fanfiction
+	name = "\improper Regarding Latest Report"
+	info = {"I swear to god, Dave, if you send us your stupid 'Futuristic version of VORE' fanfiction instead of actual
+			report again 'on accident' even one more time, I'm sending you there myself, and you know better than most
+			what they do there. Your writing is trash anyway, I bet even those freaks wouldn't like it."}
+
+/obj/item/weapon/paper/listeningpost/departure
+	name = "\improper Notice To All Facilities"
+	info = {"After recent developments and Nanotrasen deal, we're pulling back resources from the Virgo-Erigone system.
+			Any facility recieving this notice is to collect all valuable equipment and data, then fly to the closest general facility
+			for debrief and reassignment. And to those outdated trashy outposts specifically: all data must be digital. If it's not already,
+			make it so. Most importantly, remember: we're at a truce now. No shooting NT goons unless they start getting frisky with restricted areas.
+			And don't fucking forget to debrief Dave's listening post again."}
+>>>>>>> a56a61c33d... Merge pull request #10110 from Heroman3003/Listening-Post

maps/submaps/admin_use_vr/guttersite.dm

@@ -47,7 +47,6 @@
 	icon_state = "debrisexplored"
 	forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg')
 
-//TFF 26/12/19 - Sub-areas for the APCs.
 /area/tether_away/guttersite/engines
 	name = "Gutter - Gutter Engineering"
 

maps/tether/submaps/_tether_submaps.dm

@@ -293,14 +293,14 @@
 /datum/map_z_level/tether_lateload/gateway_destination
 	name = "Gateway Destination"
 	z = Z_LEVEL_GATEWAY
-
+/*			// Removed due to heavy merc presence
 #include "../../gateway_vr/snow_outpost.dm"
 /datum/map_template/tether_lateload/gateway/snow_outpost
 	name = "Snow Outpost"
 	desc = "Big snowy area with various outposts."
 	mappath = 'maps/gateway_vr/snow_outpost.dmm'
 	associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination
-
+*/
 #include "../../gateway_vr/zoo.dm"
 /datum/map_template/tether_lateload/gateway/zoo
 	name = "Zoo"

maps/tether/tether-07-station3.dmm

@@ -3380,11 +3380,14 @@
 /turf/simulated/floor/bluegrid,
 /area/ai)
 "afV" = (
-/obj/machinery/atmospherics/unary/engine{
-	dir = 1
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+	dir = 9
 	},
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
+/obj/machinery/atmospherics/pipe/simple/hidden{
+	dir = 6;
+	icon_state = "intact"
+	},
+/turf/simulated/wall/rshull,
 /area/shuttle/excursion/general)
 "afW" = (
 /obj/effect/floor_decal/borderfloorblack,
@@ -3468,20 +3471,23 @@
 /turf/simulated/open,
 /area/security/brig)
 "agc" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8;
-	icon_state = "propulsion_l"
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+	dir = 5;
+	icon_state = "intact-fuel"
 	},
-/turf/simulated/floor/tiled/asteroid_steel/airless,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/mining_outpost/shuttle)
+/obj/machinery/atmospherics/pipe/manifold/hidden{
+	dir = 4;
+	icon_state = "map"
+	},
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/general)
 "agd" = (
-/obj/structure/shuttle/engine/propulsion{
-	dir = 8
+/obj/machinery/atmospherics/unary/engine{
+	dir = 1
 	},
-/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/space,
 /turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/mining_outpost/shuttle)
+/area/shuttle/excursion/general)
 "age" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -3506,7 +3512,7 @@
 "agf" = (
 /obj/structure/shuttle/engine/propulsion{
 	dir = 8;
-	icon_state = "propulsion_r"
+	icon_state = "propulsion_l"
 	},
 /turf/simulated/floor/tiled/asteroid_steel/airless,
 /turf/simulated/shuttle/plating/airless/carry,
@@ -3514,6 +3520,21 @@
 "agg" = (
 /turf/simulated/floor/airless,
 /area/space)
+"agh" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8
+	},
+/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/mining_outpost/shuttle)
+"agi" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8;
+	icon_state = "propulsion_r"
+	},
+/turf/simulated/floor/tiled/asteroid_steel/airless,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/mining_outpost/shuttle)
 "agj" = (
 /obj/machinery/access_button{
 	command = "cycle_exterior";
@@ -21220,17 +21241,6 @@
 	},
 /turf/simulated/floor/tiled,
 /area/quartermaster/belterdock/refinery)
-"aXC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 5;
-	icon_state = "intact-fuel"
-	},
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 9;
-	icon_state = "intact"
-	},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
 "aXD" = (
 /obj/structure/bed/chair/shuttle{
 	dir = 8
@@ -21669,12 +21679,6 @@
 /obj/machinery/mineral/input,
 /turf/simulated/floor/plating,
 /area/quartermaster/belterdock/refinery)
-"aZD" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
-	dir = 9
-	},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
 "aZH" = (
 /obj/machinery/conveyor{
 	dir = 8;
@@ -22688,13 +22692,6 @@
 /obj/machinery/light,
 /turf/simulated/floor/tiled/monotile,
 /area/tether/exploration)
-"esH" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden{
-	dir = 1;
-	icon_state = "map"
-	},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
 "esK" = (
 /obj/machinery/door/firedoor/glass/hidden/steel{
 	dir = 1
@@ -22881,13 +22878,6 @@
 /obj/machinery/door/firedoor/glass/hidden/steel,
 /turf/simulated/floor/tiled,
 /area/hallway/station/upper)
-"fmc" = (
-/obj/machinery/atmospherics/pipe/simple/hidden{
-	dir = 6;
-	icon_state = "intact"
-	},
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion/general)
 "fox" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -36877,7 +36867,7 @@ aUJ
 aXb
 afT
 aez
-afV
+agd
 ams
 aXq
 abe
@@ -37019,7 +37009,7 @@ wRt
 eug
 afT
 aeG
-afV
+agd
 ams
 aXq
 abe
@@ -37160,8 +37150,8 @@ wOI
 afO
 wOI
 aiX
-aZD
-acK
+afV
+vJd
 ams
 aXq
 abe
@@ -37302,8 +37292,8 @@ hNx
 kTn
 ckU
 aiY
-fmc
-vJd
+xiw
+acK
 ams
 ghy
 abe
@@ -37870,8 +37860,8 @@ aXS
 rLd
 opv
 uVS
-esH
-vJd
+xiw
+acK
 ams
 eof
 abe
@@ -38012,8 +38002,8 @@ uGF
 wPw
 xvO
 aRv
-aXC
-acK
+agc
+vJd
 ams
 amq
 abe
@@ -38155,7 +38145,7 @@ ikk
 efQ
 wPF
 aeG
-afV
+agd
 ams
 aSx
 krj
@@ -38297,7 +38287,7 @@ iEV
 tEV
 xiw
 aeH
-afV
+agd
 ams
 eAm
 abe
@@ -40335,6 +40325,7 @@ avt
 adD
 aZS
 <<<<<<< HEAD
+<<<<<<< HEAD
 aes
 aet
 aet
@@ -40351,8 +40342,23 @@ agc
 agd
 agd
 agd
+||||||| parent of d800c77374... Merge pull request #10098 from Novacat/nova-ert
+agc
+agd
+agd
+agd
+=======
+>>>>>>> d800c77374... Merge pull request #10098 from Novacat/nova-ert
 agf
+<<<<<<< HEAD
 >>>>>>> 8844a0cb02... Merge pull request #10032 from Novacat/nova-ert
+||||||| parent of d800c77374... Merge pull request #10098 from Novacat/nova-ert
+=======
+agh
+agh
+agh
+agi
+>>>>>>> d800c77374... Merge pull request #10098 from Novacat/nova-ert
 baB
 adD
 avt

maps/tether/tether_areas.dm

@@ -250,7 +250,6 @@
 	name = "\improper Vacant Prep Area"
 /area/vacant/vacant_site/gateway/lower
 	name = "\improper Lower Vacant Prep Area"
-//TFF 5/4/20 - Mining Ops move	TODO Change all Vacant areas to construction_site per vermin event location announcement.
 /area/construction/vacant_mining_ops
 	name = "\improper Vacant Mining Operations"
 
@@ -267,7 +266,6 @@
 /area/tether/surfacebase/emergency_storage/atrium
 	name = "\improper Atrium Emergency Storage"
 
-//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed.
 // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions
 /area/tether/surfacebase/cargo
 	name = "Surface Cargo Foyer"
@@ -650,7 +648,6 @@
 	name = "Atmospherics Gas Storage"
 	icon_state = "atmos"
 
-//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
 /area/engineering/atmos_intake
 	name = "\improper Atmospherics Intake"
 	icon_state = "atmos"
@@ -776,7 +773,6 @@
 /area/rnd/robotics/resleeving
     name = "\improper Robotics Resleeving"
 
-//TFF 28/8/19 - cleanup of areas placement
 /area/rnd/research/testingrange
 	name = "\improper Weapons Testing Range"
 	icon_state = "firingrange"
@@ -787,7 +783,6 @@
 
 
 //Outpost areas
-//TFF 28/8/19 - cleanup of areas placement
 /area/rnd/outpost
 	name = "\improper Research Outpost Hallway"
 	icon_state = "research"
@@ -939,7 +934,6 @@
 	name = "Public Meeting Room"
 	icon_state = "blue"
 	sound_env = SMALL_SOFTFLOOR
-//TFF 28/8/19 - cleanup of areas placement
 /area/chapel/observation
 	name = "\improper Chapel Observation"
 	icon_state = "chapel"
@@ -979,6 +973,9 @@
 	icon_state = "recreation_area_restroom"
 	sound_env = SMALL_ENCLOSED
 
+/area/crew_quarters/sleep
+	limit_mob_size = FALSE
+
 /area/crew_quarters/sleep/maintDorm1
 	name = "\improper Construction Dorm 1"
 	icon_state = "Sleep"
@@ -1003,7 +1000,6 @@
 	flags = RAD_SHIELDED
 	soundproofed = TRUE
 
-//TFF 28/8/19 - cleanup of areas placement
 /area/crew_quarters/sleep/vistor_room_1
 	flags = RAD_SHIELDED | BLUE_SHIELDED
 	soundproofed = TRUE
@@ -1141,6 +1137,9 @@
 	flags = RAD_SHIELDED | BLUE_SHIELDED
 	soundproofed = TRUE
 
+/area/holodeck/holodorm
+	limit_mob_size = FALSE
+
 /area/holodeck/holodorm/source_basic
 	name = "\improper Holodeck Source"
 	flags = RAD_SHIELDED | BLUE_SHIELDED
@@ -1412,7 +1411,6 @@
 /area/shuttle/securiship/engines
 	name = "\improper Securiship Engines"
 
-//TFF 5/4/20 - Mining Ops move
 // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas
 /area/quartermaster/belterdock
 	name = "\improper Cargo Belter Access"
@@ -1463,7 +1461,6 @@ area/shuttle/mining_outpost/shuttle
 	name = "\improper Ninjacraft"
 	icon_state = "shuttle2"
 
-//TFF 28/8/19 - cleanup of areas placement
 /area/teleporter/departing
 	name = "\improper Long-Range Teleporter"
 	icon_state = "teleporter"
@@ -1537,6 +1534,7 @@ area/shuttle/mining_outpost/shuttle
 	requires_power = 0
 	flags = RAD_SHIELDED
 	icon_state = "red2"
+	limit_mob_size = FALSE
 
 /area/unknown/dorm1
 	name = "Unknown Dorm 1"

maps/tether/tether_defines.dm

@@ -143,7 +143,6 @@
 		/area/rnd/miscellaneous_lab
 		)
 
-//TFF 5/4/20 - Mining Ops move, airlock path change
 	unit_test_exempt_from_atmos = list(
 		/area/engineering/atmos_intake, // Outside,
 		/area/rnd/external, //  Outside,
@@ -165,7 +164,6 @@
 		)
 
 	lateload_single_pick = list(
-		list("Snow Outpost"),
 		list("Carp Farm"),
 		list("Snow Field"),
 		list("Listening Post")
@@ -191,7 +189,6 @@
 	belter_belt_z = 		list(Z_LEVEL_ROGUEMINE_1,
 						 		 Z_LEVEL_ROGUEMINE_2)
 
-//TFF 16/4/20 - mining outpost shuttle defines
 	mining_station_z =		list(Z_LEVEL_SPACE_HIGH)
 	mining_outpost_z =		list(Z_LEVEL_SURFACE_MINE)
 

maps/tether/tether_shuttle_defs.dm

@@ -212,7 +212,7 @@
 	..()
 
 //////////////////////////////////////////////////////////////
-//TFF 12/4/20 Surface Mining Outpost Shuttle
+// Surface Mining Outpost Shuttle
 
 /datum/shuttle/autodock/ferry/surface_mining_outpost
 	name = "Mining Outpost"

maps/tether/tether_shuttles.dm

@@ -32,7 +32,6 @@
 	shuttle_tag = "Trade"
 	req_one_access = list(access_trader)
 
-//TFF 12/4/20 - Add console for Mining Outpost Shuttle
 /obj/machinery/computer/shuttle_control/surface_mining_outpost
 	name = "surface mining outpost shuttle control console"
 	shuttle_tag = "Mining Outpost"

maps/tether_better/submaps/_tether_submaps.dm

@@ -267,14 +267,14 @@
 /datum/map_z_level/tether_lateload/gateway_destination
 	name = "Gateway Destination"
 	z = Z_LEVEL_GATEWAY
-
+/*		//Disabled because mercs
 #include "../../gateway_vr/snow_outpost.dm"
 /datum/map_template/tether_lateload/gateway/snow_outpost
 	name = "Snow Outpost"
 	desc = "Big snowy area with various outposts."
 	mappath = 'maps/gateway_vr/snow_outpost.dmm'
 	associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination
-
+*/		//Disabled because mercs
 #include "../../gateway_vr/zoo.dm"
 /datum/map_template/tether_lateload/gateway/zoo
 	name = "Zoo"

maps/tether_better/tether_areas.dm

@@ -250,7 +250,6 @@
 	name = "\improper Vacant Prep Area"
 /area/vacant/vacant_site/gateway/lower
 	name = "\improper Lower Vacant Prep Area"
-//TFF 5/4/20 - Mining Ops move	TODO Change all Vacant areas to construction_site per vermin event location announcement.
 /area/construction/vacant_mining_ops
 	name = "\improper Vacant Mining Operations"
 
@@ -267,7 +266,6 @@
 /area/tether/surfacebase/emergency_storage/atrium
 	name = "\improper Atrium Emergency Storage"
 
-//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed.
 // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions
 /area/tether/surfacebase/cargo
 	name = "Surface Cargo Foyer"
@@ -650,7 +648,6 @@
 	name = "Atmospherics Gas Storage"
 	icon_state = "atmos"
 
-//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos.
 /area/engineering/atmos_intake
 	name = "\improper Atmospherics Intake"
 	icon_state = "atmos"
@@ -776,7 +773,6 @@
 /area/rnd/robotics/resleeving
     name = "\improper Robotics Resleeving"
 
-//TFF 28/8/19 - cleanup of areas placement
 /area/rnd/research/testingrange
 	name = "\improper Weapons Testing Range"
 	icon_state = "firingrange"
@@ -787,7 +783,6 @@
 
 
 //Outpost areas
-//TFF 28/8/19 - cleanup of areas placement
 /area/rnd/outpost
 	name = "\improper Research Outpost Hallway"
 	icon_state = "research"
@@ -939,7 +934,6 @@
 	name = "Public Meeting Room"
 	icon_state = "blue"
 	sound_env = SMALL_SOFTFLOOR
-//TFF 28/8/19 - cleanup of areas placement
 /area/chapel/observation
 	name = "\improper Chapel Observation"
 	icon_state = "chapel"
@@ -1003,7 +997,6 @@
 	flags = RAD_SHIELDED
 	soundproofed = TRUE
 
-//TFF 28/8/19 - cleanup of areas placement
 /area/crew_quarters/sleep/vistor_room_1
 	flags = RAD_SHIELDED | BLUE_SHIELDED
 	soundproofed = TRUE
@@ -1412,7 +1405,6 @@
 /area/shuttle/securiship/engines
 	name = "\improper Securiship Engines"
 
-//TFF 5/4/20 - Mining Ops move
 // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas
 /area/quartermaster/belterdock
 	name = "\improper Cargo Belter Access"
@@ -1460,7 +1452,6 @@ area/shuttle/mining_outpost/shuttle
 	name = "\improper Ninjacraft"
 	icon_state = "shuttle2"
 
-//TFF 28/8/19 - cleanup of areas placement
 /area/teleporter/departing
 	name = "\improper Long-Range Teleporter"
 	icon_state = "teleporter"

maps/tether_better/tether_defines.dm

@@ -138,7 +138,6 @@
 		/area/rnd/miscellaneous_lab
 		)
 
-//TFF 5/4/20 - Mining Ops move, airlock path change
 	unit_test_exempt_from_atmos = list(
 		/area/engineering/atmos_intake, // Outside,
 		/area/rnd/external, //  Outside,
@@ -160,7 +159,6 @@
 		)
 
 	lateload_single_pick = list(
-		list("Snow Outpost"),
 		list("Carp Farm"),
 		list("Snow Field"),
 		list("Listening Post")
@@ -186,7 +184,6 @@
 	belter_belt_z = 		list(Z_LEVEL_ROGUEMINE_1,
 						 		 Z_LEVEL_ROGUEMINE_2)
 
-//TFF 16/4/20 - mining outpost shuttle defines
 	mining_station_z =		list(Z_LEVEL_SPACE_HIGH)
 	mining_outpost_z =		list(Z_LEVEL_SURFACE_MINE)
 

maps/tether_better/tether_shuttle_defs.dm

@@ -212,7 +212,7 @@
 	..()
 
 //////////////////////////////////////////////////////////////
-//TFF 12/4/20 Surface Mining Outpost Shuttle
+// Surface Mining Outpost Shuttle
 
 /datum/shuttle/autodock/ferry/surface_mining_outpost
 	name = "Mining Outpost"

maps/tether_better/tether_shuttles.dm

@@ -32,7 +32,6 @@
 	shuttle_tag = "Trade"
 	req_one_access = list(access_trader)
 
-//TFF 12/4/20 - Add console for Mining Outpost Shuttle
 /obj/machinery/computer/shuttle_control/surface_mining_outpost
 	name = "surface mining outpost shuttle control console"
 	shuttle_tag = "Mining Outpost"

maps/~map_system/maps.dm

@@ -68,7 +68,7 @@ var/list/all_maps = list()
 	var/ai_shell_restricted = FALSE			//VOREStation Addition - are there z-levels restricted?
 	var/ai_shell_allowed_levels = list()	//VOREStation Addition - which z-levels ARE we allowed to visit?
 
-	//VOREStation Addition Start - belter stuff	TFF 16/4/20 - Mining Outpost Shuttle
+	//VOREStation Addition Start
 	var/list/belter_docked_z = list()
 	var/list/belter_transit_z = list()
 	var/list/belter_belt_z = list()

vorestation.dme

@@ -1790,6 +1790,7 @@
 #include "code\modules\admin\verbs\pray.dm"
 #include "code\modules\admin\verbs\randomverbs.dm"
 #include "code\modules\admin\verbs\randomverbs_vr.dm"
+#include "code\modules\admin\verbs\resize.dm"
 #include "code\modules\admin\verbs\smite.dm"
 #include "code\modules\admin\verbs\smite_vr.dm"
 #include "code\modules\admin\verbs\striketeam.dm"