Wow I merged Intigracy's first how unwise (#9213)

attack_verb is now always present tense
removes an unused and unticked hydro.dm which has the old defines for plants n shit
This commit is contained in:
Intigracy
2016-04-07 09:47:02 -07:00
committed by clusterfack
parent 326a749707
commit f4f7164826
64 changed files with 180 additions and 1789 deletions

View File

@@ -15,7 +15,7 @@
throw_range = 5
force = 5.0
origin_tech = "combat=1"
attack_verb = list("struck", "hit", "bashed")
attack_verb = list("strikes", "hits", "bashes")
mech_flags = MECH_SCAN_ILLEGAL
min_harm_label = 20
harm_label_examine = list("<span class='info'>A label is stuck to the trigger, but it is too small to get in the way.</span>", "<span class='warning'>A label firmly sticks the trigger to the guard!</span>")

View File

@@ -11,7 +11,7 @@
siemens_coefficient = 1
slot_flags = SLOT_BACK
origin_tech = "materials=1;engineering=1;combat=1"
attack_verb = list("struck", "hit", "bashed")
attack_verb = list("strikes", "hits", "bashes")
mech_flags = MECH_SCAN_ILLEGAL
var/damage_multiplier = 2 //To allow easy modifications to the damage this weapon deals. At a value of 1, a metal rod fired with 10u of fuel deals 16 damage.
var/fuel_level = 0

View File

@@ -647,7 +647,7 @@
w_type = RECYK_METAL
melt_temperature = MELTPOINT_STEEL
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
attack_verb = list("bashes", "batters", "bludgeons", "whacks")
var/metal_assembly = 0
/obj/item/weapon/wrench_wired/proc/update_wired_wrench_assembly()

View File

@@ -18,7 +18,7 @@
cant_drop = 1
sharpness = 1
hitsound = "sound/weapons/bloodyslice.ogg"
attack_verb = list("clawed", "rent", "slashed")
attack_verb = list("claws", "rends", "slashes")
conventional_firearm = 0
var/shots_remaining = 0
var/has_shot = 0

View File

@@ -13,7 +13,7 @@
siemens_coefficient = 1
slot_flags = SLOT_BELT
origin_tech = "materials=1;engineering=1;bluespace=1"
attack_verb = list("struck", "hit", "bashed")
attack_verb = list("strikes", "hits", "bashes")
mech_flags = MECH_SCAN_ILLEGAL
var/loaded_crystal = null
var/loaded_matter_bin = null

View File

@@ -12,7 +12,7 @@
force = 15
throwforce = 10
sharpness = 1.2
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
attack_verb = list("attacks", "slashes", "stabs", "slices", "tears", "rips", "dices", "cuts")
var/obj/item/weapon/reagent_containers/hypospray/hypo = null
suicide_act(mob/user)
@@ -218,7 +218,7 @@
name = "executioner's sword"
desc = "A huge sword. The top third of the blade seems weaker than the rest of it."
icon_state = "executioners_sword_assembly"
attack_verb = list("smacked")
attack_verb = list("smacks")
force = 5
sharpness = 0
hitsound = "sound/weapons/smash.ogg"
@@ -251,7 +251,7 @@
force = 25
sharpness = 2.0
slot_flags = SLOT_BACK
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cleaved")
attack_verb = list("attacks", "slashes", "stabs", "slices", "tears", "rips", "dices", "cleaves")
complete = 1
if (istype(loc,/mob/living/carbon/human))
var/mob/living/carbon/human/H = loc

View File

@@ -292,7 +292,7 @@
w_type = RECYK_METAL
melt_temperature = MELTPOINT_STEEL
origin_tech = "materials=1;engineering=2"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
attack_verb = list("bashes", "batters", "bludgeons", "whacks")
var/current_blunt = null
var/blunt_name = null
var/is_lit = 0

View File

@@ -19,7 +19,7 @@
caliber = list("rpg" = 1)
origin_tech = "combat=4;materials=2;syndicate=2"
ammo_type = "/obj/item/ammo_casing/rocket_rpg"
attack_verb = list("struck", "hit", "bashed")
attack_verb = list("strikes", "hits", "bashes")
gun_flags = 0
/obj/item/weapon/gun/projectile/rocketlauncher/isHandgun()