Merge pull request #3 from VOREStation/master

Update to upstream

code/_helpers/global_lists_vr.dm

@@ -491,7 +491,8 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
 		if(!instance.name)
 			continue //A prototype or something
 		var/category = instance.category
-		traits_costs[path] = category
+		var/cost = instance.cost
+		traits_costs[path] = cost
 		all_traits[path] = instance
 		switch(category)
 			if(-INFINITY to -0.1)

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/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/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/species/station/traits_vr/positive.dm

@@ -13,13 +13,13 @@
 /datum/trait/positive/hardy
 	name = "Hardy"
 	desc = "Allows you to carry heavy equipment with less slowdown."
-	cost = 2
+	cost = 1
 	var_changes = list("item_slowdown_mod" = 0.5)
 
 /datum/trait/positive/hardy_plus
 	name = "Major Hardy"
 	desc = "Allows you to carry heavy equipment with almost no slowdown."
-	cost = 3
+	cost = 2
 	var_changes = list("item_slowdown_mod" = 0.25)
 
 /datum/trait/positive/endurance_high

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/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm

@@ -1450,7 +1450,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

config/alienwhitelist.txt

@@ -31,6 +31,7 @@ idcaboutaname - Protean
 inuzari - Diona
 jademanique - Black-Eyed Shadekin
 jademanique - Xenochimera
+joltze - Black-Eyed Shadekin
 khanivore - Protean
 killjaden - Protean
 ktccd - Diona

html/changelogs/Cerebulon - machinesounds.yml

@@ -0,0 +1,4 @@
+author: Cerebulon
+delete-after: True
+changes: 
+  - soundadd: "Added button sounds to various machines."

html/changelogs/KasparoVy - PR - 7760.yml

@@ -0,0 +1,13 @@
+author: KasparoVy
+delete-after: True
+changes: 
+  - imageadd: Adds orange Teshari goggles, selectable in the loadout.
+  - imageadd: Adds blindfold & new white (recolorable) blindfold to loadout.
+  - imageadd: Adds species-fitted Teshari ring sprites.
+  - imageadd: Adds species-fitted Teshari hudpatches & white blindfold.
+  - imageadd: Adds full selection of Teshari belted cloaks.
+  - imageadd: Adds full selection of non-job Teshari hooded cloaks. 
+  - rscadd: Adds a bunch of Teshari worksuits (sprites already existed).
+  - imageadd: Adds some species-fitted Teshari jacket accessories (tan, charcoal, navy, burgundy, checkered).
+  - tweak: Updates all Teshari undercoats and cloaks with new sprites from downstreams.
+  - bugfix: Fixes Teshari captain glove sprites.

html/changelogs/Mechoid - Encumbrance.yml

@@ -0,0 +1,4 @@
+author: Mechoid
+delete-after: True
+changes: 
+  - rscadd: "Added system for exosuit over-encumbrance. Combat mechs and Ripleys have higher than default."

html/changelogs/Meghan Rossi - atmosanalyzer.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Fixed some objects giving duplicate results when an analyzer was used on them"

html/changelogs/Meghan Rossi - borosilicate shard fix.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Fixed borosilicate glass not producing shards in most situations."

html/changelogs/Meghan Rossi - fix infinite ratburgers.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Cooking a mouse into a mouseburger now uses up the mouse."

html/changelogs/Meghan Rossi - fix omni filters.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Fixed omni filters reacting incorrectly to configuration changes that swap ports."

html/changelogs/Meghan Rossi - isolator fix.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Blood from artifacts will no longer break the pathogenic isolator."

html/changelogs/Meghan Rossi - poiareas.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Fixed some mountain POIs sometimes overlapping in odd ways"

html/changelogs/Meghan Rossi - stripping.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - tweak: "If you try to put someone in one of their own slots using the stripping menu, now you will instead try to strip that slot."

html/changelogs/Meghan Rossi - tesla dissipation.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - tweak: "The tesla energy ball will now eventually disappear if not kept charged with the particle accelerator"

html/changelogs/Meghan Rossi - the_teslagen.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - rscadd: "The Tesla Generator is now available from cargo. Coils and grounding rods for it may be printed on the protolathe and autolathe, respectively."

html/changelogs/Meghan Rossi - triglyceride taste.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "Fat (triglyceride) now tastes greasy instead of bitter."

html/changelogs/Meghan Rossi - wall machine layering.yml

@@ -0,0 +1,4 @@
+author: Meghan-Rossi
+delete-after: True
+changes: 
+  - bugfix: "If you place wall-mounted machines such as status displays on a window, they will no longer be hidden underneath the window."

html/changelogs/Poojawa - Sunesoundsntoggles.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Poojawa
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - soundadd: "Added my fancy vore sounds."
+  - rscadd: "Porting of a few QoL Citadel changes to vore menu related to sounds."

html/changelogs/Poojawa - devourfeedprefs.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Poojawa
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Applies Feeding and Devourable prefs."
+  - bugfix: "Made VoreUI toggles a lot more clear of what mode they're in."

html/changelogs/Runa Dacino - Exosuit gripper tweak.yml

@@ -0,0 +1,5 @@
+author: RunaDacino
+delete-after: True
+changes: 
+  - rscadd: "Enabled research borgs equipped with 'exosuit gripper' to be able to replace internal exosuit parts like actuators, to upgrade or to repair"
+

