Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into DarkTheme

code/modules/vore/appearance/sprite_accessories_taur_vr.dm

@@ -331,7 +331,12 @@
 	name = "Feline dual-color (Taur)"
 	icon_state = "feline_s"
 	extra_overlay = "feline_markings"
-
+	
+/datum/sprite_accessory/tail/taur/feline/feline_spots
+	name = "Feline spots (Taur)"
+	icon_state = "feline_s"
+	extra_overlay = "feline_spots"
+	
 /datum/sprite_accessory/tail/taur/feline/synthfeline
 	name = "SynthFeline dual-color (Taur)"
 	icon_state = "synthfeline_s"

code/modules/vore/appearance/sprite_accessories_vr.dm

@@ -502,6 +502,13 @@
 	desc = ""
 	icon_state = "moth_full"
 
+/datum/sprite_accessory/wing/moth_full_colorable
+	name = "moth antenna and wings (colorable)"
+	desc = ""
+	icon_state = "moth_full_colorable"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
 /datum/sprite_accessory/wing/kerena
 	name = "wingwolf wings (Kerena)"
 	desc = ""

code/modules/vore/eating/living_vr.dm

@@ -355,7 +355,7 @@
 		var/obj/effect/overlay/aiholo/holo = loc
 		holo.drop_prey() //Easiest way
 		log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(holo.master)] (AI HOLO) ([holo ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[holo.x];Y=[holo.y];Z=[holo.z]'>JMP</a>" : "null"])")
-	
+
 	//Don't appear to be in a vore situation
 	else
 		to_chat(src,"<span class='alert'>You aren't inside anyone, though, is the thing.</span>")
@@ -455,11 +455,11 @@
 	var/datum/gas_mixture/belly_air/air = new(1000)
 	return air
 
-// This is about 0.896m^3 of atmosphere
+// This is about 0.896m^3 of atmosphere / Erik's Edit. Volume and moles changed to match station atmosphere, Synth Tesh no longer overheat in bellies!
 /datum/gas_mixture/belly_air
-    volume = 1000
+    volume = 2500
     temperature = 293.150
-    total_moles = 40
+    total_moles = 104
 
 /datum/gas_mixture/belly_air/New()
     . = ..()

code/modules/vore/fluffstuff/custom_guns_vr.dm

@@ -157,6 +157,14 @@
 	else
 		..()
 
+//Tomtyph : Sarika
+/obj/item/weapon/gun/projectile/revolver/mateba/fluff/tasald_corlethian/tomtyph
+	name =  "\improper \"Black Iron\" revolver"
+	desc =	"A single-action .357 revolver with a wooden grip and black iron receiver. A faded name is etched onto the handle. All you can make out is a single T. "
+	icon_state = "black_iron"
+	item_state = "revolver"
+	fire_sound = 'sound/weapons/pistol.ogg'
+
 // wankersonofjerkin : Glenn Pink
 /obj/item/weapon/gun/projectile/revolver/fluff/admiral_pink_revolver
 	name = "Admiral Pink's 'Devilgun'"