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:
kingofkosmos
2020-08-13 17:34:57 +03:00
committed by GitHub
parent c74590fd4d
commit 3263decaad
97 changed files with 484 additions and 260 deletions
+2 -1
View File
@@ -8,7 +8,8 @@
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "graft_plant"
worn_icon_state = "graft"
attack_verb = list("planted", "vegitized", "cropped", "reaped", "farmed")
attack_verb_continuous = list("plants", "vegitizes", "crops", "reaps", "farms")
attack_verb_simple = list("plant", "vegitize", "crop", "reap", "farm")
///The stored trait taken from the parent plant. Defaults to perenial growth.
var/datum/plant_gene/trait/stored_trait
///Determines the appearance of the graft. Rudimentary right now so it just picks randomly.
+4 -2
View File
@@ -28,7 +28,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 2
throw_range = 3
attack_verb = list("pomfed")
attack_verb_continuous = list("pomfs")
attack_verb_simple = list("pomf")
var/cotton_type = /obj/item/stack/sheet/cotton
var/cotton_name = "raw cotton"
@@ -75,6 +76,7 @@
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
cotton_type = /obj/item/stack/sheet/cotton/durathread
cotton_name = "raw durathread"
+2 -1
View File
@@ -249,7 +249,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
attack_verb = list("roasted", "scorched", "burned")
attack_verb_continuous = list("roasts", "scorches", "burns")
attack_verb_simple = list("roast", "scorch", "burn")
grind_results = list(/datum/reagent/consumable/capsaicin = 0, /datum/reagent/consumable/condensedcapsaicin = 0)
/obj/item/grown/novaflower/add_juice()
+2 -1
View File
@@ -46,7 +46,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
attack_verb = list("stung")
attack_verb_continuous = list("stings")
attack_verb_simple = list("sting")
/obj/item/reagent_containers/food/snacks/grown/nettle/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+2 -1
View File
@@ -22,7 +22,8 @@
force = 4
throwforce = 8
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("stung", "pined")
attack_verb_continuous = list("stings", "pines")
attack_verb_simple = list("sting", "pine")
throw_speed = 1
throw_range = 5
slice_path = /obj/item/reagent_containers/food/snacks/pineappleslice
@@ -30,7 +30,8 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 2
throw_range = 3
attack_verb = list("pompfed")
attack_verb_continuous = list("pompfs")
attack_verb_simple = list("pompf")
/obj/item/reagent_containers/food/snacks/grown/rainbow_flower/Initialize()
. = ..()
+2 -1
View File
@@ -43,7 +43,8 @@
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
var/plank_type = /obj/item/stack/sheet/mineral/wood
var/plank_name = "wooden planks"
var/static/list/accepted = typecacheof(list(/obj/item/reagent_containers/food/snacks/grown/tobacco,
+12 -6
View File
@@ -81,7 +81,8 @@
throwforce = 7
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=50)
attack_verb = list("slashed", "sliced", "cut", "clawed")
attack_verb_continuous = list("slashes", "slices", "cuts", "claws")
attack_verb_simple = list("slash", "slice", "cut", "claw")
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/cultivator/suicide_act(mob/user)
@@ -92,7 +93,8 @@
name = "rake"
icon_state = "rake"
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("slashed", "sliced", "bashed", "clawed")
attack_verb_continuous = list("slashes", "slices", "bashes", "claws")
attack_verb_simple = list("slash", "slice", "bash", "claw")
hitsound = null
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
flags_1 = NONE
@@ -125,7 +127,8 @@
throw_speed = 3
throw_range = 4
custom_materials = list(/datum/material/iron = 15000)
attack_verb = list("chopped", "tore", "lacerated", "cut")
attack_verb_continuous = list("chops", "tears", "lacerates", "cuts")
attack_verb_simple = list("chop", "tear", "lacerate", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
@@ -158,7 +161,8 @@
flags_1 = CONDUCT_1
armour_penetration = 20
slot_flags = ITEM_SLOT_BACK
attack_verb = list("chopped", "sliced", "cut", "reaped")
attack_verb_continuous = list("chops", "slices", "cuts", "reaps")
attack_verb_simple = list("chop", "slice", "cut", "reap")
hitsound = 'sound/weapons/bladeslice.ogg'
var/swiping = FALSE
@@ -205,7 +209,8 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
custom_materials = list(/datum/material/iron=4000)
attack_verb = list("slashed", "sliced", "cut", "clawed")
attack_verb_continuous = list("slashes", "slices", "cuts", "claws")
attack_verb_simple = list("slash", "slice", "cut", "claw")
hitsound = 'sound/weapons/bladeslice.ogg'
/obj/item/geneshears
@@ -223,7 +228,8 @@
slot_flags = ITEM_SLOT_BELT
material_flags = MATERIAL_NO_EFFECTS
custom_materials = list(/datum/material/iron=4000, /datum/material/uranium=1500, /datum/material/gold=500)
attack_verb = list("slashed", "sliced", "cut")
attack_verb_continuous = list("slashes", "slices", "cuts")
attack_verb_simple = list("slash", "slice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'