diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm index 24eb5d7234..96517d5ea2 100644 --- a/code/modules/mob/living/carbon/human/dummy.dm +++ b/code/modules/mob/living/carbon/human/dummy.dm @@ -4,6 +4,10 @@ status_flags = GODMODE|CANPUSH mouse_drag_pointer = MOUSE_INACTIVE_POINTER var/in_use = FALSE + vore_flags = NO_VORE + +/mob/living/carbon/human/vore + vore_flags = DEVOURABLE | DIGESTABLE | FEEDING INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 7f883aafd4..df71e85f4c 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1062,7 +1062,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.adjustBruteLoss(1) /datum/species/proc/spec_death(gibbed, mob/living/carbon/human/H) - return + if(H) + stop_wagging_tail(H) /datum/species/proc/auto_equip(mob/living/carbon/human/H) // handles the equipping of species-specific gear @@ -2220,12 +2221,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) /datum/species/proc/ExtinguishMob(mob/living/carbon/human/H) return - //////////// //Stun// //////////// /datum/species/proc/spec_stun(mob/living/carbon/human/H,amount) + if(H) + stop_wagging_tail(H) + . = stunmod * H.physiology.stun_mod * amount ////////////// diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm index a79f9e2392..bec2b1ab03 100644 --- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm @@ -17,15 +17,6 @@ exotic_bloodtype = "BUG" exotic_blood_color = BLOOD_COLOR_BUG -/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/insect/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - /datum/species/insect/can_wag_tail(mob/living/carbon/human/H) return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] @@ -43,6 +34,3 @@ mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" H.update_body() - -/datum/species/insect/qualifies_for_rank(rank, list/features) - return TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 2f0595e2c0..be3d335833 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -9,20 +9,6 @@ mutantears = /obj/item/organ/ears/cat mutanttail = /obj/item/organ/tail/cat -/datum/species/human/felinid/qualifies_for_rank(rank, list/features) - return TRUE - -//Curiosity killed the cat's wagging tail. -/datum/species/human/felinid/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/human/felinid/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - - /datum/species/human/felinid/can_wag_tail(mob/living/carbon/human/H) return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm index b6d56b8e5d..807b3437c3 100644 --- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm @@ -3,7 +3,7 @@ id = "mammal" default_color = "4B4B4B" icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR) + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,HORNCOLOR,WINGCOLOR,CAN_SCAR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BEAST mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None", "mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian") @@ -14,16 +14,6 @@ liked_food = MEAT | FRIED disliked_food = TOXIC -//Curiosity killed the cat's wagging tail. -/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/mammal/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - /datum/species/mammal/can_wag_tail(mob/living/carbon/human/H) return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] @@ -41,40 +31,3 @@ mutant_bodyparts["mam_tail"] = mutant_bodyparts["mam_waggingtail"] mutant_bodyparts -= "mam_waggingtail" H.update_body() - - -/datum/species/mammal/qualifies_for_rank(rank, list/features) - return TRUE - - -//Alien// -/datum/species/xeno - // A cloning mistake, crossing human and xenomorph DNA - name = "Xenomorph Hybrid" - id = "xeno" - say_mod = "hisses" - default_color = "00FF00" - icon_limbs = DEFAULT_BODYPART_ICON_CITADEL - species_traits = list(MUTCOLORS,EYECOLOR,LIPS) - mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") - attack_verb = "slash" - attack_sound = 'sound/weapons/slash.ogg' - miss_sound = 'sound/weapons/slashmiss.ogg' - meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno - gib_types = list(/obj/effect/gibspawner/xeno/xenoperson, /obj/effect/gibspawner/xeno/xenoperson/bodypartless) - skinned_type = /obj/item/stack/sheet/animalhide/xeno - exotic_bloodtype = "X*" - damage_overlay_type = "xeno" - liked_food = MEAT - -//Praise the Omnissiah, A challange worthy of my skills - HS - -//EXOTIC// -//These races will likely include lots of downsides and upsides. Keep them relatively balanced.// - -//misc -/mob/living/carbon/human/dummy - vore_flags = NO_VORE - -/mob/living/carbon/human/vore - vore_flags = DEVOURABLE | DIGESTABLE | FEEDING diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 606b7a8bfd..22d8cb30fd 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -10,9 +10,6 @@ disliked_food = GROSS | RAW liked_food = JUNKFOOD | FRIED -/datum/species/human/qualifies_for_rank(rank, list/features) - return TRUE //Pure humans are always allowed in all roles. - /datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) if(H) stop_wagging_tail(H) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c42e0bf175..8a5b391562 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -38,19 +38,6 @@ return randname -/datum/species/lizard/qualifies_for_rank(rank, list/features) - return TRUE - -//I wag in death -/datum/species/lizard/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/lizard/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - /datum/species/lizard/can_wag_tail(mob/living/carbon/human/H) return mutant_bodyparts["tail_lizard"] || mutant_bodyparts["waggingtail_lizard"] diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index e79160da06..e4f69174e9 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -71,15 +71,6 @@ light_burnheal = -0.2 light_toxheal = -0.7 -/datum/species/pod/pseudo_weak/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/pod/pseudo_weak/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - /datum/species/pod/pseudo_weak/can_wag_tail(mob/living/carbon/human/H) return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm index af2e83ee0f..23b900488c 100644 --- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm +++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm @@ -20,19 +20,6 @@ exotic_bloodtype = "S" exotic_blood_color = BLOOD_COLOR_OIL -/datum/species/synthliz/qualifies_for_rank(rank, list/features) - return TRUE - -//I wag in death -/datum/species/synthliz/spec_death(gibbed, mob/living/carbon/human/H) - if(H) - stop_wagging_tail(H) - -/datum/species/synthliz/spec_stun(mob/living/carbon/human/H,amount) - if(H) - stop_wagging_tail(H) - . = ..() - /datum/species/synthliz/can_wag_tail(mob/living/carbon/human/H) return mutant_bodyparts["mam_tail"] || mutant_bodyparts["mam_waggingtail"] diff --git a/code/modules/mob/living/carbon/human/species_types/xeno.dm b/code/modules/mob/living/carbon/human/species_types/xeno.dm new file mode 100644 index 0000000000..273fe833d8 --- /dev/null +++ b/code/modules/mob/living/carbon/human/species_types/xeno.dm @@ -0,0 +1,18 @@ +/datum/species/xeno + // A cloning mistake, crossing human and xenomorph DNA + name = "Xenomorph Hybrid" + id = "xeno" + say_mod = "hisses" + default_color = "00FF00" + icon_limbs = DEFAULT_BODYPART_ICON_CITADEL + species_traits = list(MUTCOLORS,EYECOLOR,LIPS,CAN_SCAR) + mutant_bodyparts = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade") + attack_verb = "slash" + attack_sound = 'sound/weapons/slash.ogg' + miss_sound = 'sound/weapons/slashmiss.ogg' + meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno + gib_types = list(/obj/effect/gibspawner/xeno/xenoperson, /obj/effect/gibspawner/xeno/xenoperson/bodypartless) + skinned_type = /obj/item/stack/sheet/animalhide/xeno + exotic_bloodtype = "X*" + damage_overlay_type = "xeno" + liked_food = MEAT