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) diff --git a/html/changelog.html b/html/changelog.html index 02e579797f..36171d21ce 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,13 @@ -->
+

15 August 2016

+

Jay updated:

+ +

02 July 2016

Joan updated:

- -

13 June 2016

-

Joan updated:

- -

Lati updated:

- -

Xhuis updated:

- - -

12 June 2016

-

Joan updated:

- -

Xhuis updated:

- -

xxalpha updated:

- - -

11 June 2016

-

Joan updated:

- -

Lzimann updated:

- -

coiax updated:

- -

kevinz000 updated:

- -

phil235 updated:

- - -

09 June 2016

-

GunHog updated:

- -

Joan updated:

- -

Kor updated:

- -

Papa Bones updated:

- -

Xhuis updated:

- -

coiax updated:

- -

nullbear updated:

- - -

08 June 2016

-

Cruix updated:

- -

Fox McCloud updated:

- -

GunHog updated:

- -

Joan updated:

- -

Kor updated:

- -

PKPenguin321 updated:

- -

lordpidey updated:

- - -

07 June 2016

-

Bobylein updated:

- -

Iamgoofball updated:

- -

Joan updated:

- -

Quiltyquilty updated:

- -

Xhuis updated:

- -

coiax updated:

- -

phil235 updated:

- - -

05 June 2016

-

Joan updated:

- -

PKPenguin321 updated:

- -

RemieRichards updated:

- -

X-TheDark updated:

- -

coiax updated:

- -

kevinz000 updated:

- - -

04 June 2016

-

MrStonedOne updated:

- -

Xhuis updated:

- -

coiax updated:

- - -

02 June 2016

-

Joan updated:

- -

Lati updated:

- -

PKPenguin321 & Nienhaus updated:

- -

Quiltyquilty updated:

- -

coiax updated:

- - -

01 June 2016

-

coiax updated:

- -

pudl updated:

- - -

31 May 2016

-

CoreOverload updated:

- -

Kiazusho updated:

- -

Kor updated:

- -

coiax updated:

- - -

30 May 2016

-

coiax updated:

- -

xxalpha updated:

- - -

29 May 2016

-

GunHog updated:

- -

Paprika, Crystalwarrior, Korphaeron and Bawhoppen updated:

- -

Xhuis updated:

- -

pudl updated:

- - -

27 May 2016

-

coiax updated:

- -

phil235 updated:

- - -

26 May 2016

-

Xhuis updated:

- -

coiax updated:

- - -

24 May 2016

-

Joan updated:

- -

Kiazusho updated:

- - -

23 May 2016

-

CoreOverload updated:

- -

coiax, OPDingo updated:

- -

kevinz000 updated:

- - -

22 May 2016

-

coiax updated:

- - -

21 May 2016

-

Iamsaltball updated:

- -

NicholasM10 updated:

- -

coiax updated:

- -

coiax, OPDingo updated:

- -

nullbear updated:

- - -

20 May 2016

-

KorPhaeron updated:

- -

bgobandit updated:

- -

coiax updated:

- - -

19 May 2016

-

Razharas updated:

- - -

18 May 2016

-

Cruix updated:

- -

Metacide updated:

- -

MrStonedOne updated:

- -

Robustin updated:

- -

Shadowlight213 updated:

- -

coiax updated:

- - -

15 May 2016

-

Iamgoofball updated:

- -

Mercenaryblue updated:

- - -

14 May 2016

-

Cruix updated:

- -

Joan updated:

- -

Metacide updated:

- -

coiax, Nienhaus updated:

- -

pudl updated:

- -

xxalpha updated:

- - -

13 May 2016

-

Joan updated:

- -

KorPhaeron updated:

- -

TechnoAlchemisto updated:

- - -

12 May 2016

-

Shadowlight and coiax updated:

- - -

11 May 2016

-

Joan updated:

- -

coiax updated:

- -

pudl updated:

- - -

09 May 2016

-

Joan updated:

- -

KorPhaeron updated:

- -

Razharas updated:

- -

coiax updated:

- - -

08 May 2016

-

CoreOverload updated:

- -

Joan updated:

- -

KorPhaeron updated:

- -

Mercenaryblue updated:

- -

Robustin updated:

- -

coiax updated:

- -

lordpidey updated:

- - -

07 May 2016

-

Robustin updated:

- -

nullbear updated:

- -

phil235 updated:

- - -

05 May 2016

-

Joan updated:

- -

\"Macho Man\" Randy Savage updated:

- - -

04 May 2016

-

Fox McCloud updated:

- -

Joan updated:

- -

TechnoAlchemist updated:

- -

coiax updated:

- -

xxalpha updated:

- - -

03 May 2016

-

coiax, Robustin updated:

- - -

02 May 2016

-

Joan updated:

- -

Kor updated:

- -

Lzimann updated:

- -

Mercenaryblue updated:

- -

RandomMarine updated:

- -

TechnoAlchemisto updated:

- -

TrustyGun updated:

- -

coiax updated:

- -

nullbear updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 860dba26d9..a32f0f40d2 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5975,3 +5975,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Some new emojis have been added to OOC for your enjoyment. Try them out. - rscadd: 'New emojis are : coffee, trophy, tea, gear, supermatter, forceweapon, gift, kudzu, dosh, chrono, nya, and tophat. Type :nameofemoji: in OOC to use.' +2016-08-15: + Jay: + - bugfix: Fixes taur sprites + - tweak: Re-enables taurs