From 38397ec6818071738299c958c9783abb7eed80ab Mon Sep 17 00:00:00 2001 From: Kabra_men <46802162+Kabramen@users.noreply.github.com> Date: Sat, 15 Aug 2020 23:14:11 -0300 Subject: [PATCH] adds clown lube + superior honk render --- .../antagonists/wizard/equipment/artefact.dm | 9 +++++++++ .../simple_animal/hostile/retaliate/clown.dm | 17 +++++++++++++++++ .../modules/mob/living/simple_animal/spawner.dm | 2 +- 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 7207adc4..e662b95b 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -89,6 +89,15 @@ rend_desc = "Gently wafting with the sounds of endless laughter." icon_state = "clownrender" +/obj/item/veilrender/honkrender/honkhulkrender + name = "superior honk render" + desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast circus. This one gleams with a special light." + spawn_type = /mob/living/simple_animal/hostile/retaliate/clown/clownhulk + spawn_amt = 5 + activate_descriptor = "depression" + rend_desc = "Gently wafting with the sounds of mirthful grunting." + icon_state = "clownrender" + ////TEAR IN REALITY /obj/singularity/wizard diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index e79bb063..33cca488 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -66,6 +66,23 @@ if(L.reagents) L.reagents.add_reagent(attack_reagent, rand(1,5)) +/mob/living/simple_animal/hostile/retaliate/clown/lube + name = "Living Lube" + desc = "A puddle of lube brought to life by the honkmother." + icon_state = "lube" + icon_living = "lube" + turns_per_move = 1 + response_help = "dips a finger into" + response_disarm = "gently scoops and pours aside" + emote_see = list("bubbles", "oozes") + loot = list(/obj/item/clothing/mask/gas/clown_hat, /obj/effect/particle_effect/foam) + +/mob/living/simple_animal/hostile/retaliate/clown/lube/Life() + . = ..() + var/turf/open/OT = get_turf(src) + if(isopenturf(OT)) + OT.MakeSlippery(TURF_WET_LUBE, 100) + /mob/living/simple_animal/hostile/retaliate/clown/banana name = "Clownana" desc = "A fusion of clown and banana DNA birthed from a botany experiment gone wrong." diff --git a/code/modules/mob/living/simple_animal/spawner.dm b/code/modules/mob/living/simple_animal/spawner.dm index 5e21009f..da4c93be 100644 --- a/code/modules/mob/living/simple_animal/spawner.dm +++ b/code/modules/mob/living/simple_animal/spawner.dm @@ -83,7 +83,7 @@ maxHealth = 200 max_mobs = 15 spawn_time = 150 - mob_types = list(/mob/living/simple_animal/hostile/retaliate/clown, /mob/living/simple_animal/hostile/retaliate/clown/fleshclown, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk, /mob/living/simple_animal/hostile/retaliate/clown/longface, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/chlown, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/honcmunculus, /mob/living/simple_animal/hostile/retaliate/clown/mutant/blob, /mob/living/simple_animal/hostile/retaliate/clown/banana, /mob/living/simple_animal/hostile/retaliate/clown/honkling) + mob_types = list(/mob/living/simple_animal/hostile/retaliate/clown, /mob/living/simple_animal/hostile/retaliate/clown/fleshclown, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk, /mob/living/simple_animal/hostile/retaliate/clown/longface, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/chlown, /mob/living/simple_animal/hostile/retaliate/clown/clownhulk/honcmunculus, /mob/living/simple_animal/hostile/retaliate/clown/mutant/blob, /mob/living/simple_animal/hostile/retaliate/clown/banana, /mob/living/simple_animal/hostile/retaliate/clown/honkling, /mob/living/simple_animal/hostile/retaliate/clown/lube) spawn_text = "climbs out of" faction = list("clown")