From 629e5081a8c420fee87cc51e9e7032d9646c6b65 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 20 Dec 2016 18:59:00 -0600 Subject: [PATCH 1/4] Allows people to be transferred. You can be ejected out of the new belly, but can't be ejected from the default one. --- code/citadel/vore/eating/belly_vr.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/citadel/vore/eating/belly_vr.dm b/code/citadel/vore/eating/belly_vr.dm index 6bd9f9db40..e2581fd298 100644 --- a/code/citadel/vore/eating/belly_vr.dm +++ b/code/citadel/vore/eating/belly_vr.dm @@ -104,7 +104,8 @@ // Release all contents of this belly into the owning mob's location. // If that location is another mob, contents are transferred into whichever of its bellies the owning mob is in. // Returns the number of mobs so released. -/datum/belly/proc/release_all_contents() +/datum/belly/proc/release_all_contents(mob/owner) + check_belly(owner) for (var/atom/movable/M in internal_contents) M.forceMove(owner.loc) // Move the belly contents into the same location as belly's owner. internal_contents -= M // Remove from the belly contents @@ -142,7 +143,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) From 2ee7144cb1bf91fa66ecf41f22cdf3a1db0eb39d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 20 Dec 2016 20:43:19 -0600 Subject: [PATCH 2/4] fixes players being deleted outright. still issues with ejecting, though. --- code/citadel/vore/eating/belly_vr.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/citadel/vore/eating/belly_vr.dm b/code/citadel/vore/eating/belly_vr.dm index e2581fd298..4756710541 100644 --- a/code/citadel/vore/eating/belly_vr.dm +++ b/code/citadel/vore/eating/belly_vr.dm @@ -104,8 +104,7 @@ // Release all contents of this belly into the owning mob's location. // If that location is another mob, contents are transferred into whichever of its bellies the owning mob is in. // Returns the number of mobs so released. -/datum/belly/proc/release_all_contents(mob/owner) - check_belly(owner) +/datum/belly/proc/release_all_contents() for (var/atom/movable/M in internal_contents) M.forceMove(owner.loc) // Move the belly contents into the same location as belly's owner. internal_contents -= M // Remove from the belly contents From 87ab6fd8125c969c74ac854d19a23aa89552a157 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 21 Dec 2016 18:28:01 -0600 Subject: [PATCH 3/4] Disabled slimecoons (wasn't supposed to be in to begin with). Removes the tongue modifier for lizards. (no more hissssss) --- code/modules/mob/living/carbon/human/species_types.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 0b35a1d691..e5340e98bc 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/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")*/ From 4b368f48585ec90b36d79213c04adc37f37eb077 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 21 Dec 2016 18:30:03 -0600 Subject: [PATCH 4/4] changelog --- html/changelogs/Jay-PR-1.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/Jay-PR-1.yml diff --git a/html/changelogs/Jay-PR-1.yml b/html/changelogs/Jay-PR-1.yml new file mode 100644 index 0000000000..86543fcfdf --- /dev/null +++ b/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."