mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] intent cleanup (#9778)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
667c3c4c13
commit
16d5b45148
@@ -101,7 +101,7 @@
|
||||
if(CHECK_MOVE_LOOP_FLAGS(owner, MOVEMENT_LOOP_OUTSIDE_CONTROL))
|
||||
return
|
||||
*/
|
||||
if(running == "walk")
|
||||
if(running == I_WALK)
|
||||
running = 0.25
|
||||
else
|
||||
running = 1
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
var/mob/living/carbon/carbon_source = source
|
||||
if(!carbon_source.get_organ(BP_L_LEG) && !carbon_source.get_organ(BP_R_LEG))
|
||||
return
|
||||
if(carbon_source.m_intent == "walk")
|
||||
if(carbon_source.m_intent == I_WALK)
|
||||
return// stealth
|
||||
steps_for_living[source] += 1
|
||||
var/steps = steps_for_living[source]
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
|
||||
if(ishuman(source))
|
||||
var/mob/living/carbon/human/source_human = source
|
||||
if(source_human.m_intent == "walk" && step_count++ % 20 == 0)
|
||||
if(source_human.m_intent == I_WALK && step_count++ % 20 == 0)
|
||||
return
|
||||
if(source_human.m_intent == "run" && step_count++ % 2 != 0)
|
||||
if(source_human.m_intent == I_RUN && step_count++ % 2 != 0)
|
||||
return
|
||||
choose_vorefootstep(source)
|
||||
if(issilicon(source))
|
||||
@@ -75,7 +75,7 @@
|
||||
if(ishuman(source))
|
||||
var/mob/living/carbon/human/human_source = source
|
||||
|
||||
if(!human_source.shoes || human_source.m_intent == "walk")
|
||||
if(!human_source.shoes || human_source.m_intent == I_WALK)
|
||||
volume = CONFIG_GET(number/vorefootstep_volume) * (vore_footstep_volume/100) * 0.75
|
||||
else if(human_source.shoes)
|
||||
var/obj/item/clothing/shoes/feet = human_source.shoes
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
return
|
||||
if(istype(AM, /mob/living))
|
||||
var/mob/living/M = AM
|
||||
if(M.m_intent == "run" && prob(5))
|
||||
if(M.m_intent == I_RUN && prob(5))
|
||||
M.Weaken(2)
|
||||
to_chat(M, "You trip over the [src]!")
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
switch(pred.a_intent)
|
||||
if(I_HELP)
|
||||
if(prob(10)) //Reducing spam exclusively on I_HELP. Still more frequent than old pitiful prob(1)
|
||||
if(pred.m_intent == "run")
|
||||
if(pred.m_intent == I_RUN)
|
||||
message_prey = pick(
|
||||
"You feel weightless for a brief moment as \the [name] move upwards.",
|
||||
"[pred]'s weight bears down on you with each of their steps.",
|
||||
@@ -61,7 +61,7 @@
|
||||
return //No message for pred if I_HELP
|
||||
|
||||
if(I_DISARM)
|
||||
if(pred.m_intent == "run")
|
||||
if(pred.m_intent == I_RUN)
|
||||
message_pred = "You step on [prey], squishing and pinning them within your [name]!"
|
||||
message_prey = "[pred] steps on you, squishing and pinning you within their [name]!"
|
||||
else
|
||||
@@ -71,7 +71,7 @@
|
||||
add_attack_logs(pred, prey, "Pinned inshoe (walk, weaken(5))")
|
||||
|
||||
if(I_GRAB)
|
||||
if(pred.m_intent == "run")
|
||||
if(pred.m_intent == I_RUN)
|
||||
message_pred = "You step down onto [prey], squishing and trapping them inbetween your toes!"
|
||||
message_prey = "[pred] steps down on you, squishing and trapping you inbetween their toes!"
|
||||
else
|
||||
@@ -89,7 +89,7 @@
|
||||
//Assuming regular micro pickup sizes outside dorms, size_damage multiplier should range from .25 to 1.75... right?
|
||||
var/damage = (rand(5, 15) * size_damage_multiplier) / 10 // This will sting, but not kill unless pred walks. Will range from .125 to 2.625 damage, randomly, to each limb
|
||||
|
||||
if(pred.m_intent == "run")
|
||||
if(pred.m_intent == I_RUN)
|
||||
message_pred = "You carelessly step down onto [prey], crushing them within your [name]!"
|
||||
message_prey = "[pred] steps carelessly on your body, crushing you within their [name]!"
|
||||
add_attack_logs(pred, prey, "Crushed inshoe (run, about [damage] damage per limb)")
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
/mob/living/silicon/robot/handle_footstep(var/turf/T)
|
||||
if(step_count++ % 2)
|
||||
check_vorefootstep("run", T) //CHOMPstation edit: sloshing reagent belly walk system
|
||||
check_vorefootstep(I_RUN, T) //CHOMPstation edit: sloshing reagent belly walk system
|
||||
|
||||
// Handle footstep sounds
|
||||
/mob/living/silicon/robot/handle_vorefootstep(var/m_intent, var/turf/T)
|
||||
|
||||
@@ -250,7 +250,7 @@ ANT STRUCTURES
|
||||
var/mob/living/L = AM
|
||||
if(L == /mob/living/simple_mob/animal/tyr/mineral_ants)
|
||||
return
|
||||
else if(L.m_intent == "run")
|
||||
else if(L.m_intent == I_RUN)
|
||||
L.visible_message(
|
||||
span_danger("[L] steps in \the [src]."),
|
||||
span_danger("You step in \the [src]!"),
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
icon_living = "bhotie"
|
||||
icon_dead = "bhotie-dead"
|
||||
icon_rest = "bhotie-dead"
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
maxHealth = 200
|
||||
health = 200
|
||||
minbodytemp = 200
|
||||
@@ -95,7 +95,7 @@
|
||||
to_chat(L, span_danger("\The [src] focuses on you!"))
|
||||
|
||||
do_windup_animation(A, leap_warmup)
|
||||
|
||||
|
||||
addtimer(CALLBACK(src, PROC_REF(doLeap), L), leap_warmup, TIMER_DELETE_ME)
|
||||
return TRUE
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
name = "Black Hole fanatic"
|
||||
desc = "A tough looking armored feline creature. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "trooper-dead"
|
||||
icon_living = "trooper"
|
||||
icon_state = "trooper"
|
||||
@@ -192,7 +192,7 @@
|
||||
name = "Black Hole bulwark"
|
||||
desc = "A tough looking armored feline creature armed with a shield and an energy lance. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "trooper-dead"
|
||||
icon_living = "trooper_shield"
|
||||
icon_state = "trooper_shield"
|
||||
@@ -220,7 +220,7 @@
|
||||
name = "grotesque"
|
||||
desc = "A horribly mutated, pale creature, poorly morphed into some hyperaggressive feline abomination. This is what tends to happen to those that Black Hole take prisoner-- Cannonfodder."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "grotesque-dead"
|
||||
icon_living = "grotesque"
|
||||
icon_state = "grotesque"
|
||||
@@ -247,7 +247,7 @@
|
||||
name = "Black Hole trooper"
|
||||
desc = "A tough looking armored feline creature armed with a pistol. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "trooper-dead"
|
||||
icon_living = "trooper_pistol"
|
||||
icon_state = "trooper_pistol"
|
||||
@@ -265,7 +265,7 @@
|
||||
name = "Black Hole gunner"
|
||||
desc = "A tough looking armored feline creature armed with an SMG. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "trooper-dead"
|
||||
icon_living = "trooper_smg"
|
||||
icon_state = "trooper_smg"
|
||||
@@ -283,7 +283,7 @@
|
||||
name = "Black Hole rifleman"
|
||||
desc = "A tough looking armored feline creature armed with a rifle. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "trooper-dead"
|
||||
icon_living = "trooper_rifle"
|
||||
icon_state = "trooper_rifle"
|
||||
@@ -301,7 +301,7 @@
|
||||
name = "Black Hole machinegunner"
|
||||
desc = "A tough looking armored feline creature armed with a light machinegun. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "trooper-dead"
|
||||
icon_living = "trooper_lmg"
|
||||
icon_state = "trooper_lmg"
|
||||
@@ -323,7 +323,7 @@
|
||||
name = "Black Hole fanatic"
|
||||
desc = "A tough looking armored feline taur. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole64x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "heavytrooper-dead"
|
||||
icon_living = "heavytrooper"
|
||||
icon_state = "heavytrooper"
|
||||
@@ -396,7 +396,7 @@
|
||||
name = "Black Hole machinegunner"
|
||||
desc = "A tough looking armored feline taur wielding a light machinegun. They wear various insignias identifying them as a member of Black Hole."
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole64x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "heavytrooper-dead"
|
||||
icon_living = "heavytrooper_lmg"
|
||||
icon_state = "heavytrooper_lmg"
|
||||
@@ -435,7 +435,7 @@
|
||||
icon_rest = "heavytrooper_sniper"
|
||||
projectiletype = /obj/item/projectile/bullet/rifle/a145/highvel // Really scary bullet.
|
||||
projectilesound = 'sound/weapons/serdy/molniyab.ogg'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
movement_cooldown = 0
|
||||
harm_intent_damage = 5
|
||||
melee_damage_lower = 15
|
||||
@@ -525,7 +525,7 @@
|
||||
name = "Black Hole mechanized troopers"
|
||||
desc = "A pair of armed Black Hole troops riding an armored motorcycle. Watch out!"
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole64x64.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_dead = "bikeus"
|
||||
icon_living = "bikeus"
|
||||
icon_state = "bikeus"
|
||||
@@ -590,7 +590,7 @@
|
||||
It also is armed with an array of next-generation weaponry."
|
||||
catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/blackhole)
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_living = "mech2"
|
||||
icon_state = "mech2"
|
||||
icon_rest = "mech2"
|
||||
@@ -623,7 +623,7 @@
|
||||
desc = "A robust, advanced exosuit of Black Hole design, utilizing highly dangerous tesla weaponry."
|
||||
catalogue_data = list(/datum/category_item/catalogue/fauna/mercenary/blackhole)
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole32x32.dmi'
|
||||
faction = "blackhole"
|
||||
faction = FACTION_BLACKHOLE
|
||||
icon_living = "mech1"
|
||||
icon_state = "mech1"
|
||||
icon_rest = "mech1"
|
||||
@@ -684,8 +684,8 @@ GLOBAL_LIST_INIT(obelisk_lure_messages, list(
|
||||
icon_living = "obelisk"
|
||||
icon_dead = "obelisk-dead"
|
||||
icon = 'modular_chomp/icons/blackhole/blackhole64x64.dmi'
|
||||
faction = "blackhole"
|
||||
a_intent = "harm"
|
||||
faction = FACTION_BLACKHOLE
|
||||
a_intent = I_HURT
|
||||
anchored = 1
|
||||
maxHealth = 400
|
||||
health = 400
|
||||
|
||||
Reference in New Issue
Block a user