diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm index 91a611f022..2729e8a18f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Big.dm @@ -7,7 +7,7 @@ see_in_dark = 8 melee_damage_lower = 15 - melee_damage_upper = 35 + melee_damage_upper = 25 attack_armor_pen = 5 attack_sharp = FALSE attack_edge = FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm index bee3df8b3f..df314aae91 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Clowns.dm @@ -6,6 +6,9 @@ health = 100 see_in_dark = 8 + has_hands = TRUE + humanoid_hands = TRUE + melee_damage_lower = 5 melee_damage_upper = 30 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Normal.dm b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Normal.dm index 2f4c0290bb..624fc561d8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Normal.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/mobs_monsters/clowns/Normal.dm @@ -75,3 +75,201 @@ speak = list("HONK", "Honk!", "Henk!") emote_see = list("honks") + +/mob/living/simple_mob/mobs_monsters/clowns/big/tunnelclown + name = "A Clown?" + desc = "Have you heard about our lord and savior, Honkus Chrust?" + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "tunnel_new" + icon_living = "tunnel_new" + icon_dead = "tunnel_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + +/mob/living/simple_mob/mobs_monsters/clowns/big/sentinel + name = "A Clown?" + desc = "This guy means business..." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "sentinel_new" + icon_living = "sentinel_new" + icon_dead = "sentinel_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + + +/mob/living/simple_mob/mobs_monsters/clowns/big/ + name = "A Clown?" + desc = "Oh sweet space christ." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "" + icon_living = "" + icon_dead = "_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + + +/mob/living/simple_mob/mobs_monsters/clowns/big/ + name = "A Clown?" + desc = "Oh sweet space christ." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "" + icon_living = "" + icon_dead = "_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + + +/mob/living/simple_mob/mobs_monsters/clowns/big/ + name = "A Clown?" + desc = "Oh sweet space christ." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "" + icon_living = "" + icon_dead = "_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + + +/mob/living/simple_mob/mobs_monsters/clowns/big/ + name = "A Clown?" + desc = "Oh sweet space christ." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "" + icon_living = "" + icon_dead = "_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + + +/mob/living/simple_mob/mobs_monsters/clowns/big/ + name = "A Clown?" + desc = "Oh sweet space christ." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "" + icon_living = "" + icon_dead = "_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") + + +/mob/living/simple_mob/mobs_monsters/clowns/big/ + name = "A Clown?" + desc = "Oh sweet space christ." + tt_desc = "E Homo sapiens corydon horrificus" //this is a redspace clown + icon = 'icons/mob/mobs_monsters/newclowns.dmi' + icon_state = "" + icon_living = "" + icon_dead = "_dead" + icon_gib = "generic_gib" + + faction = "clown" + + loot_list = list(/obj/item/weapon/bikehorn = 100) + + response_help = "pokes" + response_disarm = "gently pushes aside" + response_harm = "hits" + + say_list_type = /datum/say_list/clown + +/datum/say_list/clown + speak = list("HONK", "Honk!", "Henk!") + emote_see = list("honks") diff --git a/vorestation.dme b/vorestation.dme index e5e5f203b5..b9e5021677 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2776,12 +2776,12 @@ #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_abilities.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\demon_subtypes.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\demon\~defines.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\Clowns\Big.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\Clowns\bus.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\Clowns\busclowns.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\Clowns\c_shift.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\Clowns\Clowns.dm" -#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\Clowns\Normal.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Big.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\bus.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\busclowns.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\c_shift.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Clowns.dm" +#include "code\modules\mob\living\simple_mob\subtypes\vore\mobs_monsters\clowns\Normal.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\morph\morph.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\_defines.dm" #include "code\modules\mob\living\simple_mob\subtypes\vore\shadekin\ability_objects.dm"