cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Personalized combat messages part 2 (#52890)

Browse Source 
Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators
This commit is contained in:
kingofkosmos
2020-08-13 11:34:57 -03:00
committed by GitHub
parent c74590fd4d
commit 3263decaad
97 changed files with 484 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weaponry.dm
+46 -23
View File
@@ -9,7 +9,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
attack_verb = list("banned")
attack_verb_continuous = list("bans")
attack_verb_simple = list("ban")
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
@@ -43,7 +44,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 1
w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
/obj/item/sord/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.</span>", \
@@ -63,7 +65,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 40
throwforce = 10
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_chance = 50
sharpness = SHARP_EDGED
max_integrity = 200
@@ -85,7 +88,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
slot_flags = null
block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY
light_range = 3
attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
attack_verb_continuous = list("brutalizes", "eviscerates", "disembowels", "hacks", "carves", "cleaves") //ONLY THE MOST VISCERAL ATTACK VERBS
attack_verb_simple = list("brutalize", "eviscerate", "disembowel", "hack", "carve", "cleave")
var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
@@ -217,7 +221,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 10
w_class = WEIGHT_CLASS_HUGE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
block_chance = 50
sharpness = SHARP_EDGED
max_integrity = 200
@@ -252,7 +257,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 10
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=75)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
attack_verb_continuous = list("hits", "bludgeons", "whacks", "bonks")
attack_verb_simple = list("hit", "bludgeon", "whack", "bonk")
/obj/item/wirerod/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/shard))
@@ -322,7 +328,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 25 //kills regular carps in one hit
force = 10
throw_range = 0 //throwing these invalidates the speargun
attack_verb = list("stabbed", "ripped", "gored", "impaled")
attack_verb_continuous = list("stabs", "rips", "gores", "impales")
attack_verb_simple = list("stab", "rip", "gore", "impale")
embedding = list("pain_mult" = 8, "embed_chance" = 100, "fall_chance" = 0, "impact_pain_mult" = 15) //55 damage+embed on hit
/obj/item/switchblade
@@ -339,7 +346,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 6
custom_materials = list(/datum/material/iron=12000)
hitsound = 'sound/weapons/genhit.ogg'
attack_verb = list("stubbed", "poked")
attack_verb_continuous = list("stubs", "pokes")
attack_verb_simple = list("stub", "poke")
resistance_flags = FIRE_PROOF
var/extended = 0
@@ -351,7 +359,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_NORMAL
throwforce = 23
icon_state = "switchblade_ext"
attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
else
@@ -359,7 +368,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
w_class = WEIGHT_CLASS_SMALL
throwforce = 5
icon_state = "switchblade"
attack_verb = list("stubbed", "poked")
attack_verb_continuous = list("stubs", "pokes")
attack_verb_simple = list("stub", "poke")
hitsound = 'sound/weapons/genhit.ogg'
sharpness = SHARP_NONE
@@ -377,7 +387,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_speed = 3
throw_range = 4
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("called", "rang")
attack_verb_continuous = list("calls", "rings")
attack_verb_simple = list("call", "ring")
hitsound = 'sound/weapons/ring.ogg'
/obj/item/phone/suicide_act(mob/user)
@@ -399,7 +410,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
attack_verb_continuous = list("bludgeons", "whacks", "disciplines", "thrashes")
attack_verb_simple = list("bludgeon", "whack", "discipline", "thrash")
/obj/item/staff
name = "wizard staff"
@@ -414,7 +426,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
armour_penetration = 100
attack_verb = list("bludgeoned", "whacked", "disciplined")
attack_verb_continuous = list("bludgeons", "whacks", "disciplines")
attack_verb_simple = list("bludgeon", "whack", "discipline")
resistance_flags = FLAMMABLE
/obj/item/staff/broom
@@ -467,7 +480,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 0
throw_speed = 0
sharpness = SHARP_EDGED
attack_verb = list("sawed", "tore", "lacerated", "cut", "chopped", "diced")
attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
hitsound = 'sound/weapons/chainsawhit.ogg'
tool_behaviour = TOOL_SAW
toolspeed = 1
@@ -497,7 +511,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 10
throw_speed = 5
throw_range = 2
attack_verb = list("busted")
attack_verb_continuous = list("busts")
attack_verb_simple = list("bust")
var/impressiveness = 45
/obj/item/statuebust/Initialize()
@@ -519,7 +534,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 1 // why are you throwing a club do you even weapon
throw_speed = 1
throw_range = 1
attack_verb = list("clubbed", "bludgeoned")
attack_verb_continuous = list("clubs", "bludgeons")
attack_verb_simple = list("club", "bludgeon")
/obj/item/melee/chainofcommand/tailwhip
name = "liz o' nine tails"
@@ -542,7 +558,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 12
throwforce = 4
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("smacked", "whacked", "slammed", "smashed")
attack_verb_continuous = list("smacks", "whacks", "slams", "smashes")
attack_verb_simple = list("smack", "whack", "slam", "smash")
///The vehicle counterpart for the board
var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
@@ -585,7 +602,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 10
wound_bonus = -10
throwforce = 12
attack_verb = list("beat", "smacked")
attack_verb_continuous = list("beats", "smacks")
attack_verb_simple = list("beat", "smack")
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 3.5)
w_class = WEIGHT_CLASS_HUGE
var/homerun_ready = 0
@@ -654,7 +672,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
force = 1
throwforce = 1
attack_verb = list("swatted", "smacked")
attack_verb_continuous = list("swats", "smacks")
attack_verb_simple = list("swat", "smack")
hitsound = 'sound/effects/snap.ogg'
w_class = WEIGHT_CLASS_SMALL
//Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc.
@@ -690,7 +709,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 0
throwforce = 0
item_flags = DROPDEL | ABSTRACT | HAND_ITEM
attack_verb = list("bopped")
attack_verb_continuous = list("bops")
attack_verb_simple = list("bop")
/obj/item/circlegame/Initialize()
. = ..()
@@ -790,7 +810,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 0
throwforce = 0
item_flags = DROPDEL | ABSTRACT | HAND_ITEM
attack_verb = list("slapped")
attack_verb_continuous = list("slaps")
attack_verb_simple = list("slap")
hitsound = 'sound/effects/snap.ogg'
/obj/item/slapper/attack(mob/M, mob/living/carbon/human/user)
@@ -839,7 +860,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 5
throwforce = 5
hitsound = "swing_hit"
attack_verb = list("whacked", "thwacked", "walloped", "socked")
attack_verb_continuous = list("whacks", "thwacks", "wallops", "socks")
attack_verb_simple = list("whack", "thwack", "wallop", "sock")
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "gohei"
inhand_icon_state = "gohei"
@@ -859,7 +881,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throwforce = 20
throw_speed = 4
sharpness = SHARP_EDGED
attack_verb = list("cut", "sliced", "diced")
attack_verb_continuous = list("cuts", "slices", "dices")
attack_verb_simple = list("cut", "slice", "dice")
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
hitsound = 'sound/weapons/bladeslice.ogg'