Merge pull request #98 from LetterJay/master

No more not exisiting

code/citadel/vore/eating/belly_vr.dm

@@ -142,7 +142,7 @@
 //		prey.buckled.unbuckle_mob()
 
 // Super super messy. prey.forceMove.owner doesn't work if there's no prey.
-	prey.loc = owner
+	prey.loc = user
 	internal_contents |= prey
 
 	if(inside_flavor)

code/modules/mob/living/carbon/human/species_types.dm

@@ -57,7 +57,7 @@
 	roundstart = 1
 	specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR)
 	mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings")
-	mutant_organs = list(/obj/item/organ/tongue/lizard)
+	//mutant_organs = list(/obj/item/organ/tongue/lizard) (No more hissing)
 	default_features = list("mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0", "tail" = "Smooth", "snout" = "Round", "horns" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None")
 	attack_verb = "slash"
 	attack_sound = 'sound/weapons/slash.ogg'
@@ -1203,6 +1203,7 @@ datum/species/canid
 ///////////////////
 
 //ChronoFlux: Slimecoon
+/*
 /datum/species/jelly/slime/slimecoon
 	name = "Slime Raccoon"
 	id = "slimecoon"
@@ -1211,4 +1212,4 @@ datum/species/canid
 	whitelist = list("chronoflux")
 	blacklisted = 1
 	mutant_bodyparts = list("slimecoontail", "slimecoonears", "slimecoonsnout")
-	default_features = list("slimecoontail" = "Slimecoon Tail", "slimecoonears" = "Slimecoon Ears", "slimecoonsnout" = "Slimecoon Snout")
+	default_features = list("slimecoontail" = "Slimecoon Tail", "slimecoonears" = "Slimecoon Ears", "slimecoonsnout" = "Slimecoon Snout")*/

html/changelogs/Jay-PR-1.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
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: "Jay"
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "Removed lizard tongue modifier for now; no more hissing."
+  - rscdel: "Disabled slimecoons. Wasn't supposed to be in yet right now anyway."