diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index ee5d418c7e..162631ea34 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -23,7 +23,6 @@ #define FRIDAY_13TH "Friday the 13th" //Human Overlays Indexes///////// -#define SPECIES_LAYER 28 #define MUTATIONS_LAYER 27 //mutations. Tk headglows, cold resistance glow, etc #define BODY_BEHIND_LAYER 26 //certain mutantrace features (tail when looking south) that must appear behind the body parts #define BODYPARTS_LAYER 25 //Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag @@ -41,7 +40,7 @@ #define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? #define SUIT_STORE_LAYER 12 #define BACK_LAYER 11 -#define TAIL_LAYER 10 +#define TAIL_LAYER 10 #define HAIR_LAYER 9 //TODO: make part of head layer? #define FACEMASK_LAYER 8 #define HEAD_LAYER 7 @@ -51,7 +50,7 @@ #define R_HAND_LAYER 3 //Having the two hands seperate seems rather silly, merge them together? It'll allow for code to be reused on mobs with arbitarily many hands #define BODY_FRONT_LAYER 2 #define FIRE_LAYER 1 //If you're on fire -#define TOTAL_LAYERS 28 //KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_; +#define TOTAL_LAYERS 27 //KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_; //Human Overlay Index Shortcuts for alternate_worn_layer, layers //Because I *KNOW* somebody will think layer+1 means "above" diff --git a/code/citadel/races.dm b/code/citadel/races.dm index 9892d3508e..8975c850a5 100644 --- a/code/citadel/races.dm +++ b/code/citadel/races.dm @@ -242,7 +242,7 @@ datum generic="leporid" adjective="hoppy" tail=1 - attack_verb = "kick" */ + attack_verb = "kick" lizard name="lizard" id="lizard" @@ -250,8 +250,8 @@ datum adjective="scaled" taur="naga" tail=1 - restricted=2 - /* murid // i have no idea what this is + + murid // i have no idea what this is name="murid" id="murid" say_mod = "squeaks" @@ -694,7 +694,7 @@ var/list/mutant_tails = list( "kangaroo"="kangaroo", "kangaroo"="kangaroo", "pony"="pony", - "lizard"="lizard", +// "lizard"="lizard", "cyborg"="cyborg") var/list/mutant_wings = list( diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 11ec5ae780..b204cb18b7 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -53,6 +53,7 @@ id = "lizard" say_mod = "hisses" default_color = "00FF00" + roundstart = 1 specflags = list(MUTCOLORS,EYECOLOR,LIPS) mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings") mutant_organs = list(/obj/item/organ/tongue/lizard) diff --git a/icons/misc/fullscreen.dmi b/icons/misc/fullscreen.dmi index 116ea7cfdc..70e27e9e69 100644 Binary files a/icons/misc/fullscreen.dmi and b/icons/misc/fullscreen.dmi differ diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi index 49970b67ea..b6e3ac9c19 100644 Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