From 2d71d11a0684335b2b4600e5f6830ac999a4e8b9 Mon Sep 17 00:00:00 2001 From: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> Date: Sat, 7 May 2022 23:57:39 +0100 Subject: [PATCH] https://github.com/tgstation/tgstation/pull/66318 --- code/__DEFINES/mobfactions.dm | 4 ++++ code/modules/jobs/job_types/clown.dm | 1 + .../mob/living/simple_animal/hostile/retaliate/clown.dm | 1 + tgstation.dme | 1 + 4 files changed, 7 insertions(+) create mode 100644 code/__DEFINES/mobfactions.dm diff --git a/code/__DEFINES/mobfactions.dm b/code/__DEFINES/mobfactions.dm new file mode 100644 index 00000000000..00f5fbba529 --- /dev/null +++ b/code/__DEFINES/mobfactions.dm @@ -0,0 +1,4 @@ +/// If this seems rather...bare at the moment, its temporary. At the moment this will just hold the clown faction define +/// Later all mob factions will be moved here and their current factions replaced with faction defines. + +#define FACTION_CLOWN "Clowns" diff --git a/code/modules/jobs/job_types/clown.dm b/code/modules/jobs/job_types/clown.dm index f2aacb246e6..ecfdf0f2434 100644 --- a/code/modules/jobs/job_types/clown.dm +++ b/code/modules/jobs/job_types/clown.dm @@ -99,6 +99,7 @@ M.mutadone_proof = TRUE var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN] fan.add_hud_to(H) + H.faction |= FACTION_CLOWN //Skyrat Edit Start: Floor Demon /datum/outfit/job/clown_free 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 9a4a04f701e..6bb9f05f2a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -35,6 +35,7 @@ unsuitable_atmos_damage = 10 unsuitable_heat_damage = 15 footstep_type = FOOTSTEP_MOB_SHOE + faction = FACTION_CLOWN var/attack_reagent /mob/living/simple_animal/hostile/retaliate/clown/Initialize(mapload) diff --git a/tgstation.dme b/tgstation.dme index 167857f57b2..b72d7a0e515 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -112,6 +112,7 @@ #include "code\__DEFINES\memory_defines.dm" #include "code\__DEFINES\mergers.dm" #include "code\__DEFINES\mob_spawn.dm" +#include "code\__DEFINES\mobfactions.dm" #include "code\__DEFINES\mobs.dm" #include "code\__DEFINES\mod.dm" #include "code\__DEFINES\monkeys.dm"