mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-11 01:13:18 +00:00
Personalized combat messages part 2 (#52890)
Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators
This commit is contained in:
@@ -16,7 +16,8 @@
|
||||
armour_penetration = 10
|
||||
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
attack_verb = list("smashed", "crushed", "cleaved", "chopped", "pulped")
|
||||
attack_verb_continuous = list("smashes", "crushes", "cleaves", "chops", "pulps")
|
||||
attack_verb_simple = list("smash", "crush", "cleave", "chop", "pulp")
|
||||
sharpness = SHARP_EDGED
|
||||
actions_types = list(/datum/action/item_action/toggle_light)
|
||||
obj_flags = UNIQUE_RENAME
|
||||
|
||||
@@ -16,7 +16,8 @@
|
||||
tool_behaviour = TOOL_MINING
|
||||
toolspeed = 1
|
||||
usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
|
||||
attack_verb = list("hit", "pierced", "sliced", "attacked")
|
||||
attack_verb_continuous = list("hits", "pierces", "slices", "attacks")
|
||||
attack_verb_simple = list("hit", "pierce", "slice", "attack")
|
||||
|
||||
/obj/item/pickaxe/suicide_act(mob/living/user)
|
||||
user.visible_message("<span class='suicide'>[user] begins digging into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!</span>")
|
||||
@@ -28,7 +29,8 @@
|
||||
/obj/item/pickaxe/rusted
|
||||
name = "rusty pickaxe"
|
||||
desc = "A pickaxe that's been left to rust."
|
||||
attack_verb = list("ineffectively hit")
|
||||
attack_verb_continuous = list("ineffectively hits")
|
||||
attack_verb_simple = list("ineffectively hit")
|
||||
force = 1
|
||||
throwforce = 1
|
||||
|
||||
@@ -133,7 +135,8 @@
|
||||
inhand_icon_state = "shovel"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
custom_materials = list(/datum/material/iron=50)
|
||||
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
|
||||
attack_verb_continuous = list("bashes", "bludgeons", "thrashes", "whacks")
|
||||
attack_verb_simple = list("bash", "bludgeon", "thrash", "whack")
|
||||
sharpness = SHARP_EDGED
|
||||
|
||||
/obj/item/shovel/Initialize()
|
||||
@@ -171,5 +174,6 @@
|
||||
throwforce = 12
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
toolspeed = 0.7
|
||||
attack_verb = list("slashed", "impaled", "stabbed", "sliced")
|
||||
attack_verb_continuous = list("slashes", "impales", "stabs", "slices")
|
||||
attack_verb_simple = list("slash", "impale", "stab", "slice")
|
||||
sharpness = SHARP_EDGED
|
||||
|
||||
@@ -707,8 +707,8 @@
|
||||
icon_state = "cleaving_saw"
|
||||
icon_state_on = "cleaving_saw_open"
|
||||
slot_flags = ITEM_SLOT_BELT
|
||||
attack_verb_off = list("attacked", "sawed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
|
||||
attack_verb_on = list("cleaved", "swiped", "slashed", "chopped")
|
||||
attack_verb_off = list("attacks", "saws", "slices", "tears", "lacerates", "rips", "dices", "cuts")
|
||||
attack_verb_on = list("cleaves", "swipes", "slashes", "chops")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound_on = 'sound/weapons/bladeslice.ogg'
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
@@ -823,7 +823,8 @@
|
||||
force = 1
|
||||
throwforce = 1
|
||||
hitsound = 'sound/effects/ghost2.ogg'
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended")
|
||||
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "rends")
|
||||
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "rend")
|
||||
var/summon_cooldown = 0
|
||||
var/list/mob/dead/observer/spirits
|
||||
|
||||
@@ -1140,7 +1141,8 @@
|
||||
slot_flags = ITEM_SLOT_BACK
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
force = 15
|
||||
attack_verb = list("clubbed", "beat", "pummeled")
|
||||
attack_verb_continuous = list("clubs", "beats", "pummels")
|
||||
attack_verb_simple = list("club", "beat", "pummel")
|
||||
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
|
||||
actions_types = list(/datum/action/item_action/vortex_recall, /datum/action/item_action/toggle_unfriendly_fire)
|
||||
var/cooldown_time = 20 //how long the cooldown between non-melee ranged attacks is
|
||||
|
||||
Reference in New Issue
Block a user