diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index a973143839..01828ca105 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -360,7 +360,7 @@ "gV" = (/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) "gW" = (/obj/machinery/status_display,/turf/closed/wall/shuttle/smooth,/area/shuttle/escape) "gX" = (/obj/structure/table,/obj/item/weapon/storage/lockbox,/turf/open/floor/plasteel/shuttle,/area/centcom/evac) -"gY" = (/obj/structure/table,/obj/item/weapon/gun/projectile/minigun,/turf/open/floor/plasteel/shuttle,/area/centcom/evac) +"gY" = (/obj/structure/table,/turf/open/floor/plasteel/shuttle,/area/centcom/evac) "gZ" = (/obj/machinery/computer/shuttle,/turf/open/floor/plasteel/shuttle,/area/centcom/evac) "ha" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/open/floor/plasteel/shuttle,/area/centcom/evac) "hb" = (/obj/structure/table,/obj/item/weapon/paper_bin,/turf/open/floor/plasteel/shuttle,/area/centcom/evac) diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index a9c85e2a12..5c7066034b 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -317,7 +317,6 @@ /datum/species/jelly/slime/on_species_gain(mob/living/carbon/C, datum/species/old_species) ..() if(ishuman(C)) - if(!bodies || !bodies.len) bodies = list(C) else @@ -1088,11 +1087,11 @@ datum/species/canid default_color = "BCAC9B" specflags = list(MUTCOLORS,EYECOLOR,LIPS,HAIR) mutant_bodyparts = list("mam_body_markings", "mam_ears", "mam_tail", "snout") - default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "Belly", "mam_ears" = "None", "mam_tail" = "None") + default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_body_markings" = "Belly", "mam_ears" = "Big Cat", "mam_tail" = "Big Cat") attack_verb = "claw" attack_sound = 'sound/weapons/slash.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' - roundstart = 0 //no sprites yet + roundstart = 1 //no sprites yet /datum/species/tajaran/spec_death(gibbed, mob/living/carbon/human/H) if(H) @@ -1131,13 +1130,20 @@ datum/species/canid safe_toxins_max = 9999999 exotic_blood = "xblood" exotic_damage_overlay = "xeno" - roundstart = 1 - no_equip = list(slot_glasses, slot_back) //MY EYES, THEY'RE GONE + roundstart = 0 //wip + no_equip = list(slot_glasses) //MY EYES, THEY'RE GONE + +/datum/species/xeno/on_species_gain(mob/living/carbon/C, datum/species/old_species) + var/obj/effect/decal/cleanable/xenoblood/xgibs/XG + if(istype(C.gib_type, XG)) + return + else + C.gib_type = XG /datum/reagent/toxin/acid/xenoblood name = "acid blood" id = "xblood" description = "A highly corrosive substance, it is capable of burning through most natural or man-made materials in short order." color = "#66CC00" - toxpwr = 1 + toxpwr = 0.5 acidpwr = 12 diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index fcd54c9b33..96dea66647 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1413,13 +1413,48 @@ icon_state = "fox" hasinner = 0 +/datum/sprite_accessory/ears/wolf + name = "Wolf" + icon_state = "wolf" + hasinner = 0 + /datum/sprite_accessory/tails/human/fox name = "Fox" icon_state = "fox" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 /datum/sprite_accessory/tail_animated/human/fox name = "Fox" icon_state = "fox" + icon = 'icons/mob/mam_bodyparts.dmi' + extra = 1 + +/datum/sprite_accessory/tails/human/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tail_animated/human/wolf + name = "Wolf" + icon_state = "wolf" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/ears/catbig + name = "Cat, Big" + icon_state = "catbig" + icon = 'icons/mob/mam_bodyparts.dmi' + hasinner = 1 + +/datum/sprite_accessory/tails/human/catbig + name = "Cat, Big" + icon_state = "catbig" + icon = 'icons/mob/mam_bodyparts.dmi' + +/datum/sprite_accessory/tail_animated/human/catbig + name = "Cat, Big" + icon_state = "catbig" + icon = 'icons/mob/mam_bodyparts.dmi' //Mammal Bodyparts /datum/sprite_accessory/mam_ears @@ -1432,9 +1467,27 @@ icon = 'icons/mob/mam_bodyparts.dmi' /datum/sprite_accessory/snouts/lcanid - name = "Long, Canid" + name = "Long, Thin" icon_state = "lcanid" +/datum/sprite_accessory/snouts/scanid + name = "Short, Thin" + icon_state = "scanid" + +//Cat, Big +/datum/sprite_accessory/mam_ears/catbig + name = "Cat, Big" + icon_state = "catbig" + hasinner = 1 + +/datum/sprite_accessory/mam_tails/catbig + name = "Cat, Big" + icon_state = "catbig" + +/datum/sprite_accessory/mam_tails_animated/catbig + name = "Cat, Big" + icon_state = "catbig" + //Wolf /datum/sprite_accessory/mam_ears/wolf name = "Wolf" @@ -1448,6 +1501,7 @@ /datum/sprite_accessory/mam_tails_animated/wolf name = "Wolf" icon_state = "wolf" + //Fox /datum/sprite_accessory/mam_ears/fox name = "Fox" @@ -1466,6 +1520,20 @@ extra = 1 extra_color_src = MUTCOLORS2 +//Fennec +/datum/sprite_accessory/mam_ears/fennec + name = "Fennec" + icon_state = "fennec" + hasinner = 1 + +/datum/sprite_accessory/mam_tails/fennec + name = "Fennec" + icon_state = "fennec" + +/datum/sprite_accessory/mam_tails_animated/fennec + name = "Fennec" + icon_state = "fennec" + //Lab /datum/sprite_accessory/mam_ears/lab name = "Dog, Long" diff --git a/config/game_options.txt b/config/game_options.txt index 913417a751..5ed42b37cd 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -277,12 +277,12 @@ JOIN_WITH_MUTANT_RACE ROUNDSTART_RACES human ## Races because TG is racist -ROUNDSTART_RACES canine -ROUNDSTART_RACES feline -ROUNDSTART_RACES avian -ROUNDSTART_RACES rodent -ROUNDSTART_RACES herbivorous -ROUNDSTART_RACES exotic +ROUNDSTART_RACES canid +ROUNDSTART_RACES felid +#ROUNDSTART_RACES avian +#ROUNDSTART_RACES rodent +#ROUNDSTART_RACES herbivorous +#ROUNDSTART_RACES exotic ## Races that are strictly worse than humans that could probably be turned on without balance concerns ROUNDSTART_RACES lizard @@ -306,7 +306,7 @@ ROUNDSTART_RACES plasmaman ## Races that are straight upgrades. If these are on expect powergamers to always pick them #ROUNDSTART_RACES skeleton #ROUNDSTART_RACES zombie -#ROUNDSTART_RACES slime +ROUNDSTART_RACES slime #ROUNDSTART_RACES pod #ROUNDSTART_RACES military_synth #ROUNDSTART_RACES agent diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi index 58eb339c57..b783d965b4 100644 Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ diff --git a/icons/mob/mam_bodyparts.dmi b/icons/mob/mam_bodyparts.dmi index aa954d3af5..3dcf2f43d1 100644 Binary files a/icons/mob/mam_bodyparts.dmi and b/icons/mob/mam_bodyparts.dmi differ diff --git a/icons/mob/mutant_bodyparts.dmi b/icons/mob/mutant_bodyparts.dmi index 08170d8003..173c6f0b0d 100644 Binary files a/icons/mob/mutant_bodyparts.dmi and b/icons/mob/mutant_bodyparts.dmi differ