html/changelogs/SubberTheFabulous-PR-7642.yml

@@ -0,0 +1,4 @@
+author: Subber
+delete-after: True
+changes: 
+  - rscadd: "Added two new antag augments to traitor uplink: armblade and handblade."

html/changelogs/Woodrat - Vote.yml

@@ -0,0 +1,4 @@
+author: Woodrat
+delete-after: True
+changes: 
+  - tweak: "Changes vote notification sound to that of World Server in order to help people realize there is a vote occurring."

html/changelogs/atermonera_stairsv2.yml

@@ -0,0 +1,8 @@
+author: Atermonera
+delete-after: True
+changes: 
+  - tweak: "Stairs have been completely reworked, and now consist of multi-tile constructs built from lower, middle, and upper stair pieces, and an openspace in the floor."
+  - rscadd: "To go up and down stairs, simply step upon the lower/upper stair pieces, and you'll be moved automatically if the stairs are in working condition. Any grabbed or dragged items will be brought with you."
+  - rscadd: "If the lower stair piece is missing (or even if it's not), but the middle and upper sections are present, you can climb up the middle section by click-dragging from your character to the middle stair."
+  - rscadd: "If you step onto the open space, you will fall down the stairs. Teshari players, consider yourselves warned."
+  - rscadd: "Stairs remain unconstructable in-round (Doing so would also require a way to make openspaces), but there are spawners rooted on the middle stair (as with old stairs) that will create a completed stair and can be spawned in by admins/mappers."

html/changelogs/mechoid - RoboticsRigs.yml

@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Mechoid
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Move Rig modules to more granular files"
+  - rscadd: "Add RIG components to robotics mechfab, plus incredibly basic belt-voidsuit RIG."
+  - rscadd: "Add Graphite, made by compressing coal, presently only used heavily in RIG components."

html/changelogs/mechoid - butchery.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Mechoid
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Animals can be butchered for organs and hide. Requires scraping (sharp), washing (water or washing machine), and then drying (bonfire or drying rack)."
+  - rscadd: "Organs can be butchered for meat, named \"[organ] meat\". Heart meat, liver meat, etc. Brains from player mobs cannot be butchered."

html/changelogs/mechoid - exoexpansion.yml

@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Mechoid
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Hardpoint Actuator equipment for Exosuits, allowing them (And most effectively, Ripleys) to swap components on the fly, after a short delay."
+  - rscadd: "Exo Inflatables Deployer, allowing exosuits to pick up and deploy inflatables."
+  - rscadd: "Exo screwdriver, wirecutters, and welding laser, to help round-out the tool-based equipment types."
+  - rscadd: "Fire modifiers based on stacks added, to be used by the damage system tweaked above."
+  - tweak: "Incendiary exo weapons tweaked to conform with fire change."
+  - tweak: "Ignition effects from weapons changed from the old fire-system to the modifier fire system."
+  - bugfix: "Shocker now retaliates properly against melee."

html/changelogs/mechoid - hydroupkeep.yml

@@ -0,0 +1,6 @@
+author: Mechoid
+delete-after: True
+changes: 
+  - rscadd: "Adds Wurmwoad, a suspiciously worm-like plant that produces pods of spice."
+  - rscadd: "Adds Wurmwoad to the service borg synthesizer."
+  - bugfix: "Service borgs can work with kitchenware again."

html/changelogs/neerti-hacking_QoL.yml

@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Neerti
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "The 'cut' and 'pulse' buttons in the hacking interface now check all available hands for tools, instead of only the active hand."
+  - tweak: "The textual indicators at the bottom of the hacking window will now go bold when they change, until the next window refresh."
+  - tweak: "Hacking an Autolathe no longer requires you to hack it using the Autolathe's main window, but instead opens the hacking window like everything else."

html/changelogs/schnayy - cooking adjustments.yml

@@ -0,0 +1,10 @@
+author: schnayy
+
+delete-after: True
+
+changes: 
+  - rscadd: "Adds the reagent yeast. It can be found in the kitchen vendor and in cargo kitchen supply crates."
+  - tweak: "Bread now calls for 5 units yeast instead of an egg, and baguettes and croissants call for 5 units yeast in addition to former ingredients."
+  - rscadd: "Corn oil added to the Dinnerware vendor and the Booze-o-Mat."
+  - imageadd: "Sprites for peanut butter, mayo, and yeast condiments."
+  - bugfix: "Boiled slime core now links to the proper sprite."

html/changelogs/woodrat - WR_shutters.yml

@@ -0,0 +1,37 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Woodrat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added new shutters ported from World."
+  - tweak: "Replaced lightswitch, request console, newscaster sprite with one from Virgo."

html/changelogs/woodrat - idtweaks.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: Woodrat
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Minor adjustment of ID icons."

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 Nazis. 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 Nazis 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,31 +198,35 @@
 			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."}
 
-/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."}

maps/tether/submaps/_tether_submaps.dm

@@ -267,14 +267,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_defines.dm

@@ -164,7 +164,6 @@
 		)
 
 	lateload_single_pick = list(
-		list("Snow Outpost"),
 		list("Carp Farm"),
 		list("Snow Field"),
 		list("Listening Post")

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_defines.dm

@@ -159,7 +159,6 @@
 		)
 
 	lateload_single_pick = list(
-		list("Snow Outpost"),
 		list("Carp Farm"),
 		list("Snow Field"),
 		list("Listening Post")