diff --git a/code/__DEFINES/~skyrat_defines/factions.dm b/code/__DEFINES/~skyrat_defines/factions.dm index 96ad6c15c1a..75ef7f3425d 100644 --- a/code/__DEFINES/~skyrat_defines/factions.dm +++ b/code/__DEFINES/~skyrat_defines/factions.dm @@ -7,3 +7,5 @@ // ERT faction #define FACTION_ERT "ert" + +#define FACTION_RAIDER "raider" diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm index 5dbe4ffb86f..331804fdc09 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm @@ -75,7 +75,7 @@ loot = list(/obj/effect/gibspawner/human) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 7.5 - faction = list("hostile", "cult") + faction = list(FACTION_HOSTILE, FACTION_CULT) status_flags = CANPUSH del_on_death = 1 rapid_melee = 2 @@ -192,7 +192,7 @@ turns_per_move = 5 mob_biotypes = MOB_ORGANIC|MOB_HUMANOID sentience_type = SENTIENCE_HUMANOID - faction = list("hostile", "cult") + faction = list(FACTION_HOSTILE, FACTION_CULT) footstep_type = FOOTSTEP_MOB_SHOE weather_immunities = list(TRAIT_LAVA_IMMUNE, TRAIT_ASHSTORM_IMMUNE) minbodytemp = 0 @@ -236,7 +236,7 @@ unsuitable_atmos_damage = 15 check_friendly_fire = 1 dodging = TRUE - faction = list("hostile") + faction = list(FACTION_HOSTILE) rapid_melee = 2 del_on_death = 1 @@ -284,7 +284,7 @@ casingtype = /obj/item/ammo_casing/shotgun/buckshot loot = list(/obj/effect/spawner/random/maintenance/five) dodging = FALSE - faction = list("hostile") + faction = list(FACTION_HOSTILE) projectilesound = 'sound/weapons/gun/shotgun/shot.ogg' /mob/living/simple_animal/hostile/looter/ranged/space @@ -333,7 +333,7 @@ attack_vis_effect = ATTACK_EFFECT_CLAW projectilesound = 'sound/weapons/gun/pistol/shot.ogg' projectiletype = /obj/projectile/hivebotbullet - faction = list("hostile") + faction = list(FACTION_HOSTILE) check_friendly_fire = 1 atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 @@ -513,7 +513,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN @@ -548,7 +548,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN @@ -586,7 +586,7 @@ atmos_requirements = list("min_oxy" = 10, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - faction = list("hostile", "vines", "plants") + faction = list(FACTION_HOSTILE, "vines", "plants") pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN @@ -625,7 +625,7 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 800 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN @@ -664,7 +664,7 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 800 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = NO_SPAWN @@ -696,7 +696,7 @@ atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 900 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN @@ -767,7 +767,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN @@ -802,7 +802,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = NO_SPAWN @@ -837,7 +837,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - faction = list("hostile") + faction = list(FACTION_HOSTILE) pressure_resistance = 200 gold_core_spawnable = NO_SPAWN @@ -869,7 +869,7 @@ loot = list(/obj/effect/spawner/random/maintenance/three = 1) atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_plas" = 0, "max_plas" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 5, "max_n2" = 0) unsuitable_atmos_damage = 7.5 - faction = list("hostile") + faction = list(FACTION_HOSTILE) check_friendly_fire = 1 status_flags = CANPUSH del_on_death = 1 diff --git a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm index 05b12a69a4b..f6193bfe68e 100644 --- a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm @@ -344,7 +344,7 @@ if(find_animal.sentience_type != SENTIENCE_ORGANIC) return - find_animal.faction = list("neutral") + find_animal.faction = list(FACTION_NEUTRAL) if(ishostile(find_animal)) var/mob/living/simple_animal/hostile/hostile_animal = find_animal diff --git a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm index f454864dd68..05bd5295555 100644 --- a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm +++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm @@ -61,5 +61,5 @@ melee_damage_lower = 5 melee_damage_upper = 5 speed = -0.5 - faction = list("spiders") + faction = list(FACTION_SPIDER) diff --git a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm index 6b5bfffc716..84f770af0a3 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/human_mobs.dm @@ -94,7 +94,7 @@ loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt) atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) unsuitable_atmos_damage = 7.5 - faction = list(FACTION_STATION, "neutral") + faction = list(FACTION_STATION, FACTION_NEUTRAL) check_friendly_fire = 1 status_flags = CANPUSH del_on_death = TRUE diff --git a/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm b/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm index 4d8f80ce070..ff9542b126b 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/vortigaunt.dm @@ -7,7 +7,7 @@ icon_dead = "vortigaunt_dead" icon_gib = null gender = MALE - faction = list(FACTION_STATION, "neutral") + faction = list(FACTION_STATION, FACTION_NEUTRAL) mob_biotypes = list(MOB_ORGANIC, MOB_BEAST) speak_chance = 1 speak_emote = list("galungs") diff --git a/modular_skyrat/modules/encounters/code/nri_raiders.dm b/modular_skyrat/modules/encounters/code/nri_raiders.dm index 504b9230bc2..a6b1b30a17e 100644 --- a/modular_skyrat/modules/encounters/code/nri_raiders.dm +++ b/modular_skyrat/modules/encounters/code/nri_raiders.dm @@ -57,7 +57,7 @@ GLOBAL_VAR(first_officer) . = ..() equipped.faction -= "pirate" equipped.faction |= "raider" - + // make sure we update the ID's name too var/obj/item/card/id/id_card = equipped.wear_id if(istype(id_card)) @@ -134,7 +134,7 @@ GLOBAL_VAR(first_officer) icon = 'modular_skyrat/modules/cryosleep/icons/cryogenics.dmi' icon_state = "cryopod" mob_species = /datum/species/human - faction = list("raider") + faction = list(FACTION_RAIDER) you_are_text = "You are a Novaya Rossiyskaya Imperiya task force." flavour_text = "The station has refused to pay the fine for breaking Imperial regulations, you are here to recover the debt. Do so by demanding the funds. Force approach is usually recommended, but isn't the only method." important_text = "Allowed races are humans, Akulas, IPCs. Follow your field officer's orders. Important mention - while you are listed as the pirates gamewise, you really aren't lore-and-everything-else-wise. Roleplay accordingly." @@ -147,7 +147,7 @@ GLOBAL_VAR(first_officer) var/callsign = pick(GLOB.callsigns_nri) var/number = pick(GLOB.phonetic_alphabet_numbers) spawned_human.fully_replace_character_name(null, "[callsign] [number]") - + /obj/effect/mob_spawn/ghost_role/human/nri_raider/special(mob/living/carbon/human/spawned_human) . = ..() spawned_human.grant_language(/datum/language/panslavic, TRUE, TRUE, LANGUAGE_SPAWNER) @@ -180,7 +180,7 @@ GLOBAL_VAR(first_officer) . = ..() spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_SPAWNER) spawned_human.grant_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_SPAWNER) - + // if this is the first officer, keep a reference to them if(!GLOB.first_officer) GLOB.first_officer = spawned_human @@ -228,7 +228,7 @@ GLOBAL_VAR(first_officer) desc = "An automatic defense turret designed for point-defense, it's probably not that wise to try approaching it." scan_range = 9 shot_delay = 3 - faction = list("raider") + faction = list(FACTION_RAIDER) icon = 'modular_skyrat/modules/encounters/icons/turrets.dmi' icon_state = "gun_turret" base_icon_state = "gun_turret" diff --git a/modular_skyrat/modules/mapping/code/interdyne_mining.dm b/modular_skyrat/modules/mapping/code/interdyne_mining.dm index 53e5e6a3967..dee18909635 100644 --- a/modular_skyrat/modules/mapping/code/interdyne_mining.dm +++ b/modular_skyrat/modules/mapping/code/interdyne_mining.dm @@ -30,4 +30,4 @@ /mob/living/simple_animal/hostile/mining_drone/interdyne name = "\improper Interdyne minebot" - faction = list("neutral", "Syndicate") + faction = list(FACTION_NEUTRAL, ROLE_SYNDICATE) diff --git a/modular_skyrat/modules/mapping/voidraptor/code/mob.dm b/modular_skyrat/modules/mapping/voidraptor/code/mob.dm index edcd5b7feae..101ebc1361d 100644 --- a/modular_skyrat/modules/mapping/voidraptor/code/mob.dm +++ b/modular_skyrat/modules/mapping/voidraptor/code/mob.dm @@ -9,7 +9,7 @@ emote_see = list("hisses.", "flicks its tongue.") health = 20 maxHealth = 20 - faction = list("Lizard") + faction = list(FACTION_LIZARD) attack_verb_continuous = "bites" attack_verb_simple = "bite" attack_sound = 'sound/weapons/bite.ogg' @@ -57,7 +57,7 @@ /mob/living/basic/carp/mega/shorki name = "Shorki" desc = "A not so ferocious, fang bearing creature that resembles a shark. This one seems a little big for its tank." - faction = list("neutral") + faction = list(FACTION_NEUTRAL) gender = MALE gold_core_spawnable = NO_SPAWN ai_controller = /datum/ai_controller/basic_controller/carp/pet @@ -90,7 +90,7 @@ name = "Wojtek" real_name = "Wojtek" desc = "The bearer of Bluespace Artillery." - faction = list("neutral") + faction = list(FACTION_NEUTRAL) gender = MALE /mob/living/simple_animal/chicken/teshari diff --git a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm index adca50c68c9..7d44214d35e 100644 --- a/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm +++ b/modular_skyrat/modules/novaya_ert/code/advanced_choice_beacon.dm @@ -112,7 +112,7 @@ span_danger("You bash [src] with [I]!"), null, COMBAT_MESSAGE_RANGE) playsound(src, "sound/items/drill_use.ogg", 80, TRUE, -1) var/obj/machinery/porta_turret/syndicate/pod/toolbox/nri/turret = new(get_turf(loc)) - turret.faction = list("neutral", FACTION_ERT) + turret.faction = list(FACTION_NEUTRAL, FACTION_ERT) qdel(src) ..() @@ -125,14 +125,14 @@ lethal_projectile = /obj/projectile/bullet/a762x39 max_integrity = 150 req_access = list(ACCESS_CENT_GENERAL) - faction = list("neutral", FACTION_ERT) + faction = list(FACTION_NEUTRAL, FACTION_ERT) shot_delay = 0.25 /obj/machinery/porta_turret/syndicate/pod/toolbox/nri/assess_perp(mob/living/carbon/human/perp) return 0 /mob/living/basic/viscerator/nri - faction = list("neutral", FACTION_ERT) + faction = list(FACTION_NEUTRAL, FACTION_ERT) /obj/item/grenade/spawnergrenade/manhacks/nri name = "imperial viscerator delivery grenade"