Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again

# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme

code/modules/organs/robolimbs.dm

@@ -21,7 +21,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	scroll=ipc_scroll;\
 	console=ipc_console;\
 	glider=ipc_gol_glider;\
-	rainbow=ipc_rainbow"
+	rainnbow=ipc_rainbow;\
+	smiley=ipc_smiley;\
+	database=ipc_database"
 
 /proc/populate_robolimb_list()
 	basic_robolimb = new()
@@ -80,6 +82,35 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 	parts = list(BP_HEAD)
 	monitor_styles = standard_monitor_styles
 
+/datum/robolimb/grayson
+	company = "Grayson"
+	desc = "This limb has a sturdy and heavy build to it."
+	icon = 'icons/mob/human_races/cyberlimbs/grayson/grayson_main.dmi'
+	unavailable_to_build = 1
+	monitor_styles = "blank=grayson_off;\
+		green=grayson_green;\
+		rgb=grayson_rgb"
+
+/datum/robolimb/grayson_alt1
+	company = "Grayson - Reinforced"
+	desc = "This limb has a sturdy and heavy build to it."
+	icon = 'icons/mob/human_races/cyberlimbs/grayson/grayson_alt1.dmi'
+	unavailable_to_build = 1
+	parts = list(BP_HEAD)
+	monitor_styles = "blank=grayson_alt_off;\
+		green=grayson_alt_green;\
+		scroll=grayson_alt_scroll;\
+		rgb=grayson_alt_rgb;\
+		rainbow=grayson_alt_rainbow"
+
+/datum/robolimb/grayson_monitor
+	company = "Grayson Monitor"
+	desc = "This limb has a sturdy and heavy build to it, and uses plastics in the place of glass for the monitor."
+	icon = 'icons/mob/human_races/cyberlimbs/grayson/grayson_monitor.dmi'
+	unavailable_to_build = 1
+	parts = list(BP_HEAD)
+	monitor_styles = standard_monitor_styles
+
 /datum/robolimb/hephaestus
 	company = "Hephaestus"
 	desc = "This limb has a militaristic black and green casing with gold stripes."
@@ -201,6 +232,9 @@ var/const/standard_monitor_styles = "blank=ipc_blank;\
 /obj/item/weapon/disk/limb/bishop
 	company = "Bishop"
 
+/obj/item/weapon/disk/limb/grayson
+	company = "Grayson"
+
 /obj/item/weapon/disk/limb/hephaestus
 	company = "Hephaestus"
 

code/modules/organs/subtypes/xenos.dm

@@ -0,0 +1,51 @@
+//XENOMORPH ORGANS
+/obj/item/organ/internal/xenos
+	name = "xeno organ"
+	icon = 'icons/effects/blood.dmi'
+	desc = "It smells like an accident in a chemical factory."
+
+/obj/item/organ/internal/xenos/eggsac
+	name = "egg sac"
+	parent_organ = BP_GROIN
+	icon_state = "xgibmid1"
+	organ_tag = O_EGG
+
+/obj/item/organ/internal/xenos/plasmavessel
+	name = "plasma vessel"
+	parent_organ = BP_TORSO
+	icon_state = "xgibdown1"
+	organ_tag = O_PLASMA
+	var/stored_plasma = 0
+	var/max_plasma = 500
+
+/obj/item/organ/internal/xenos/plasmavessel/queen
+	name = "bloated plasma vessel"
+	stored_plasma = 200
+	max_plasma = 500
+
+/obj/item/organ/internal/xenos/plasmavessel/sentinel
+	stored_plasma = 100
+	max_plasma = 250
+
+/obj/item/organ/internal/xenos/plasmavessel/hunter
+	name = "tiny plasma vessel"
+	stored_plasma = 100
+	max_plasma = 150
+
+/obj/item/organ/internal/xenos/acidgland
+	name = "acid gland"
+	parent_organ = BP_HEAD
+	icon_state = "xgibtorso"
+	organ_tag = O_ACID
+
+/obj/item/organ/internal/xenos/hivenode
+	name = "hive node"
+	parent_organ = BP_TORSO
+	icon_state = "xgibmid2"
+	organ_tag = O_HIVE
+
+/obj/item/organ/internal/xenos/resinspinner
+	name = "resin spinner"
+	parent_organ = BP_HEAD
+	icon_state = "xgibmid2"
+	organ_tag = O_RESIN