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

[MIRROR] Personalized combat messages part 2 (#334)

Browse Source 
* Personalized combat messages part 2 (#52890)

Adds more "personalized" combat messages for all participants in a fight: the attacker, the victim and the spectators

* Personalized combat messages part 2

* Update misc.dm

Co-authored-by: kingofkosmos <riki.sundberg@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2020-08-14 23:29:15 +02:00
committed by GitHub
co-authored by kingofkosmos Gandalf
parent d1d7c2378e
commit 49f7becb88
98 changed files with 484 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+6 -3
View File
@@ -128,7 +128,8 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/breakouttime = 0
///Used in [atom/proc/attackby] to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/list/attack_verb
var/list/attack_verb_continuous
var/list/attack_verb_simple
///list() of species types, if a species cannot put items in a certain slot, but species type is in list, it will be able to wear that item
var/list/species_exception = null
@@ -189,8 +190,10 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/obj/item/Initialize()
if(attack_verb)
attack_verb = typelist("attack_verb", attack_verb)
if(attack_verb_continuous)
attack_verb_continuous = typelist("attack_verb_continuous", attack_verb_continuous)
if(attack_verb_simple)
attack_verb_simple = typelist("attack_verb_simple", attack_verb_simple)
. = ..()
for(var/path in actions_types)
code/game/objects/items/blueprints.dm
+2 -1
View File
@@ -7,7 +7,8 @@
name = "area modification item"
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
attack_verb_continuous = list("attacks", "baps", "hits")
attack_verb_simple = list("attack", "bap", "hit")
var/fluffnotice = "Nobody's gonna read this stuff!"
var/in_use = FALSE
code/game/objects/items/broom.dm
+2 -1
View File
@@ -13,7 +13,8 @@
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("swept", "brushed off", "bludgeoned", "whacked")
attack_verb_continuous = list("sweeps", "brushes off", "bludgeons", "whacks")
attack_verb_simple = list("sweep", "brush off", "bludgeon", "whack")
resistance_flags = FLAMMABLE
/obj/item/pushbroom/Initialize()
code/game/objects/items/chainsaw.dm
+2 -1
View File
@@ -14,7 +14,8 @@
throw_speed = 2
throw_range = 4
custom_materials = list(/datum/material/iron=13000)
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 = "swing_hit"
sharpness = SHARP_EDGED
actions_types = list(/datum/action/item_action/startchainsaw)
code/game/objects/items/cigs_lighters.dm
+12 -6
View File
@@ -48,7 +48,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
inhand_icon_state = "cigon"
name = "lit [initial(name)]"
desc = "A [initial(name)]. This one is lit."
attack_verb = list("burnt","singed")
attack_verb_continuous = list("burns", "sings")
attack_verb_simple = list("burn", "sing")
START_PROCESSING(SSobj, src)
update_icon()
@@ -62,7 +63,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
inhand_icon_state = "cigoff"
name = "burnt [initial(name)]"
desc = "A [initial(name)]. This one has seen better days."
attack_verb = list("flicked")
attack_verb_continuous = list("flicks")
attack_verb_simple = list("flick")
STOP_PROCESSING(SSobj, src)
/obj/item/match/extinguish()
@@ -184,7 +186,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lit = TRUE
name = "lit [name]"
attack_verb = list("burnt", "singed")
attack_verb_continuous = list("burns", "sings")
attack_verb_simple = list("burn", "sing")
hitsound = 'sound/items/welder.ogg'
damtype = "fire"
force = 4
@@ -220,7 +223,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(!lit)
return
name = copytext_char(name, 5) //5 == length_char("lit ") + 1
attack_verb = null
attack_verb_continuous = null
attack_verb_simple = null
hitsound = null
damtype = BRUTE
force = 0
@@ -668,13 +672,15 @@ CIGARETTE PACKETS ARE IN FANCY.DM
force = 5
damtype = "fire"
hitsound = 'sound/items/welder.ogg'
attack_verb = list("burnt", "singed")
attack_verb_continuous = list("burns", "sings")
attack_verb_simple = list("burn", "sing")
set_light(1)
START_PROCESSING(SSobj, src)
else
hitsound = "swing_hit"
force = 0
attack_verb = null //human_defense.dm takes care of it
attack_verb_continuous = null //human_defense.dm takes care of it
attack_verb_simple = null
set_light(0)
STOP_PROCESSING(SSobj, src)
update_icon()
code/game/objects/items/clown_items.dm
+2 -1
View File
@@ -173,7 +173,8 @@
slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT
throw_speed = 3
throw_range = 7
attack_verb = list("HONKED")
attack_verb_continuous = list("HONKS")
attack_verb_simple = list("HONK")
/obj/item/bikehorn/Initialize()
. = ..()
code/game/objects/items/courtroom.dm
+2 -1
View File
@@ -10,7 +10,8 @@
force = 5
throwforce = 6
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("bashed", "battered", "judged", "whacked")
attack_verb_continuous = list("bashes", "batters", "judges", "whacks")
attack_verb_simple = list("bash", "batter", "judge", "whack")
resistance_flags = FLAMMABLE
/obj/item/gavelhammer/suicide_act(mob/user)
code/game/objects/items/crab17.dm
+2 -1
View File
@@ -4,7 +4,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "suspiciousphone"
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("dumped")
attack_verb_continuous = list("dumps")
attack_verb_simple = list("dump")
var/dumped = FALSE
/obj/item/suspiciousphone/attack_self(mob/user)
code/game/objects/items/crayons.dm
+2 -1
View File
@@ -28,7 +28,8 @@
var/crayon_color = "red"
w_class = WEIGHT_CLASS_TINY
attack_verb = list("attacked", "coloured")
attack_verb_continuous = list("attacks", "colours")
attack_verb_simple = list("attack", "colour")
grind_results = list()
var/paint_color = "#FF0000" //RGB
code/game/objects/items/devices/instruments.dm
+14 -7
View File
@@ -130,7 +130,8 @@
icon_state = "banjo"
inhand_icon_state = "banjo"
instrumentExt = "ogg"
attack_verb = list("scruggs-styled", "hum-diggitied", "shin-digged", "clawhammered")
attack_verb_continuous = list("scruggs-styles", "hum-diggitys", "shin-digs", "clawhammers")
attack_verb_simple = list("scruggs-style", "hum-diggity", "shin-dig", "clawhammer")
hitsound = 'sound/weapons/banjoslap.ogg'
instrumentId = "banjo"
@@ -140,7 +141,8 @@
icon_state = "guitar"
inhand_icon_state = "guitar"
instrumentExt = "ogg"
attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
attack_verb_continuous = list("plays metal on", "serenades", "crashes", "smashes")
attack_verb_simple = list("play metal on", "serenade", "crash", "smash")
hitsound = 'sound/weapons/stringsmash.ogg'
instrumentId = "guitar"
@@ -150,7 +152,8 @@
icon_state = "eguitar"
inhand_icon_state = "eguitar"
force = 12
attack_verb = list("played metal on", "shredded", "crashed", "smashed")
attack_verb_continuous = list("plays metal on", "shreds", "crashes", "smashes")
attack_verb_simple = list("play metal on", "shred", "crash", "smash")
hitsound = 'sound/weapons/stringsmash.ogg'
instrumentId = "eguitar"
instrumentExt = "ogg"
@@ -183,7 +186,8 @@
inhand_icon_state = "spectral_trumpet"
force = 0
instrumentId = "trombone"
attack_verb = list("played","jazzed","trumpeted","mourned","dooted","spooked")
attack_verb_continuous = list("plays", "jazzes", "trumpets", "mourns", "doots", "spooks")
attack_verb_simple = list("play", "jazz", "trumpet", "mourn", "doot", "spook")
/obj/item/instrument/trumpet/spectral/Initialize()
. = ..()
@@ -207,7 +211,8 @@
inhand_icon_state = "saxophone"
instrumentId = "saxophone"
force = 0
attack_verb = list("played","jazzed","saxxed","mourned","dooted","spooked")
attack_verb_continuous = list("plays", "jazzes", "saxxes", "mourns", "doots", "spooks")
attack_verb_simple = list("play", "jazz", "sax", "mourn", "doot", "spook")
/obj/item/instrument/saxophone/spectral/Initialize()
. = ..()
@@ -231,7 +236,8 @@
icon_state = "trombone"
inhand_icon_state = "trombone"
force = 0
attack_verb = list("played","jazzed","tromboned","mourned","dooted","spooked")
attack_verb_continuous = list("plays", "jazzes", "trombones", "mourns", "doots", "spooks")
attack_verb_simple = list("play", "jazz", "trombone", "mourn", "doot", "spook")
/obj/item/instrument/trombone/spectral/Initialize()
. = ..()
@@ -280,7 +286,8 @@
inhand_icon_state = "bike_horn"
lefthand_file = 'icons/mob/inhands/equipment/horns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/horns_righthand.dmi'
attack_verb = list("beautifully honks")
attack_verb_continuous = list("beautifully honks")
attack_verb_simple = list("beautifully honk")
instrumentId = "bikehorn"
instrumentExt = "ogg"
w_class = WEIGHT_CLASS_TINY
code/game/objects/items/devices/traitordevices.dm
+2 -1
View File
@@ -188,7 +188,8 @@ effective or pretty fucking useless.
inhand_icon_state = "utility"
worn_icon_state = "utility"
slot_flags = ITEM_SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
attack_verb_continuous = list("whips", "lashes", "disciplines")
attack_verb_simple = list("whip", "lash", "discipline")
var/mob/living/carbon/human/user = null
var/charge = 300
code/game/objects/items/dualsaber.dm
+2 -1
View File
@@ -17,7 +17,8 @@
hitsound = "swing_hit"
armour_penetration = 35
light_color = LIGHT_COLOR_ELECTRIC_GREEN
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 = 75
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
code/game/objects/items/extinguisher.dm
+2 -1
View File
@@ -12,7 +12,8 @@
throw_range = 7
force = 10
custom_materials = list(/datum/material/iron = 90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
attack_verb_continuous = list("slams", "whacks", "bashes", "thunks", "batters", "bludgeons", "thrashes")
attack_verb_simple = list("slam", "whack", "bash", "thunk", "batter", "bludgeon", "thrash")
dog_fashion = /datum/dog_fashion/back
resistance_flags = FIRE_PROOF
var/max_water = 50
code/game/objects/items/fireaxe.dm
+2 -1
View File
@@ -11,7 +11,8 @@
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
attack_verb = list("attacked", "chopped", "cleaved", "tore", "lacerated", "cut")
attack_verb_continuous = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts")
attack_verb_simple = list("attack", "chop", "cleave", "tear", "lacerate", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
max_integrity = 200
code/game/objects/items/grenades/festive.dm
+2 -1
View File
@@ -30,7 +30,8 @@
force = 6
hitsound = 'sound/items/welder.ogg'
name = "lit [initial(name)]"
attack_verb = list("burnt")
attack_verb_continuous = list("burns")
attack_verb_simple = list("burn")
set_light(l_range = 2, l_power = 2)
damtype = "fire"
START_PROCESSING(SSobj, src)
code/game/objects/items/his_grace.dm
+2 -1
View File
@@ -14,7 +14,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
w_class = WEIGHT_CLASS_GIGANTIC
force = 12
attack_verb = list("robusted")
attack_verb_continuous = list("robusts")
attack_verb_simple = list("robust")
hitsound = 'sound/weapons/smash.ogg'
var/awakened = FALSE
var/bloodthirst = HIS_GRACE_SATIATED
code/game/objects/items/holy_weapons.dm
+42 -21
View File
@@ -276,7 +276,8 @@
w_class = WEIGHT_CLASS_HUGE
hitsound = 'sound/weapons/sear.ogg'
damtype = BURN
attack_verb = list("punched", "cross countered", "pummeled")
attack_verb_continuous = list("punches", "cross counters", "pummels")
attack_verb_simple = list("punch", "cross counter", "pummel")
/obj/item/nullrod/godhand/Initialize()
. = ..()
@@ -318,7 +319,8 @@
block_chance = 30
sharpness = SHARP_EDGED
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/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
if(attack_type == PROJECTILE_ATTACK)
@@ -343,7 +345,8 @@
name = "sacred chainsaw sword"
desc = "Suffer not a heretic to live."
slot_flags = ITEM_SLOT_BELT
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.5 //slower than a real saw
@@ -406,7 +409,8 @@
force = 4.13
throwforce = 1
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/nullrod/scythe
icon_state = "scythe1"
@@ -419,7 +423,8 @@
armour_penetration = 35
slot_flags = ITEM_SLOT_BACK
sharpness = SHARP_EDGED
attack_verb = list("chopped", "sliced", "cut", "reaped")
attack_verb_continuous = list("chops", "slices", "cuts", "reaps")
attack_verb_simple = list("chop", "slice", "cut", "reap")
/obj/item/nullrod/scythe/Initialize()
. = ..()
@@ -432,7 +437,8 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
name = "high frequency blade"
desc = "Bad references are the DNA of the soul."
attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
attack_verb_continuous = list("chops", "slices", "cuts", "zandatsu's")
attack_verb_simple = list("chop", "slice", "cut", "zandatsu")
hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/nullrod/scythe/spellblade
@@ -452,7 +458,8 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
name = "possessed blade"
desc = "When the station falls into chaos, it's nice to have a friend by your side."
attack_verb = list("chopped", "sliced", "cut")
attack_verb_continuous = list("chops", "slices", "cuts")
attack_verb_simple= list("chop", "slice", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
var/possessed = FALSE
@@ -504,7 +511,8 @@
chaplain_spawnable = FALSE
force = 30
slot_flags = ITEM_SLOT_BELT
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 = 0.5 //faster than normal saw
@@ -518,7 +526,8 @@
desc = "This war hammer cost the chaplain forty thousand space dollars."
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_HUGE
attack_verb = list("smashed", "bashed", "hammered", "crunched")
attack_verb_continuous = list("smashes", "bashes", "hammers", "crunches")
attack_verb_simple = list("smash", "bash", "hammer", "crunch")
/obj/item/nullrod/chainsaw
name = "chainsaw hand"
@@ -530,7 +539,8 @@
w_class = WEIGHT_CLASS_HUGE
item_flags = ABSTRACT
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 = 2 //slower than a real saw
@@ -548,7 +558,8 @@
desc = "Used for absolutely hilarious sacrifices."
hitsound = 'sound/items/bikehorn.ogg'
sharpness = SHARP_EDGED
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/nullrod/pride_hammer
icon_state = "pride"
@@ -558,7 +569,8 @@
throwforce = 15
w_class = 4
slot_flags = ITEM_SLOT_BACK
attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
attack_verb_continuous = list("attacks", "smashes", "crushes", "splatters", "cracks")
attack_verb_simple = list("attack", "smash", "crush", "splatter", "crack")
hitsound = 'sound/weapons/blade1.ogg'
/obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
@@ -579,7 +591,8 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
attack_verb = list("whipped", "lashed")
attack_verb_continuous = list("whips", "lashes")
attack_verb_simple = list("whip", "lash")
hitsound = 'sound/weapons/chainhit.ogg'
/obj/item/nullrod/fedora
@@ -594,7 +607,8 @@
throw_range = 7
throwforce = 30
sharpness = SHARP_EDGED
attack_verb = list("enlightened", "redpilled")
attack_verb_continuous = list("enlightens", "redpills")
attack_verb_simple = list("enlighten", "redpill")
/obj/item/nullrod/armblade
name = "dark blessing"
@@ -629,7 +643,8 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 15
attack_verb = list("bitten", "eaten", "fin slapped")
attack_verb_continuous = list("bites", "eats", "fin slaps")
attack_verb_simple = list("bite", "eat", "fin slap")
hitsound = 'sound/weapons/bite.ogg'
var/used_blessing = FALSE
@@ -649,7 +664,8 @@
slot_flags = ITEM_SLOT_BACK
sharpness = SHARP_NONE
hitsound = "swing_hit"
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
attack_verb_continuous = list("smashes", "slams", "whacks", "thwacks")
attack_verb_simple = list("smash", "slam", "whack", "thwack")
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "bostaff0"
inhand_icon_state = "bostaff0"
@@ -668,7 +684,8 @@
sharpness = SHARP_EDGED
slot_flags = null
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")
item_flags = SLOWS_WHILE_IN_HAND
/obj/item/nullrod/tribal_knife/Initialize(mapload)
@@ -694,7 +711,8 @@
name = "unholy pitchfork"
w_class = WEIGHT_CLASS_NORMAL
desc = "Holding this makes you look absolutely devilish."
attack_verb = list("poked", "impaled", "pierced", "jabbed")
attack_verb_continuous = list("pokes", "impales", "pierces", "jabs")
attack_verb_simple = list("poke", "impale", "pierce", "jab")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
@@ -707,7 +725,8 @@
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashes", "smacks", "whacks")
attack_verb_continuous = list("bashes", "smacks", "whacks")
attack_verb_simple = list("bash", "smack", "whack")
/obj/item/nullrod/hypertool
icon = 'icons/obj/device.dmi'
@@ -720,7 +739,8 @@
desc = "A tool so powerful even you cannot perfectly use it."
armour_penetration = 35
damtype = BRAIN
attack_verb = list("pulsed", "mended", "cut")
attack_verb_continuous = list("pulses", "mends", "cuts")
attack_verb_simple = list("pulse", "mend", "cut")
hitsound = 'sound/effects/sparks4.ogg'
/obj/item/nullrod/spear
@@ -735,5 +755,6 @@
armour_penetration = 10
sharpness = SHARP_POINTY
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("stabbed", "poked", "slashed", "clocked")
attack_verb_continuous = list("stabs", "pokes", "slashes", "clocks")
attack_verb_simple = list("stab", "poke", "slash", "clock")
hitsound = 'sound/weapons/bladeslice.ogg'
code/game/objects/items/kitchen.dm
+14 -7
View File
@@ -26,7 +26,8 @@
throw_range = 5
custom_materials = list(/datum/material/iron=80)
flags_1 = CONDUCT_1
attack_verb = list("attacked", "stabbed", "poked")
attack_verb_continuous = list("attacks", "stabs", "pokes")
attack_verb_simple = list("attack", "stab", "poke")
hitsound = 'sound/weapons/bladeslice.ogg'
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
item_flags = EYE_STAB
@@ -84,7 +85,8 @@
throw_speed = 3
throw_range = 6
custom_materials = list(/datum/material/iron=12000)
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")
sharpness = SHARP_EDGED
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
item_flags = EYE_STAB
@@ -117,7 +119,8 @@
throwforce = 0
throw_range = 5
custom_materials = list(/datum/material/plastic = 100)
attack_verb = list("prodded", "whiffed","scratched", "poked")
attack_verb_continuous = list("prods", "whiffs", "scratches", "pokes")
attack_verb_simple = list("prod", "whiff", "scratch", "poke")
sharpness = SHARP_EDGED
custom_price = 50
var/break_chance = 25
@@ -168,7 +171,8 @@
force = 15
throwforce = 10
custom_materials = list(/datum/material/iron=18000)
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
attack_verb_continuous = list("cleaves", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("cleave", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
w_class = WEIGHT_CLASS_NORMAL
custom_price = 600
@@ -188,7 +192,8 @@
embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
force = 20
throwforce = 20
attack_verb = list("slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "cut")
attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "cuts")
attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "cut")
bayonet = TRUE
/obj/item/kitchen/knife/combat/survival
@@ -228,7 +233,8 @@
desc = "A makeshift glass shiv."
force = 8
throwforce = 12
attack_verb = list("shanked", "shivved")
attack_verb_continuous = list("shanks", "shivs")
attack_verb_simple = list("shank", "shiv")
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
custom_materials = list(/datum/material/glass=400)
@@ -254,7 +260,8 @@
throw_range = 7
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
custom_price = 200
/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
code/game/objects/items/melee/energy.dm
+2 -2
View File
@@ -78,7 +78,7 @@
w_class_on = WEIGHT_CLASS_HUGE
flags_1 = CONDUCT_1
armour_penetration = 100
attack_verb_off = list("attacked", "chopped", "cleaved", "tore", "lacerated", "cut")
attack_verb_off = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts")
attack_verb_on = list()
light_color = LIGHT_COLOR_LIGHT_CYAN
@@ -95,7 +95,7 @@
force = 3
throwforce = 5
hitsound = "swing_hit" //it starts deactivated
attack_verb_off = list("tapped", "poked")
attack_verb_off = list("taps", "pokes")
throw_speed = 3
throw_range = 5
sharpness = SHARP_EDGED
code/game/objects/items/melee/misc.dm
+18 -9
View File
@@ -23,7 +23,8 @@
wound_bonus = 15
bare_wound_bonus = 10
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines")
attack_verb_simple = list("flog", "whip", "lash", "discipline")
hitsound = 'sound/weapons/chainhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
@@ -43,7 +44,8 @@
force = 20
throwforce = 10
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")
sharpness = SHARP_EDGED
/obj/item/melee/synthetic_arm_blade/Initialize()
@@ -65,7 +67,8 @@
block_chance = 50
armour_penetration = 75
sharpness = SHARP_EDGED
attack_verb = list("slashed", "cut")
attack_verb_continuous = list("slashes", "cuts")
attack_verb_simple = list("slash", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
wound_bonus = 10
@@ -149,7 +152,8 @@
throwforce = 10
block_chance = 20
armour_penetration = 65
attack_verb = list("slashed", "stung", "prickled", "poked")
attack_verb_continuous = list("slashes", "stings", "prickles", "pokes")
attack_verb_simple = list("slash", "sting", "prickle", "poke")
hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/melee/beesword/afterattack(atom/target, mob/user, proximity)
@@ -377,7 +381,8 @@
inhand_icon_state = on_inhand_icon_state
w_class = weight_class_on
force = force_on
attack_verb = list("smacked", "struck", "cracked", "beaten")
attack_verb_continuous = list("smacks", "strikes", "cracks", "beats")
attack_verb_simple = list("smack", "strike", "crack", "beat")
else
to_chat(user, desc["local_off"])
icon_state = off_icon_state
@@ -385,7 +390,8 @@
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
force = force_off
attack_verb = list("hit", "poked")
attack_verb_continuous = list("hits", "pokes")
attack_verb_simple = list("hit", "poke")
playsound(src.loc, on_sound, 50, TRUE)
add_fingerprint(user)
@@ -531,7 +537,8 @@
slot_flags = ITEM_SLOT_BELT
force = 15
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
attack_verb_continuous = list("flogs", "whips", "lashes", "disciplines")
attack_verb_simple = list("flog", "whip", "lash", "discipline")
hitsound = 'sound/weapons/whip.ogg'
/obj/item/melee/curator_whip/afterattack(target, mob/user, proximity_flag)
@@ -550,7 +557,8 @@
w_class = WEIGHT_CLASS_SMALL
item_flags = NONE
force = 0
attack_verb = list("hit", "poked")
attack_verb_continuous = list("hits", "pokes")
attack_verb_simple = list("hit", "poke")
var/obj/item/reagent_containers/food/snacks/sausage/held_sausage
var/static/list/ovens
var/on = FALSE
@@ -666,7 +674,8 @@
throwforce = 8
block_chance = 10
armour_penetration = 50
attack_verb = list("smacked", "struck", "cracked", "beaten")
attack_verb_continuous = list("smacks", "strikes", "cracks", "beats")
attack_verb_simple = list("smack", "strike", "crack", "beat")
var/overlay_state = "mace_handle"
var/mutable_appearance/overlay
code/game/objects/items/melee/transforming.dm
+6 -6
View File
@@ -6,8 +6,8 @@
var/throwforce_on = 20
var/icon_state_on = "axe1"
var/hitsound_on = 'sound/weapons/blade1.ogg'
var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
var/list/attack_verb_off = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "cut")
var/list/attack_verb_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
var/list/attack_verb_off = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
w_class = WEIGHT_CLASS_SMALL
var/bonus_active = FALSE //If the faction damage bonus is active
var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
@@ -20,10 +20,10 @@
. = ..()
if(active)
if(attack_verb_on.len)
attack_verb = attack_verb_on
attack_verb_continuous = attack_verb_on
else
if(attack_verb_off.len)
attack_verb = attack_verb_off
attack_verb_continuous = attack_verb_off
if(embedding)
updateEmbedding()
if(sharpness)
@@ -54,7 +54,7 @@
hitsound = hitsound_on
throw_speed = 4
if(attack_verb_on.len)
attack_verb = attack_verb_on
attack_verb_continuous = attack_verb_on
icon_state = icon_state_on
w_class = w_class_on
if(embedding)
@@ -65,7 +65,7 @@
hitsound = initial(hitsound)
throw_speed = initial(throw_speed)
if(attack_verb_off.len)
attack_verb = attack_verb_off
attack_verb_continuous = attack_verb_off
icon_state = initial(icon_state)
w_class = initial(w_class)
if(embedding)
code/game/objects/items/miscellaneous.dm
+4 -2
View File
@@ -10,7 +10,8 @@
throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
attack_verb_continuous = list("warns", "cautions", "smashes")
attack_verb_simple = list("warn", "caution", "smash")
/obj/item/choice_beacon
name = "choice beacon"
@@ -150,7 +151,8 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "skub"
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("skubbed")
attack_verb_continuous = list("skubs")
attack_verb_simple = list("skub")
/obj/item/skub/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] has declared themself as anti-skub! The skub tears them apart!</span>")
code/game/objects/items/mop.dm
+2 -1
View File
@@ -10,7 +10,8 @@
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
attack_verb_continuous = list("mops", "bashes", "bludgeons", "whacks")
attack_verb_simple = list("mop", "bash", "bludgeon", "whack")
resistance_flags = FLAMMABLE
var/mopping = 0
var/mopcount = 0
code/game/objects/items/pet_carrier.dm
+2 -1
View File
@@ -11,7 +11,8 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
force = 5
attack_verb = list("bashed", "carried")
attack_verb_continuous = list("bashes", "carries")
attack_verb_simple = list("bash", "carry")
w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 3
code/game/objects/items/pitchfork.dm
+2 -1
View File
@@ -7,7 +7,8 @@
force = 7
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("attacked", "impaled", "pierced")
attack_verb_continuous = list("attacks", "impales", "pierces")
attack_verb_simple = list("attack", "impale", "pierce")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = SHARP_EDGED
max_integrity = 200
code/game/objects/items/plushes.dm
+20 -10
View File
@@ -3,7 +3,8 @@
desc = "This is the special coder plush, do not steal."
icon = 'icons/obj/plushes.dmi'
icon_state = "debug"
attack_verb = list("thumped", "whomped", "bumped")
attack_verb_continuous = list("thumps", "whomps", "bumps")
attack_verb_simple = list("thump", "whomp", "bump")
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
var/list/squeak_override //Weighted list; If you want your plush to have different squeak sounds use this
@@ -382,14 +383,16 @@
desc = "An adorable stuffed toy that resembles a space carp."
icon_state = "carpplush"
inhand_icon_state = "carp_plushie"
attack_verb = list("bitten", "eaten", "fin slapped")
attack_verb_continuous = list("bites", "eats", "fin slaps")
attack_verb_simple = list("bite", "eat", "fin slap")
squeak_override = list('sound/weapons/bite.ogg'=1)
/obj/item/toy/plush/bubbleplush
name = "\improper Bubblegum plushie"
desc = "The friendly red demon that gives good miners gifts."
icon_state = "bubbleplush"
attack_verb = list("rent")
attack_verb_continuous = list("rents")
attack_verb_simple = list("rent")
squeak_override = list('sound/magic/demon_attack1.ogg'=1)
/obj/item/toy/plush/ratplush
@@ -498,7 +501,8 @@
desc = "An adorable stuffed toy that resembles a lizardperson."
icon_state = "plushie_lizard"
inhand_icon_state = "plushie_lizard"
attack_verb = list("clawed", "hissed", "tail slapped")
attack_verb_continuous = list("claws", "hisses", "tail slaps")
attack_verb_simple = list("claw", "hiss", "tail slap")
squeak_override = list('sound/weapons/slash.ogg' = 1)
/obj/item/toy/plush/snakeplushie
@@ -506,7 +510,8 @@
desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
icon_state = "plushie_snake"
inhand_icon_state = "plushie_snake"
attack_verb = list("bitten", "hissed", "tail slapped")
attack_verb_continuous = list("bites", "hisses", "tail slaps")
attack_verb_simple = list("bite", "hiss", "tail slap")
squeak_override = list('sound/weapons/bite.ogg' = 1)
/obj/item/toy/plush/nukeplushie
@@ -514,7 +519,8 @@
desc = "A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious."
icon_state = "plushie_nuke"
inhand_icon_state = "plushie_nuke"
attack_verb = list("shot", "nuked", "detonated")
attack_verb_continuous = list("shoots", "nukes", "detonates")
attack_verb_simple = list("shoot", "nuke", "detonate")
squeak_override = list('sound/effects/hit_punch.ogg' = 1)
/obj/item/toy/plush/slimeplushie
@@ -522,7 +528,8 @@
desc = "An adorable stuffed toy that resembles a slime. It is practically just a hacky sack."
icon_state = "plushie_slime"
inhand_icon_state = "plushie_slime"
attack_verb = list("blorbled", "slimed", "absorbed")
attack_verb_continuous = list("blorbles", "slimes", "absorbs")
attack_verb_simple = list("blorble", "slime", "absorb")
squeak_override = list('sound/effects/blobattack.ogg' = 1)
gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
@@ -541,7 +548,8 @@
desc = "A cute toy that resembles an even cuter bee."
icon_state = "plushie_h"
inhand_icon_state = "plushie_h"
attack_verb = list("stung")
attack_verb_continuous = list("stings")
attack_verb_simple = list("sting")
gender = FEMALE
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)
@@ -556,7 +564,8 @@
desc = "A plushie depicting an adorable mothperson. It's a huggable bug!"
icon_state = "moffplush"
inhand_icon_state = "moffplush"
attack_verb = list("fluttered", "flapped")
attack_verb_continuous = list("flutters", "flaps")
attack_verb_simple = list("flutter", "flap")
squeak_override = list('sound/voice/moth/scream_moth.ogg'=1)
///Used to track how many people killed themselves with item/toy/plush/moth
var/suicide_count = 0
@@ -583,5 +592,6 @@
desc = "A plushie depicting a peacekeeper cyborg. Only you can prevent human harm!"
icon_state = "pkplush"
inhand_icon_state = "pkplush"
attack_verb = list("hugged", "squeezed")
attack_verb_continuous = list("hugs", "squeezes")
attack_verb_simple = list("hug", "squeeze")
squeak_override = list('sound/weapons/thudswoosh.ogg'=1)
code/game/objects/items/pneumaticCannon.dm
+2 -1
View File
@@ -7,7 +7,8 @@
desc = "A gas-powered cannon that can fire any object loaded into it."
w_class = WEIGHT_CLASS_BULKY
force = 8 //Very heavy
attack_verb = list("bludgeoned", "smashed", "beaten")
attack_verb_continuous = list("bludgeons", "smashes", "beats")
attack_verb_simple = list("bludgeon", "smash", "beat")
icon = 'icons/obj/pneumaticCannon.dmi'
icon_state = "pneumaticCannon"
inhand_icon_state = "bulldog"
code/game/objects/items/powerfist.dm
+2 -1
View File
@@ -6,7 +6,8 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
flags_1 = CONDUCT_1
attack_verb = list("whacked", "fisted", "power-punched")
attack_verb_continuous = list("whacks", "fists", "power-punches")
attack_verb_simple = list("whack", "fist", "power-punch")
force = 20
throwforce = 10
throw_range = 7
code/game/objects/items/religion.dm
+2 -1
View File
@@ -5,7 +5,8 @@
icon_state = "banner"
inhand_icon_state = "banner"
force = 8
attack_verb = list("forcefully inspired", "violently encouraged", "relentlessly galvanized")
attack_verb_continuous = list("forcefully inspires", "violently encourages", "relentlessly galvanizes")
attack_verb_simple = list("forcefully inspire", "violently encourage", "relentlessly galvanize")
lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
var/inspiration_available = TRUE //If this banner can be used to inspire crew
code/game/objects/items/shields.dm
+4 -2
View File
@@ -21,7 +21,8 @@
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
custom_materials = list(/datum/material/glass=7500, /datum/material/iron=1000)
attack_verb = list("shoved", "bashed")
attack_verb_continuous = list("shoves", "bashes")
attack_verb_simple = list("shove", "bash")
var/cooldown = 0 //shield bash cooldown. based on world.time
transparent = TRUE
max_integrity = 75
@@ -192,7 +193,8 @@
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
attack_verb = list("shoved", "bashed")
attack_verb_continuous = list("shoves", "bashes")
attack_verb_simple = list("shove", "bash")
throw_range = 5
force = 3
throwforce = 3
code/game/objects/items/signs.dm
+2 -1
View File
@@ -4,7 +4,8 @@
desc = "It's blank."
force = 5
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("bashed","smacked")
attack_verb_continuous = list("bashes", "smacks")
attack_verb_simple = list("bash", "smack")
resistance_flags = FLAMMABLE
var/label = ""
code/game/objects/items/spear.dm
+4 -2
View File
@@ -14,7 +14,8 @@
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "tore", "lacerated", "gored")
attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
sharpness = SHARP_EDGED // i know the whole point of spears is that they're pointy, but edged is more devastating at the moment so
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
@@ -133,7 +134,8 @@
/obj/item/spear/grey_tide
name = "\improper Grey Tide"
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
attack_verb = list("gored")
attack_verb_continuous = list("gores")
attack_verb_simple = list("gore")
force=15
/obj/item/spear/grey_tide/ComponentInitialize()
code/game/objects/items/stacks/bscrystal.dm
+2 -1
View File
@@ -66,7 +66,8 @@
singular_name = "bluespace polycrystal"
desc = "A stable polycrystal, made of fused-together bluespace crystals. You could probably break one off."
custom_materials = list(/datum/material/bluespace=MINERAL_MATERIAL_AMOUNT)
attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
attack_verb_continuous = list("bluespace polybashes", "bluespace polybatters", "bluespace polybludgeons", "bluespace polythrashes", "bluespace polysmashes")
attack_verb_simple = list("bluespace polybash", "bluespace polybatter", "bluespace polybludgeon", "bluespace polythrash", "bluespace polysmash")
novariants = TRUE
grind_results = list(/datum/reagent/bluespace = 20)
point_value = 30
code/game/objects/items/stacks/rods.dm
+2 -1
View File
@@ -20,7 +20,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
throw_range = 7
custom_materials = list(/datum/material/iron=1000)
max_amount = 50
attack_verb = list("hit", "bludgeoned", "whacked")
attack_verb_continuous = list("hits", "bludgeons", "whacks")
attack_verb_simple = list("hit", "bludgeon", "whack")
hitsound = 'sound/weapons/gun/general/grenade_launch.ogg'
embedding = list()
novariants = TRUE
code/game/objects/items/stacks/sheets/glass.dm
+2 -1
View File
@@ -248,7 +248,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
custom_materials = list(/datum/material/glass=MINERAL_MATERIAL_AMOUNT)
attack_verb = list("stabbed", "slashed", "sliced", "cut")
attack_verb_continuous = list("stabs", "slashes", "slices", "cuts")
attack_verb_simple = list("stab", "slash", "slice", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
resistance_flags = ACID_PROOF
armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
code/game/objects/items/stacks/sheets/sheets.dm
+2 -1
View File
@@ -8,7 +8,8 @@
max_amount = 50
throw_speed = 1
throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes")
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
novariants = FALSE
var/sheettype = null //this is used for girders in the creation of walls/false walls
var/point_value = 0 //turn-in value for the gulag stacker - loosely relative to its rarity.
code/game/objects/items/stacks/tiles/light.dm
+2 -1
View File
@@ -4,7 +4,8 @@
desc = "A floor tile, made out of glass. It produces light."
icon_state = "tile_e"
flags_1 = CONDUCT_1
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "smashes")
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
turf_type = /turf/open/floor/light
var/state = 0
code/game/objects/items/storage/belt.dm
+2 -1
View File
@@ -8,7 +8,8 @@
lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined")
attack_verb_continuous = list("whips", "lashes", "disciplines")
attack_verb_simple = list("whip", "lash", "discipline")
max_integrity = 300
equip_sound = 'sound/items/equip/toolbelt_equip.ogg'
var/content_overlays = FALSE //If this is true, the belt will gain overlays based on what it's holding
code/game/objects/items/storage/book.dm
+2 -1
View File
@@ -261,7 +261,8 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
hitsound = 'sound/weapons/sear.ogg'
damtype = BURN
name = "Syndicate Tome"
attack_verb = list("attacked", "burned", "blessed", "damned", "scorched")
attack_verb_continuous = list("attacks", "burns", "blesses", "damns", "scorches")
attack_verb_simple = list("attack", "burn", "bless", "damn", "scorch")
var/uses = 1
/obj/item/storage/book/bible/syndicate/attack_self(mob/living/carbon/human/H)
code/game/objects/items/storage/briefcase.dm
+2 -1
View File
@@ -10,7 +10,8 @@
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
resistance_flags = FLAMMABLE
max_integrity = 150
var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
code/game/objects/items/storage/secure.dm
+2 -1
View File
@@ -128,7 +128,8 @@
throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "thrashes", "whacks")
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
/obj/item/storage/secure/briefcase/PopulateContents()
new /obj/item/paper(src)
code/game/objects/items/storage/toolbox.dm
+2 -1
View File
@@ -12,7 +12,8 @@
throw_range = 7
w_class = WEIGHT_CLASS_BULKY
custom_materials = list(/datum/material/iron = 500)
attack_verb = list("robusted")
attack_verb_continuous = list("robusts")
attack_verb_simple = list("robust")
hitsound = 'sound/weapons/smash.ogg'
drop_sound = 'sound/items/handling/toolbox_drop.ogg'
pickup_sound = 'sound/items/handling/toolbox_pickup.ogg'
code/game/objects/items/stunbaton.dm
+2 -1
View File
@@ -9,7 +9,8 @@
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
force = 10
attack_verb = list("beaten")
attack_verb_continuous = list("beats")
attack_verb_simple = list("beat")
w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BELT
code/game/objects/items/tools/crowbar.dm
+2 -1
View File
@@ -15,7 +15,8 @@
drop_sound = 'sound/items/handling/crowbar_drop.ogg'
pickup_sound = 'sound/items/handling/crowbar_pickup.ogg'
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
attack_verb_continuous = list("attacks", "bashes", "batters", "bludgeons", "whacks")
attack_verb_simple = list("attack", "bash", "batter", "bludgeon", "whack")
tool_behaviour = TOOL_CROWBAR
toolspeed = 1
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
code/game/objects/items/tools/screwdriver.dm
+4 -2
View File
@@ -15,7 +15,8 @@
throw_speed = 3
throw_range = 5
custom_materials = list(/datum/material/iron=75)
attack_verb = list("stabbed")
attack_verb_continuous = list("stabs")
attack_verb_simple = list("stab")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = list('sound/items/screwdriver.ogg', 'sound/items/screwdriver2.ogg')
tool_behaviour = TOOL_SCREWDRIVER
@@ -102,7 +103,8 @@
throwforce = 8
throw_speed = 2
throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far
attack_verb = list("drilled", "screwed", "jabbed","whacked")
attack_verb_continuous = list("drills", "screws", "jabs", "whacks")
attack_verb_simple = list("drill", "screw", "jab", "whack")
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
toolspeed = 0.7
code/game/objects/items/tools/wirecutters.dm
+2 -1
View File
@@ -13,7 +13,8 @@
throw_range = 7
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=80)
attack_verb = list("pinched", "nipped")
attack_verb_continuous = list("pinches", "nips")
attack_verb_simple = list("pinch", "nip")
hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
code/game/objects/items/tools/wrench.dm
+6 -3
View File
@@ -15,7 +15,8 @@
drop_sound = 'sound/items/handling/wrench_drop.ogg'
pickup_sound = 'sound/items/handling/wrench_pickup.ogg'
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
attack_verb_continuous = list("bashes", "batters", "bludgeons", "whacks")
attack_verb_simple = list("bash", "batter", "bludgeon", "whack")
tool_behaviour = TOOL_WRENCH
toolspeed = 1
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
@@ -40,7 +41,8 @@
icon_state = "wrench_medical"
force = 2 //MEDICAL
throwforce = 4
attack_verb = list("healed", "medicaled", "tapped", "poked", "analyzed") //"cobbyed"
attack_verb_continuous = list("heals", "medicals", "taps", "pokes", "analyzes") //"cobbyed"
attack_verb_simple = list("heal", "medical", "tap", "poke", "analyze")
///var to hold the name of the person who suicided
var/suicider
@@ -80,7 +82,8 @@
desc = "It's like a normal wrench but edgier. Can be found on the battlefield."
icon_state = "wrench_combat"
inhand_icon_state = "wrench_combat"
attack_verb = list("devastated", "brutalized", "committed a war crime against", "obliterated", "humiliated")
attack_verb_continuous = list("devastates", "brutalizes", "commits a war crime against", "obliterates", "humiliates")
attack_verb_simple = list("devastate", "brutalize", "commit a war crime against", "obliterate", "humiliate")
tool_behaviour = null
toolspeed = null
var/on = FALSE
code/game/objects/items/toys.dm
+24 -13
View File
@@ -168,8 +168,8 @@
var/mob/M = loc
SEND_SIGNAL(M, COMSIG_CLEAR_MOOD_EVENT, "badass_antag", /datum/mood_event/badass_antag)
. = ..()
/obj/item/toy/balloon/arrest
name = "arreyst balloon"
desc = "A half inflated balloon about a boyband named Arreyst that was popular about ten years ago, famous for making fun of red jumpsuits as unfashionable."
@@ -247,7 +247,8 @@
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=10, /datum/material/glass=10)
attack_verb = list("struck", "pistol whipped", "hit", "bashed")
attack_verb_continuous = list("strikes", "pistol whips", "hits", "bashes")
attack_verb_simple = list("strike", "pistol whip", "hit", "bash")
var/bullets = 7
/obj/item/toy/gun/examine(mob/user)
@@ -323,7 +324,8 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
var/active = 0
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("attacked", "struck", "hit")
attack_verb_continuous = list("attacks", "strikes", "hits")
attack_verb_simple = list("attack", "strike", "hit")
var/hacked = FALSE
var/saber_color
@@ -386,7 +388,8 @@
inhand_icon_state = "arm_blade"
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
attack_verb = list("pricked", "absorbed", "gored")
attack_verb_continuous = list("pricks", "absorbs", "gores")
attack_verb_simple = list("prick", "absorb", "gore")
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
@@ -401,7 +404,8 @@
var/active = FALSE
icon = 'icons/obj/items_and_weapons.dmi'
hitsound = 'sound/weapons/smash.ogg'
attack_verb = list("robusted")
attack_verb_continuous = list("robusts")
attack_verb_simple = list("robust")
/obj/item/toy/windup_toolbox/attack_self(mob/user)
if(!active)
@@ -447,7 +451,8 @@
throw_speed = 3
throw_range = 5
two_hand_force = 0
attack_verb = list("attacked", "struck", "hit")
attack_verb_continuous = list("attacks", "strikes", "hits")
attack_verb_simple = list("attack", "strike", "hit")
/obj/item/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
return 0
@@ -469,7 +474,8 @@
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices")
attack_verb_simple = list("attack", "slash", "stab", "slice")
hitsound = 'sound/weapons/bladeslice.ogg'
/*
@@ -646,7 +652,8 @@
var/card_throwforce = 0
var/card_throw_speed = 3
var/card_throw_range = 7
var/list/card_attack_verb = list("attacked")
var/list/card_attack_verb_continuous = list("attacks")
var/list/card_attack_verb_simple = list("attack")
/obj/item/toy/cards/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is slitting [user.p_their()] wrists with \the [src]! It looks like [user.p_they()] [user.p_have()] a crummy hand!</span>")
@@ -846,7 +853,8 @@
newobj.card_throwforce = sourceobj.card_throwforce
newobj.card_throw_speed = sourceobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
newobj.card_attack_verb = sourceobj.card_attack_verb
newobj.card_attack_verb_continuous = sourceobj.card_attack_verb_continuous
newobj.card_attack_verb_simple = sourceobj.card_attack_verb_simple
newobj.resistance_flags = sourceobj.resistance_flags
/**
@@ -965,8 +973,10 @@
newobj.throw_speed = newobj.card_throw_speed
newobj.card_throw_range = sourceobj.card_throw_range
newobj.throw_range = newobj.card_throw_range
newobj.card_attack_verb = sourceobj.card_attack_verb
newobj.attack_verb = newobj.card_attack_verb
newobj.card_attack_verb_continuous = sourceobj.card_attack_verb_continuous
newobj.attack_verb_continuous = newobj.card_attack_verb_continuous
newobj.card_attack_verb_simple = sourceobj.card_attack_verb_simple
newobj.attack_verb_simple = newobj.card_attack_verb_simple
/*
|| Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. ||
@@ -982,7 +992,8 @@
card_throwforce = 10
card_throw_speed = 3
card_throw_range = 7
card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
card_attack_verb_continuous = list("attacks", "slices", "dices", "slashes", "cuts")
card_attack_verb_simple = list("attack", "slice", "dice", "slash", "cut")
resistance_flags = NONE
/*
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'