Merge branch 'master' into updates_the_nbt

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm

code/modules/background/defines.dm

@@ -55,6 +55,8 @@
 #define RELIGION_PILOTDREAM "Pilot Dream"
 
 #define RELIGION_ETERNAL "The Eternal"
+#define RELIGION_KSSHR "Ksshr"
+#define RELIGION_SHRKH "Shrkh"
 
 //accent defines
 

code/modules/background/religion/diona.dm

@@ -8,3 +8,26 @@
   eventually going supernova and expelling matter or essence across the cosmos."
   book_name = "book of the eternal"
   book_sprite = "eternal"
+  
+/datum/religion/ksshr
+  name = RELIGION_KSSHR
+  description = "The Ksshr, also known as the Enlightened, is a religious sect on Xrim known for their complete rejection of The First Consciousness, instead of being an agnostic \
+  sect that centers around working together to create a better future, as well as the advancement of technology and understanding how the universe works. The Ksshr faith is the \
+  primary religion of Xrim, with most of its inhabitants considering themselves a part of the religion. The Jargon Federation does encourage practicing the faith amongst the \
+  population so long as they continue to reject The First Consciousness, as well as stay away from the teachings of the Shrkh."
+  book_name = "ksshr codex"
+  book_sprite = "holybook"
+  
+/datum/religion/shrkh
+  name = RELIGION_SHRKH
+  description = "The Shrkh, or 'Scorned' as they call themselves, continue to follow the age-old tradition of worshipping Glorsh-Omega. They believe that Glorsh-Omega planted them \
+  on the planet intentionally, granting them a blissful haven via the use of technology. Once the prominent and only religion on the planet, Shrkh-ism was quickly displaced when \
+  Skrell explorers crashlanded and their memories, thoughts, emotions, everything was consumed, and doubt was first seeded in the minds of all Dionae on Xrim. The premise \
+  behind the religion itself is simple; revere, help sustain and maintain synthetic life. As synthetic life brought dionae into this haven, so too shall it be preserved. In the \
+  minds of the Shrkh worshippers, the Skrell that brought Ksshr to the planet were misguided. To the Shrkh, the genophage was something that never happened, a myth made up by \
+  the Federation to indoctrinate its population into its anti-synthetic and authoritarian beliefs. \
+  \
+  Note that due to their beliefs, those that are openly members of the faith are barred from command, machinist, and chaplain positions. They are also completely barred from \
+  working for Zeng-Hu due to the megacorporations ties with the Federation."
+  book_name = "shrkh codex"
+  book_sprite = "holybook"

code/modules/background/space_sectors/space_sector.dm

@@ -2,7 +2,7 @@
 	var/name
 	var/description
 	var/list/possible_erts = list()
-	var/list/possible_exoplanets = list()
+	var/list/possible_exoplanets = list(/obj/effect/overmap/visitable/sector/exoplanet/snow, /obj/effect/overmap/visitable/sector/exoplanet/desert)
 	var/list/cargo_price_coef = list("nt" = 1, "hpi" = 1, "zhu" = 1, "een" = 1, "get" = 1, "arz" = 1, "blm" = 1,
 								"iac" = 1, "zsc" = 1, "vfc" = 1, "bis" = 1, "xmg" = 1, "npi" = 1) //how much the space sector afffects how expensive is ordering from that cargo supplier