Merge pull request #5653 from Woodratt/10102018_xenomove

Xenoflora and Xenobio House Move

html/changelogs/Woodrat - XenoMove.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: "Xenoflora and Xenobio Addition to station, first deck."
+  - bugfix: "Minor bugfixes including mislabeled lockers in robotics and floor decals."

maps/southern_cross/southern_cross_areas.dm

@@ -898,6 +898,14 @@
 	name = "\improper Research - Toxins Launch Room"
 	icon_state = "toxtest"
 
+/area/rnd/research/firstdeck/hallway
+	name = "\improper Research - First Deck Hallway"
+	icon_state = "research"
+
+/area/rnd/xenobiology/xenoflora_isolation
+	name = "\improper Xenoflora Isolation"
+	icon_state = "xeno_f_store"
+
 /area/quartermaster/lockerroom
 	name = "\improper Cargo Locker Room"
 	icon_state = "quart"