From c53fabaf5ed5d23c0ea8cefc3d6e7b459604e133 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 15 Aug 2016 00:05:24 -0500 Subject: [PATCH 1/2] fixes taurs re-enables taurs --- code/modules/client/preferences.dm | 10 +++++----- code/modules/mob/living/carbon/human/species.dm | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a3ead25b11..efb889559a 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -212,7 +212,7 @@ var/list/preferences_datums = list() if(config.mutant_races) dat += "Species:
[pref_species.id]
" dat += "Human Tail:[mutant_tail]
" - dat += "Taur (Disabled):[be_taur ? "Yes" : "No"]" + dat += "Taur:[be_taur ? "Yes" : "No"]" if(!kpcode_cantaur(pref_species.id)) dat += " (not available for [pref_species.id])" dat += "
" @@ -1021,8 +1021,8 @@ var/list/preferences_datums = list() VP.target=src VP.ShowChoices(user) - //if("be_taur") - // be_taur = !be_taur + if("be_taur") + be_taur = !be_taur /* if("tail_lizard") @@ -1286,8 +1286,8 @@ var/list/preferences_datums = list() /*(if(mutant_wing != "none" && config.mutant_races) character.dna.mutantwing = mutant_wing character.dna.wingcolor=wingcolor*/ - //if(be_taur) - // character.dna.taur=1 + if(be_taur) + character.dna.taur=1 //character.dna.special_color = special_color character.dna.cock=p_cock character.dna.vagina=p_vagina diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index fe77e2b697..508c11a08f 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -333,6 +333,9 @@ taur_state+="_f" standing += generate_colour_icon('icons/mob/special/taur.dmi',"[taur_state]",H.dna.special_color,offset_x=-16,add_layer=-BODY_LAYER) + if(standing.len) + H.overlays_standing[BODY_LAYER] = standing + H.apply_overlay(BODY_LAYER) From 0dea335be029d97a610747e4a28060ba29b3e1b2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 15 Aug 2016 00:08:12 -0500 Subject: [PATCH 2/2] 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..94b3112e61 --- /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: + - bugfix: Fixes taur sprites + - tweak: Re-enables taurs