mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 21:57:53 +01:00
[MIRROR] ports a bunch of grep checks from TG (#10361)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
co-authored by
Kashargul
Cameron Lennox
Kashargul
Cameron Lennox
parent
21031b169b
commit
3cfc33bfde
@@ -17,10 +17,10 @@
|
||||
else
|
||||
forced_psay = autowhisper
|
||||
// to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled. You will now automatically psay/pme when using say/me. As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle" : "disabled"].")) // CHOMPEdit - Balloon alerts
|
||||
balloon_alert(src, "Autowhisper [autowhisper ? "enabled, using psay/pme" : "disabled"]")
|
||||
balloon_alert(src, "autowhisper [autowhisper ? "enabled, using psay/pme" : "disabled"]")
|
||||
else
|
||||
// to_chat(src, span_notice("Autowhisper has been [autowhisper ? "enabled. You will now automatically whisper/subtle when using say/me" : "disabled"].")) // CHOMPEdit - Balloon alerts
|
||||
balloon_alert(src, "Autowhisper [autowhisper ? "enabled" : "disabled"]")
|
||||
balloon_alert(src, "autowhisper [autowhisper ? "enabled" : "disabled"]")
|
||||
|
||||
/mob/living/verb/autowhisper_mode()
|
||||
set name = "Autowhisper Mode"
|
||||
@@ -32,7 +32,7 @@
|
||||
if(!choice || choice == "Adjacent Turfs (Default)")
|
||||
autowhisper_mode = null
|
||||
// to_chat(src, span_notice("Your subtles have returned to the default setting."))
|
||||
balloon_alert(src, "Subtles returned to default setting")
|
||||
balloon_alert(src, "subtles returned to default setting")
|
||||
return
|
||||
if(choice == "Psay/Pme")
|
||||
if(autowhisper)
|
||||
@@ -45,4 +45,4 @@
|
||||
to_chat(src, span_notice("As a note, this option will only work if you are in a situation where you can send psay/pme messages! Otherwise it will work as default whisper/subtle."))
|
||||
autowhisper_mode = choice
|
||||
// to_chat(src, span_notice("Your subtles have been set to <b>[autowhisper_mode]</b>.")) // CHOMPEdit - Balloon alerts
|
||||
balloon_alert(src, "Subtles set to [autowhisper_mode]")
|
||||
balloon_alert(src, "subtles set to [autowhisper_mode]")
|
||||
|
||||
@@ -193,8 +193,8 @@
|
||||
)
|
||||
|
||||
/datum/language/teshari/get_random_name(gender)
|
||||
return ..(gender, 1, 4, 1.5) //CHOMPedit: Keep "1" as the second argument because tesharii here typically omit the pack name (thus only use 1 name). This is because
|
||||
//CHOMPedit: there are very few packs and thus most tesharii would have the same first name.
|
||||
return ..(gender, 1, 4, 1.5) //CHOMPedit: Keep "1" as the second argument because tesharii here typically omit the pack name (thus only use 1 name). This is because
|
||||
//CHOMPedit: there are very few packs and thus most tesharii would have the same first name.
|
||||
|
||||
/datum/language/zaddat
|
||||
name = LANGUAGE_ZADDAT
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
if(feedback)
|
||||
if(status[1] == HUMAN_EATING_NO_MOUTH)
|
||||
// to_chat(src, "Where do you intend to put [food]? You don't have a mouth!")
|
||||
balloon_alert(src, "You don't have a mouth!") // CHOMPEdit - Changed to balloon alert
|
||||
balloon_alert(src, "you don't have a mouth!") // CHOMPEdit - Changed to balloon alert
|
||||
else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH)
|
||||
// to_chat(src, span_warning("\The [status[2]] is in the way!"))
|
||||
balloon_alert(src, "\The [status[2]] is in the way!") // CHOMPEdit - Changed to balloon alert
|
||||
balloon_alert(src, "\the [status[2]] is in the way!") // CHOMPEdit - Changed to balloon alert
|
||||
return 0
|
||||
|
||||
/mob/living/carbon/human/can_force_feed(var/feeder, var/food, var/feedback = 1)
|
||||
@@ -22,10 +22,10 @@
|
||||
if(feedback)
|
||||
if(status[1] == HUMAN_EATING_NO_MOUTH)
|
||||
// to_chat(feeder, "Where do you intend to put [food]? \The [src] doesn't have a mouth!")
|
||||
balloon_alert(src, "\The [src] doesn't have a mouth!") // CHOMPEdit - Changed to balloon alert
|
||||
balloon_alert(src, "\the [src] doesn't have a mouth!") // CHOMPEdit - Changed to balloon alert
|
||||
else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH)
|
||||
// to_chat(feeder, span_warning("\The [status[2]] is in the way!"))
|
||||
balloon_alert(feeder, "\The [status[2]] is in the way!") // CHOMPEdit - Changed to balloon alert
|
||||
balloon_alert(feeder, "\the [status[2]] is in the way!") // CHOMPEdit - Changed to balloon alert
|
||||
return 0
|
||||
|
||||
/mob/living/carbon/human/proc/can_eat_status()
|
||||
|
||||
@@ -92,4 +92,4 @@
|
||||
return "shadekin"
|
||||
|
||||
/datum/species/shadekin_yw/can_breathe_water()
|
||||
return TRUE //they dont quite breathe
|
||||
return TRUE //they dont quite breathe
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
return 1 //we are phased and applied all handling
|
||||
|
||||
else
|
||||
return 0 //we aren't phased ignore all
|
||||
return 0 //we aren't phased ignore all
|
||||
|
||||
@@ -326,7 +326,7 @@
|
||||
deform = 'icons/mob/human_races/r_def_lizard_vr.dmi'
|
||||
tail_animation = 'icons/mob/species/unathi/tail_vr.dmi'
|
||||
color_mult = 1
|
||||
min_age = 40 //ChompEDIT - Unathi lore minimal adult age.
|
||||
min_age = 40 //ChompEDIT - Unathi lore minimal adult age.
|
||||
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair)
|
||||
gluttonous = 0
|
||||
inherent_verbs = list(/mob/living/proc/shred_limb)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
if(text_output != last_taste_text || last_taste_time + 100 < world.time) //We dont want to spam the same message over and over again at the person. Give it a bit of a buffer.
|
||||
to_chat(src, span_notice("You can taste [text_output].")) //no taste means there are too many tastes and not enough flavor.
|
||||
balloon_alert(src, "You can taste [text_output].") // CHOMPEdit - Balloon alert
|
||||
balloon_alert(src, "you can taste [text_output].") // CHOMPEdit - Balloon alert
|
||||
|
||||
last_taste_time = world.time
|
||||
last_taste_text = text_output
|
||||
|
||||
@@ -448,4 +448,4 @@
|
||||
hud_used.persistant_inventory_update()
|
||||
update_action_buttons()
|
||||
hud_used.reorganize_alerts()
|
||||
return TRUE
|
||||
return TRUE
|
||||
|
||||
@@ -86,7 +86,7 @@
|
||||
reload_max = 1
|
||||
reload_count = 0
|
||||
reload_time = 7 SECONDS
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
|
||||
|
||||
@@ -87,4 +87,4 @@
|
||||
swarmling_type = /mob/living/simple_mob/animal/giant_spider/carrier/recursive
|
||||
|
||||
/mob/living/simple_mob/animal/giant_spider/carrier/event // YW CHANGE
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/event
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/event
|
||||
|
||||
@@ -62,4 +62,4 @@
|
||||
return ..() // Do ranged if possible otherwise.
|
||||
|
||||
/mob/living/simple_mob/animal/giant_spider/electric/event // YW CHANGE
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/event
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/event
|
||||
|
||||
@@ -179,4 +179,4 @@
|
||||
give_destination(move_to, min_distance = 2, combat = TRUE) // This will switch our stance.
|
||||
*/
|
||||
/mob/living/simple_mob/animal/giant_spider/hunter/event // YW CHANGE
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/event
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/event
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
name = "crystal-feather duck"
|
||||
desc = "A glittering flightless bird."
|
||||
tt_desc = "S Anatidae vitriae"
|
||||
catalogue_data = list(/datum/category_item/catalogue/fauna/crystalduck)
|
||||
catalogue_data = list(/datum/category_item/catalogue/fauna/crystalduck)
|
||||
|
||||
faction = FACTION_DUCK
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
meat_amount = 1
|
||||
|
||||
say_list_type = /datum/say_list/hare
|
||||
|
||||
|
||||
can_be_drop_prey = TRUE //CHOMP Add
|
||||
|
||||
/datum/say_list/hare
|
||||
|
||||
@@ -88,7 +88,7 @@
|
||||
say_list_type = /datum/say_list/crab
|
||||
|
||||
var/weaken_amount = 2 // Be careful with this number. High values will equal a permastun.
|
||||
|
||||
|
||||
|
||||
// Stuns the thing that got hit briefly.
|
||||
/mob/living/simple_mob/animal/sif/hooligan_crab/apply_melee_effects(atom/A)
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
say_list_type = /datum/say_list/siffet
|
||||
ai_holder_type = /datum/ai_holder/simple_mob/siffet
|
||||
|
||||
|
||||
|
||||
/datum/say_list/siffet
|
||||
speak = list("Yap!", "Heh!", "Huff.")
|
||||
@@ -64,4 +64,4 @@
|
||||
else
|
||||
if(!. && L.mob_size > 10) //Attacks things it considers small enough to take on, otherwise only attacks if attacked.
|
||||
return TRUE
|
||||
//CHOMPAdd END
|
||||
//CHOMPAdd END
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
meat_type = /obj/item/reagent_containers/food/snacks/xenomeat
|
||||
meat_amount = 5
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
/mob/living/simple_mob/animal/space/alien/drone
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
say_list_type = /datum/say_list/mouse // Close enough
|
||||
|
||||
var/scare_chance = 15
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
/mob/living/simple_mob/animal/space/bats/apply_melee_effects(var/atom/A)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
name = "domesticated goose"
|
||||
desc = "It's a domesticated goose. It still looks pretty angry."
|
||||
faction = "neutral" //Mess with this and the goose will eat anyones face, will eat other factions faces, appropiate considering its a hellbird - Jack
|
||||
|
||||
|
||||
can_be_drop_prey = TRUE //CHOMP Add
|
||||
|
||||
/mob/living/simple_mob/animal/space/goose/domesticated/casino
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
|
||||
emote_see = list("blinks its many eyes", "shakes violently in place", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
|
||||
emote_see = list("flexes to no one in particular", "shakes violently in place", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
|
||||
emote_see = list("squeezes its fingers together", "shakes violently in place", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -61,4 +61,4 @@
|
||||
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
|
||||
emote_see = list("blinks aggressively at", "shakes violently in place", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
emote_hear = list("shrieks horrifically", "groans in pain", "cries", "whines")
|
||||
emote_see = list("headbobs", "shakes violently in place", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
emote_hear = list("shrieks through its skin", "groans in pain", "creaks", "clanks")
|
||||
emote_see = list("taps its limbs against the ground", "shakes", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -54,4 +54,4 @@
|
||||
emote_hear = list("shrieks", "groans in pain", "breathes heavily", "gnashes its teeth")
|
||||
emote_see = list("wiggles its head", "shakes violently", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
emote_hear = list("shrieks", "groans in pain", "flaps", "gnashes its teeth")
|
||||
emote_see = list("jiggles its teeth", "shakes violently", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
emote_hear = list("shrieks", "groans in pain", "flaps", "gnashes its teeth")
|
||||
emote_see = list("jiggles its teeth", "shakes violently", "stares aggressively")
|
||||
say_maybe_target = list("Uuurrgghhh?")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
say_got_target = list("AAAHHHHH!")
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
taser_kill = FALSE
|
||||
poison_resist = 1.0
|
||||
shock_resist = -0.5
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
/mob/living/simple_mob/mechanical/isSynthetic()
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
)
|
||||
|
||||
has_langs = list(LANGUAGE_ANIMAL)
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
/mob/living/simple_mob/animal/passive/honkpet/attack_hand(mob/living/user as mob)
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
"catgirlblack",
|
||||
"catgirlbrown"
|
||||
)
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
faction = FACTION_CATGIRL
|
||||
|
||||
@@ -86,4 +86,4 @@
|
||||
icon_dead = "dead"
|
||||
icon_rest = null
|
||||
|
||||
vore_icons = null
|
||||
vore_icons = null
|
||||
|
||||
@@ -86,4 +86,4 @@
|
||||
icon_dead = "dead"
|
||||
icon_rest = null
|
||||
|
||||
vore_icons = null
|
||||
vore_icons = null
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
|
||||
melee_damage_lower = 8
|
||||
melee_damage_upper = 8
|
||||
attack_armor_pen = 0
|
||||
attack_armor_pen = 0
|
||||
|
||||
armor = list(
|
||||
"melee" = 10,
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
response_harm = "hits"
|
||||
|
||||
say_list_type = /datum/say_list/clown
|
||||
|
||||
|
||||
can_be_drop_prey = FALSE //CHOMP Add
|
||||
|
||||
/datum/say_list/clown
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
"organ_multiplier" = list(BP_HEAD = 4, BP_TORSO = 3.5, BP_GROIN = 2.5)/*Only used for simple mobs*/, \
|
||||
"flesh_factors" = list("damage_mult" = 1,"velloss_mult" = 1))
|
||||
|
||||
/mob/living/simple_mob/animal/giant_spider
|
||||
/mob/living/simple_mob/animal/giant_spider
|
||||
//Spiders have an exoskeleton and no internal skeleton, so there'll be just 97% chance of hitting bone (3% for stuff like eyes and orifices), but the bone is much easier to punch through.
|
||||
ballistic_variables = list(\
|
||||
"bone_chance_unencased" = list(BP_HEAD = 97, BP_TORSO = 97, BP_GROIN = 97, BP_L_FOOT = 97, BP_R_FOOT = 97, BP_L_LEG = 97, BP_R_LEG = 97, BP_L_ARM = 97, BP_R_ARM = 97, BP_L_HAND = 97, BP_R_HAND = 97), \
|
||||
|
||||
Reference in New Issue
Block a user