diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 7644a21b..84a359f6 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -52,7 +52,9 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define PASSMOB (1<<4) #define PASSCLOSEDTURF (1<<5) #define LETPASSTHROW (1<<6) - +#define PASSMACHINES (1<<7) +#define PASSCOMPUTER (1<<8) +#define PASSDOOR (1<<13) //Movement Types #define GROUND (1<<0) diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 5c3f3beb..6e87c4a5 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -96,7 +96,10 @@ GLOBAL_LIST_INIT(bitfields, list( "PASSBLOB" = PASSBLOB, "PASSMOB" = PASSMOB, "PASSCLOSEDTURF" = PASSCLOSEDTURF, - "LETPASSTHROW" = LETPASSTHROW + "LETPASSTHROW" = LETPASSTHROW, + "PASSDOOR" = PASSDOOR, //yogs + "PASSMACHINES" = PASSMACHINES, + "PASSCOMPUTER" = PASSCOMPUTER ), "movement_type" = list( "GROUND" = GROUND, @@ -201,4 +204,4 @@ GLOBAL_LIST_INIT(bitfields, list( "ORGAN_VITAL" = ORGAN_VITAL, "ORGAN_NO_SPOIL" = ORGAN_NO_SPOIL ), - )) \ No newline at end of file + )) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 9cd7b436..306280c8 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -493,3 +493,8 @@ Class Procs: . = . % 9 AM.pixel_x = -8 + ((.%3)*8) AM.pixel_y = -8 + (round( . / 3)*8) + +/obj/machinery/CanPass(atom/movable/mover, turf/target) + . = ..() + if(istype(mover) && (mover.pass_flags & PASSMACHINES)) + return TRUE diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 20fc831c..c5c6a412 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -121,6 +121,8 @@ /obj/machinery/door/CanPass(atom/movable/mover, turf/target) if(istype(mover) && (mover.pass_flags & PASSGLASS)) return !opacity + if(istype(mover) && (mover.pass_flags & PASSDOOR)) + return !opacity return !density /obj/machinery/door/proc/bumpopen(mob/user) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ac1ae51f..8fa98951 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -105,6 +105,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list( /client/proc/polymorph_all, /client/proc/show_tip, /client/proc/smite, + /client/proc/spawn_floor_cluwne, // Yogs /client/proc/admin_away, /client/proc/roll_dices //CIT CHANGE - Adds dice verb )) diff --git a/code/modules/admin/verbs/spawnfloorcluwne.dm b/code/modules/admin/verbs/spawnfloorcluwne.dm new file mode 100644 index 00000000..49a5ea58 --- /dev/null +++ b/code/modules/admin/verbs/spawnfloorcluwne.dm @@ -0,0 +1,20 @@ +/client/proc/spawn_floor_cluwne() + set category = "Fun" + set name = "Unleash Floor Cluwne" + set desc = "Pick a specific target or just let it select randomly and spawn the floor cluwne mob on the station. Be warned: spawning more than one may cause issues!" + var/target + + if(!check_rights(R_FUN)) + return + + var/turf/T = get_turf(usr) + target = input("Any specific target in mind? Please note only live, non cluwned, human targets are valid.", "Target", target) as null|anything in GLOB.player_list + if(target && ishuman(target)) + var/mob/living/carbon/human/H = target + var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(T) + FC.Acquire_Victim(H) + log_admin("[key_name(usr)] spawned floor cluwne.") + message_admins("[key_name(usr)] spawned floor cluwne.") + else + log_admin("[key_name(usr)] decided not to spawn a floor cluwne.") + message_admins("[key_name(usr)] decided not to spawn a floor cluwne.") diff --git a/code/modules/events/floorcluwne.dm b/code/modules/events/floorcluwne.dm new file mode 100644 index 00000000..9cd46a84 --- /dev/null +++ b/code/modules/events/floorcluwne.dm @@ -0,0 +1,22 @@ +/datum/round_event_control/floor_cluwne + name = "Floor Cluwne" + typepath = /datum/round_event/floor_cluwne + max_occurrences = 1 + min_players = 20 + + +/datum/round_event/floor_cluwne/start() + var/list/spawn_locs = list() + for(var/X in GLOB.xeno_spawn) + spawn_locs += X + + if(!spawn_locs.len) + message_admins("No valid spawn locations found, aborting...") + return MAP_ERROR + + var/turf/T = get_turf(pick(spawn_locs)) + var/mob/living/simple_animal/hostile/floor_cluwne/S = new(T) + playsound(S, 'yogstation/sound/misc/bikehorn_creepy.ogg', 50, 1, -1) + message_admins("A floor cluwne has been spawned at [COORD(T)][ADMIN_JMP(T)]") + log_game("A floor cluwne has been spawned at [COORD(T)]") + return SUCCESSFUL_SPAWN diff --git a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm new file mode 100644 index 00000000..b33c5b27 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm @@ -0,0 +1,436 @@ +GLOBAL_VAR_INIT(floor_cluwnes, 0) + +#define STAGE_HAUNT 1 +#define STAGE_SPOOK 2 +#define STAGE_TORMENT 3 +#define STAGE_ATTACK 4 +#define MANIFEST_DELAY 9 + +/mob/living/simple_animal/hostile/floor_cluwne + name = "???" + desc = "...." + icon = 'yogstation/icons/obj/clothing/masks.dmi' + icon_state = "cluwne" + icon_living = "cluwne" + icon_gib = "clown_gib" + maxHealth = 250 + health = 250 + speed = -1 + attacktext = "attacks" + attack_sound = 'sound/items/bikehorn.ogg' + del_on_death = TRUE + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB | LETPASSTHROW | PASSGLASS | PASSBLOB | PASSMACHINES //it's practically a ghost when unmanifested (under the floor) + wander = FALSE + minimum_distance = 2 + move_to_delay = 1 + environment_smash = FALSE + lose_patience_timeout = FALSE + pixel_y = 8 + pressure_resistance = 200 + minbodytemp = 0 + maxbodytemp = 1500 + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + var/mob/living/carbon/human/current_victim + var/manifested = FALSE + var/switch_stage = 40 + var/stage = STAGE_HAUNT + var/interest = 0 + var/target_area + var/invalid_area_typecache = list(/area/space, /area/lavaland, /area/centcom, /area/reebe, /area/shuttle/syndicate) + var/eating = FALSE + var/obj/effect/dummy/floorcluwne_orbit/poi + var/obj/effect/temp_visual/fcluwne_manifest/cluwnehole + //move_resist = INFINITY + hud_type = /datum/hud/ghost + hud_possible = list(ANTAG_HUD) + + +/mob/living/simple_animal/hostile/floor_cluwne/Initialize() + . = ..() + access_card = new /obj/item/card/id(src) + access_card.access = get_all_accesses()//THERE IS NO ESCAPE + ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) + invalid_area_typecache = typecacheof(invalid_area_typecache) + Manifest() + if(!current_victim) + Acquire_Victim() + poi = new(src) + +/mob/living/simple_animal/hostile/floor_cluwne/med_hud_set_health() + return //we use a different hud + +/mob/living/simple_animal/hostile/floor_cluwne/med_hud_set_status() + return //we use a different hud + +/mob/living/simple_animal/hostile/floor_cluwne/Destroy() + QDEL_NULL(poi) + return ..() + + +/mob/living/simple_animal/hostile/floor_cluwne/attack_hand(mob/living/carbon/human/M) + ..() + playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1) + + +/mob/living/simple_animal/hostile/floor_cluwne/CanPass(atom/A, turf/target) + SHOULD_CALL_PARENT(FALSE) + return TRUE + + +/mob/living/simple_animal/hostile/floor_cluwne/Life() + do_jitter_animation(1000) + pixel_y = 8 + var/area/A = get_area(loc) // Has to be separated from the below since is_type_in_typecache is also a funky macro + if(is_type_in_typecache(A, invalid_area_typecache) || !is_station_level(z)) + var/area = pick(GLOB.teleportlocs) + var/area/tp = GLOB.teleportlocs[area] + forceMove(pick(get_area_turfs(tp.type))) + + if(!current_victim) + Acquire_Victim() + + if(stage && !manifested) + On_Stage() + + if(stage == STAGE_ATTACK) + playsound(src, 'yogstation/sound/misc/cluwne_breathing.ogg', 75, 1) + + if(eating) + return + + var/turf/T = get_turf(current_victim) + A = get_area(T) // Has to be separated from the below since is_type_in_typecache is also a funky macro + if(prob(5))//checks roughly every 20 ticks + if(current_victim.stat == DEAD || is_type_in_typecache(A, invalid_area_typecache) || !is_station_level(current_victim.z)) + if(!Found_You()) + Acquire_Victim() + + if(get_dist(src, current_victim) > 9 && !manifested && !is_type_in_typecache(A, invalid_area_typecache))//if cluwne gets stuck he just teleports + do_teleport(src, T) + + interest++ + if(interest >= switch_stage * 4) + stage = STAGE_ATTACK + + else if(interest >= switch_stage * 2) + stage = STAGE_TORMENT + + else if(interest >= switch_stage) + stage = STAGE_SPOOK + + else if(interest < switch_stage) + stage = STAGE_HAUNT + + ..() + +/mob/living/simple_animal/hostile/floor_cluwne/Goto(target, delay, minimum_distance) + var/area/A = get_area(current_victim.loc) + if(!manifested && !is_type_in_typecache(A, invalid_area_typecache) && is_station_level(current_victim.z)) + walk_to(src, target, minimum_distance, delay) + else + walk_to(src,0) + + +/mob/living/simple_animal/hostile/floor_cluwne/FindTarget() + return current_victim + + +/mob/living/simple_animal/hostile/floor_cluwne/CanAttack(atom/the_target)//you will not escape + return TRUE + + +/mob/living/simple_animal/hostile/floor_cluwne/AttackingTarget() + return + + +/mob/living/simple_animal/hostile/floor_cluwne/LoseTarget() + return + + +/mob/living/simple_animal/hostile/floor_cluwne/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE)//prevents runtimes with machine fuckery + return FALSE + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Found_You() + for(var/obj/structure/closet/hiding_spot in orange(7,src)) + if(current_victim.loc == hiding_spot) + hiding_spot.bust_open() + current_victim.Stun(40,ignore_canstun = TRUE) + to_chat(current_victim, "...edih t'nac uoY") + return TRUE + return FALSE + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Acquire_Victim(specific) + for(var/I in GLOB.player_list)//better than a potential recursive loop + var/mob/living/carbon/human/H = pick(GLOB.player_list)//so the check is fair + var/area/A + if(specific) + H = specific + A = get_area(H.loc) + if(H.stat != DEAD && H.has_dna() && !is_type_in_typecache(A, invalid_area_typecache) && is_station_level(H.z)) + return target = current_victim + + A = get_area(H.loc) + if(H && ishuman(H) && H.stat != DEAD && H != current_victim && H.has_dna() && !is_type_in_typecache(A, invalid_area_typecache) && is_station_level(H.z)) + current_victim = H + interest = 0 + stage = STAGE_HAUNT + return target = current_victim + + message_admins("Floor Cluwne was deleted due to a lack of valid targets, if this was a manually targeted instance please re-evaluate your choice.") + qdel(src) + + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Manifest()//handles disappearing and appearance anim + if(manifested) + update_canmove() + cluwnehole = new(src.loc) + addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Appear), MANIFEST_DELAY) + else + layer = GAME_PLANE + invisibility = INVISIBILITY_OBSERVER + density = FALSE + update_canmove() + if(cluwnehole) + qdel(cluwnehole) + + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Appear()//handled in a seperate proc so floor cluwne doesn't appear before the animation finishes + layer = LYING_MOB_LAYER + invisibility = FALSE + density = TRUE + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Reset_View(screens, colour, mob/living/carbon/human/H) + if(screens) + for(var/whole_screen in screens) + animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING) + if(colour && H) + H.client.color = colour + + +/mob/living/simple_animal/hostile/floor_cluwne/proc/On_Stage() + var/mob/living/carbon/human/H = current_victim + if(!H) + FindTarget() + return + switch(stage) + if(STAGE_HAUNT) + + if(prob(5)) + H.playsound_local(src,'yogstation/sound/voice/cluwnelaugh2_reversed.ogg', 1) + + if(prob(5)) + H.playsound_local(src,'yogstation/sound/misc/bikehorn_creepy.ogg', 5) + + if(prob(3)) + var/obj/item/I = locate() in orange(H, 8) + if(I && !I.anchored) + I.throw_at(H, 4, 3) + to_chat(H, "What threw that?") + + if(STAGE_SPOOK) + if(prob(4)) + var/turf/T = get_turf(H) + T.handle_slip(H, 20) + to_chat(H, "The floor shifts underneath you!") + + if(prob(5)) + H.playsound_local(src,'yogstation/sound/voice/cluwnelaugh2.ogg', 2) + + if(prob(5)) + H.playsound_local(src,'yogstation/sound/voice/cluwnelaugh2_reversed.ogg', 2) + + if(prob(5)) + H.playsound_local(src,'yogstation/sound/misc/bikehorn_creepy.ogg', 10) + to_chat(H, "knoh") + + if(prob(5)) + var/obj/item/I = locate() in orange(H, 8) + if(I && !I.anchored) + I.throw_at(H, 4, 3) + to_chat(H, "What threw that?") + + if(prob(2)) + to_chat(H, "yalp ot tnaw I") + Appear() + manifested = FALSE + addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Manifest), 1) + if(current_victim.hud_used)//yay skewium + var/list/screens = list(current_victim.hud_used.plane_masters["[GAME_PLANE]"], current_victim.hud_used.plane_masters["[LIGHTING_PLANE]"]) + var/matrix/skew = matrix() + var/intensity = 8 + skew.set_skew(rand(-intensity,intensity), rand(-intensity,intensity)) + var/matrix/newmatrix = skew + + for(var/whole_screen in screens) + animate(whole_screen, transform = newmatrix, time = 5, easing = QUAD_EASING, loop = -1) + animate(transform = -newmatrix, time = 5, easing = QUAD_EASING) + + addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Reset_View, screens), 10) + + if(STAGE_TORMENT) + if(prob(5)) + var/turf/T = get_turf(H) + T.handle_slip(H, 20) + to_chat(H, "The floor shifts underneath you!") + + if(prob(3)) + playsound(src,pick('sound/spookoween/scary_horn.ogg', 'sound/spookoween/scary_horn2.ogg', 'sound/spookoween/scary_horn3.ogg'), 30, 1) + + if(prob(3)) + playsound(src,'yogstation/sound/voice/cluwnelaugh1.ogg', 30, 1) + + if(prob(3)) + playsound(src,'yogstation/sound/voice/cluwnelaugh2_reversed.ogg', 30, 1) + + if(prob(5)) + playsound(src,'yogstation/sound/misc/bikehorn_creepy.ogg', 30, 1) + + if(prob(4)) + for(var/obj/item/I in orange(H, 8)) + if(I && !I.anchored) + I.throw_at(H, 4, 3) + to_chat(H, "What the hell?!") + + if(prob(2)) + to_chat(H, "Something feels very wrong...") + H.playsound_local(src,'sound/hallucinations/behind_you1.ogg', 25) + H.flash_act() + + if(prob(2)) + to_chat(H, "!?REHTOMKNOH eht esiarp uoy oD") + to_chat(H, "Something grabs your foot!") + H.playsound_local(src,'sound/hallucinations/i_see_you1.ogg', 25) + H.Stun(20) + + if(prob(3)) + to_chat(H, "KNOH ?od nottub siht seod tahW") + for(var/turf/open/O in range(src, 6)) + O.MakeSlippery(TURF_WET_WATER, 10) + playsound(src, 'sound/effects/meteorimpact.ogg', 30, 1) + + if(prob(1)) + to_chat(H, "WHAT THE FUCK IS THAT?!") + to_chat(H, ".KNOH !nuf hcum os si uoy htiw gniyalP .KNOH KNOH KNOH") + H.playsound_local(src,'sound/hallucinations/im_here1.ogg', 25) + H.reagents.add_reagent("mindbreaker", 3) + H.reagents.add_reagent("laughter", 5) + H.reagents.add_reagent("mercury", 3) + Appear() + manifested = FALSE + addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Manifest), 2) + for(var/obj/machinery/light/L in range(H, 8)) + L.flicker() + + if(STAGE_ATTACK) + if(!eating) + Found_You() + for(var/I in getline(src,H)) + var/turf/T = I + if(T.density) + forceMove(H.loc) + for(var/obj/structure/O in T) + if(O.density || istype(O, /obj/machinery/door/airlock)) + forceMove(H.loc) + to_chat(H, "You feel the floor closing in on your feet!") + H.Stun(300, ignore_canstun = TRUE) + //H.Paralyze(300) + H.emote("scream") + H.adjustBruteLoss(10) + manifested = TRUE + Manifest() + if(!eating) + empulse(src, 6, 6) + addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Grab, H), 50, TIMER_OVERRIDE|TIMER_UNIQUE) + for(var/turf/open/O in range(src, 6)) + O.MakeSlippery(TURF_WET_LUBE, 30) + playsound(src, 'sound/effects/meteorimpact.ogg', 30, 1) + eating = TRUE + + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Grab(mob/living/carbon/human/H) + to_chat(H, "You feel a cold, gloved hand clamp down on your ankle!") + for(var/I in 1 to get_dist(src, H)) + if(do_after(src, 5, target = H)) + step_towards(H, src) + playsound(H, pick('yogstation/sound/effects/bodyscrape-01.ogg', 'yogstation/sound/effects/bodyscrape-02.ogg'), 20, 1, -4) + if(prob(40)) + H.emote("scream") + else if(prob(25)) + H.say(pick("HELP ME!!","IT'S GOT ME!!","DON'T LET IT TAKE ME!!",";SOMETHING'S KILLING ME!!","HOLY FUCK!!")) + playsound(src, pick('yogstation/sound/voice/cluwnelaugh1.ogg', 'yogstation/sound/voice/cluwnelaugh2.ogg', 'yogstation/sound/voice/cluwnelaugh3.ogg'), 50, 1) + + if(get_dist(src,H) <= 1) + visible_message("[src] begins dragging [H] under the floor!") + if(do_after(src, 50, target = H) && eating) + H.become_blind() + H.layer = GAME_PLANE + H.invisibility = INVISIBILITY_OBSERVER + H.density = FALSE + H.anchored = TRUE + addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Kill, H), 100, TIMER_OVERRIDE|TIMER_UNIQUE) + visible_message("[src] pulls [H] under!") + to_chat(H, "[src] drags you underneath the floor!") + else + eating = FALSE + else + eating = FALSE + manifested = FALSE + Manifest() + + +/mob/living/simple_animal/hostile/floor_cluwne/proc/Kill(mob/living/carbon/human/H) + if(!istype(H) || !H.client) + Acquire_Victim() + return + playsound(H, 'yogstation/sound/effects/cluwne_feast.ogg', 100, 0, -4) + var/red_splash = list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0) + var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0) + H.client.color = pure_red + animate(H.client,color = red_splash, time = 10, easing = SINE_EASING|EASE_OUT) + for(var/turf/T in orange(H, 4)) + H.add_splatter_floor(T) + if(do_after(src, 50, target = H)) + H.unequip_everything()//more runtime prevention + H.gib(FALSE) + + eating = FALSE + switch_stage = switch_stage * 0.75 //he gets faster after each feast + for(var/mob/M in GLOB.player_list) + M.playsound_local(get_turf(M), 'yogstation/sound/misc/honk_echo_distant.ogg', 50, 1, pressure_affected = FALSE) + + interest = 0 + stage = STAGE_HAUNT + Destroy() + +//manifestation animation +/obj/effect/temp_visual/fcluwne_manifest + icon = 'yogstation/icons/turf/floors.dmi' + icon_state = "fcluwne_open" + layer = TURF_LAYER + duration = 600 + randomdir = FALSE + +/obj/effect/temp_visual/fcluwne_manifest/Initialize() + . = ..() + playsound(src, 'yogstation/sound/misc/floor_cluwne_emerge.ogg', 100, 1) + flick("fcluwne_manifest",src) + +/obj/effect/dummy/floorcluwne_orbit + name = "floor cluwne" + desc = "If you have this, tell a coder or admin!" + +/obj/effect/dummy/floorcluwne_orbit/Initialize() + . = ..() + GLOB.floor_cluwnes++ + name += " ([GLOB.floor_cluwnes])" + GLOB.poi_list += src + +/obj/effect/dummy/floorcluwne_orbit/Destroy() + . = ..() + GLOB.poi_list -= src + +#undef STAGE_HAUNT +#undef STAGE_SPOOK +#undef STAGE_TORMENT +#undef STAGE_ATTACK +#undef MANIFEST_DELAY diff --git a/tgstation.dme b/tgstation.dme index f4fb06be..c5bb90a9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1138,6 +1138,7 @@ #include "code\modules\admin\verbs\adminjump.dm" #include "code\modules\admin\verbs\adminpm.dm" #include "code\modules\admin\verbs\adminsay.dm" +#include "code\modules\admin\verbs\spawnfloorcluwne.dm" #include "code\modules\admin\verbs\ak47s.dm" #include "code\modules\admin\verbs\atmosdebug.dm" #include "code\modules\admin\verbs\bluespacearty.dm" @@ -1610,6 +1611,7 @@ #include "code\modules\events\dust.dm" #include "code\modules\events\electrical_storm.dm" #include "code\modules\events\false_alarm.dm" +#include "code\modules\events\floorcluwne.dm" #include "code\modules\events\ghost_role.dm" #include "code\modules\events\grid_check.dm" #include "code\modules\events\heart_attack.dm" @@ -2188,6 +2190,7 @@ #include "code\modules\mob\living\simple_animal\hostile\cat_butcher.dm" #include "code\modules\mob\living\simple_animal\hostile\eyeballs.dm" #include "code\modules\mob\living\simple_animal\hostile\faithless.dm" +#include "code\modules\mob\living\simple_animal\hostile\floor_cluwne.dm" #include "code\modules\mob\living\simple_animal\hostile\giant_spider.dm" #include "code\modules\mob\living\simple_animal\hostile\goose.dm" #include "code\modules\mob\living\simple_animal\hostile\headcrab.dm" diff --git a/yogstation/icons/obj/clothing/masks.dmi b/yogstation/icons/obj/clothing/masks.dmi new file mode 100644 index 00000000..dcc3d2a4 Binary files /dev/null and b/yogstation/icons/obj/clothing/masks.dmi differ diff --git a/yogstation/icons/turf/floors.dmi b/yogstation/icons/turf/floors.dmi new file mode 100644 index 00000000..076ee749 Binary files /dev/null and b/yogstation/icons/turf/floors.dmi differ diff --git a/yogstation/sound/effects/bodyscrape-01.ogg b/yogstation/sound/effects/bodyscrape-01.ogg new file mode 100644 index 00000000..48c75634 Binary files /dev/null and b/yogstation/sound/effects/bodyscrape-01.ogg differ diff --git a/yogstation/sound/effects/bodyscrape-02.ogg b/yogstation/sound/effects/bodyscrape-02.ogg new file mode 100644 index 00000000..b870b5d7 Binary files /dev/null and b/yogstation/sound/effects/bodyscrape-02.ogg differ diff --git a/yogstation/sound/effects/cluwne_feast.ogg b/yogstation/sound/effects/cluwne_feast.ogg new file mode 100644 index 00000000..47c23e64 Binary files /dev/null and b/yogstation/sound/effects/cluwne_feast.ogg differ diff --git a/yogstation/sound/misc/bikehorn_creepy.ogg b/yogstation/sound/misc/bikehorn_creepy.ogg new file mode 100644 index 00000000..7fb3290f Binary files /dev/null and b/yogstation/sound/misc/bikehorn_creepy.ogg differ diff --git a/yogstation/sound/misc/cluwne_breathing.ogg b/yogstation/sound/misc/cluwne_breathing.ogg new file mode 100644 index 00000000..30de4d79 Binary files /dev/null and b/yogstation/sound/misc/cluwne_breathing.ogg differ diff --git a/yogstation/sound/misc/floor_cluwne_emerge.ogg b/yogstation/sound/misc/floor_cluwne_emerge.ogg new file mode 100644 index 00000000..cf8254fc Binary files /dev/null and b/yogstation/sound/misc/floor_cluwne_emerge.ogg differ diff --git a/yogstation/sound/misc/honk_echo_distant.ogg b/yogstation/sound/misc/honk_echo_distant.ogg new file mode 100644 index 00000000..32e95884 Binary files /dev/null and b/yogstation/sound/misc/honk_echo_distant.ogg differ diff --git a/yogstation/sound/voice/cluwnelaugh1.ogg b/yogstation/sound/voice/cluwnelaugh1.ogg new file mode 100644 index 00000000..6a128cf3 Binary files /dev/null and b/yogstation/sound/voice/cluwnelaugh1.ogg differ diff --git a/yogstation/sound/voice/cluwnelaugh2.ogg b/yogstation/sound/voice/cluwnelaugh2.ogg new file mode 100644 index 00000000..e118709c Binary files /dev/null and b/yogstation/sound/voice/cluwnelaugh2.ogg differ diff --git a/yogstation/sound/voice/cluwnelaugh2_reversed.ogg b/yogstation/sound/voice/cluwnelaugh2_reversed.ogg new file mode 100644 index 00000000..5dc7e9b7 Binary files /dev/null and b/yogstation/sound/voice/cluwnelaugh2_reversed.ogg differ diff --git a/yogstation/sound/voice/cluwnelaugh3.ogg b/yogstation/sound/voice/cluwnelaugh3.ogg new file mode 100644 index 00000000..5ff795c9 Binary files /dev/null and b/yogstation/sound/voice/cluwnelaugh3.ogg differ