mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
MrMelbertandRoxy
bc2215667f
Melee attack chain now has a list passed along with it, `attack_modifiers`, which you can stick force modifiers to change the resulting attack This is basically a soft implementation of damage packets until a more definitive pr, but one that only applies to item attack chain, and not unarmed attacks. This change was done to facilitate a baton refactor - batons no longer hack together their own attack chain, and are now integrated straight into the real attack chain. This refactor itself was done because batons don't send any attack signals, which has been annoying in the past (for swing combat). 🆑 Melbert refactor: Batons have been refactored again. Baton stuns now properly count as an attack, when before it was a nothing. Report any oddities, particularly in regards to harmbatonning vs normal batonning. refactor: The method of adjusting item damage mid-attack has been refactored - some affected items include the Nullblade and knives. Report any strange happenings with damage numbers. refactor: A few objects have been moved to the new interaction chain - records consoles, mawed crucible, alien weeds and space vines, hedges, restaurant portals, and some mobs - to name a few. fix: Spears only deal bonus damage against secure lockers, not all closet types (including crates) /🆑
320 lines
12 KiB
Plaintext
320 lines
12 KiB
Plaintext
// *************************************
|
|
// Hydroponics Tools
|
|
// *************************************
|
|
|
|
/obj/item/reagent_containers/spray/weedspray // -- Skie
|
|
desc = "It's a toxic mixture, in spray form, to kill small weeds."
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
name = "weed spray"
|
|
icon_state = "weedspray"
|
|
inhand_icon_state = "spraycan"
|
|
worn_icon_state = "spraycan"
|
|
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
|
|
volume = 100
|
|
list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 100)
|
|
|
|
/obj/item/reagent_containers/spray/weedspray/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return TOXLOSS
|
|
|
|
/obj/item/reagent_containers/spray/pestspray // -- Skie
|
|
desc = "It's some pest eliminator spray! <I>Do not inhale!</I>"
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
name = "pest spray"
|
|
icon_state = "pestspray"
|
|
inhand_icon_state = "plantbgone"
|
|
worn_icon_state = "spraycan"
|
|
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
|
|
volume = 100
|
|
list_reagents = list(/datum/reagent/toxin/pestkiller = 100)
|
|
|
|
/obj/item/reagent_containers/spray/pestspray/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return TOXLOSS
|
|
|
|
/obj/item/cultivator
|
|
name = "cultivator"
|
|
desc = "It's used for removing weeds or scratching your back."
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
icon_state = "cultivator"
|
|
inhand_icon_state = "cultivator"
|
|
icon_angle = -135
|
|
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 5
|
|
throwforce = 7
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.5)
|
|
attack_verb_continuous = list("slashes", "slices", "cuts", "claws")
|
|
attack_verb_simple = list("slash", "slice", "cut", "claw")
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
|
|
/obj/item/cultivator/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is scratching [user.p_their()] back as hard as [user.p_they()] can with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return BRUTELOSS
|
|
|
|
/obj/item/cultivator/rake
|
|
name = "rake"
|
|
icon_state = "rake"
|
|
icon_angle = -45
|
|
w_class = WEIGHT_CLASS_NORMAL
|
|
attack_verb_continuous = list("slashes", "slices", "bashes", "claws")
|
|
attack_verb_simple = list("slash", "slice", "bash", "claw")
|
|
hitsound = null
|
|
custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.5)
|
|
resistance_flags = FLAMMABLE
|
|
flags_1 = NONE
|
|
|
|
/obj/item/cultivator/rake/Initialize(mapload)
|
|
. = ..()
|
|
var/static/list/loc_connections = list(
|
|
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
|
|
)
|
|
AddElement(/datum/element/connect_loc, loc_connections)
|
|
|
|
/obj/item/cultivator/rake/proc/on_entered(datum/source, atom/movable/AM)
|
|
SIGNAL_HANDLER
|
|
if(!ishuman(AM))
|
|
return
|
|
var/mob/living/carbon/human/H = AM
|
|
if(has_gravity(loc) && HAS_TRAIT(H, TRAIT_CLUMSY) && !H.resting)
|
|
H.set_confusion_if_lower(10 SECONDS)
|
|
H.Stun(20)
|
|
playsound(src, 'sound/items/weapons/punch4.ogg', 50, TRUE)
|
|
H.visible_message(span_warning("[H] steps on [src] causing the handle to hit [H.p_them()] right in the face!"), \
|
|
span_userdanger("You step on [src] causing the handle to hit you right in the face!"))
|
|
|
|
/obj/item/cultivator/cyborg
|
|
name = "cyborg cultivator"
|
|
icon = 'icons/obj/items_cyborg.dmi'
|
|
icon_state = "sili_cultivator"
|
|
icon_angle = 0
|
|
|
|
/obj/item/hatchet
|
|
name = "hatchet"
|
|
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
icon_state = "hatchet"
|
|
inhand_icon_state = "hatchet"
|
|
icon_angle = -135
|
|
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 12
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
throwforce = 15
|
|
throw_speed = 4
|
|
throw_range = 7
|
|
embed_type = /datum/embedding/hatchet
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*7.5)
|
|
attack_verb_continuous = list("chops", "tears", "lacerates", "cuts")
|
|
attack_verb_simple = list("chop", "tear", "lacerate", "cut")
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
sharpness = SHARP_EDGED
|
|
|
|
/datum/embedding/hatchet
|
|
pain_mult = 4
|
|
embed_chance = 35
|
|
fall_chance = 10
|
|
|
|
/obj/item/hatchet/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/butchering, \
|
|
speed = 7 SECONDS, \
|
|
effectiveness = 100, \
|
|
)
|
|
|
|
/obj/item/hatchet/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
playsound(src, 'sound/items/weapons/bladeslice.ogg', 50, TRUE, -1)
|
|
return BRUTELOSS
|
|
|
|
/obj/item/hatchet/wooden
|
|
desc = "A crude axe blade upon a short wooden handle."
|
|
icon_state = "woodhatchet"
|
|
custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 1)
|
|
resistance_flags = FLAMMABLE
|
|
flags_1 = NONE
|
|
|
|
/obj/item/hatchet/cyborg
|
|
name = "cyborg hatchet"
|
|
icon = 'icons/obj/items_cyborg.dmi'
|
|
icon_state = "sili_hatchet"
|
|
icon_angle = 0
|
|
|
|
/* Skyrat Edit Start - Modularization and New Scythes
|
|
/obj/item/scythe
|
|
name = "scythe"
|
|
desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
icon_state = "scythe0"
|
|
inhand_icon_state = "scythe0"
|
|
icon_angle = -45
|
|
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
|
|
force = 15
|
|
throwforce = 5
|
|
throw_speed = 2
|
|
throw_range = 3
|
|
w_class = WEIGHT_CLASS_BULKY
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
armour_penetration = 20
|
|
wound_bonus = 10
|
|
slot_flags = ITEM_SLOT_BACK
|
|
attack_verb_continuous = list("chops", "slices", "cuts", "reaps")
|
|
attack_verb_simple = list("chop", "slice", "cut", "reap")
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
sharpness = SHARP_EDGED
|
|
item_flags = CRUEL_IMPLEMENT //maybe they want to use it in surgery
|
|
var/swiping = FALSE
|
|
|
|
/obj/item/scythe/Initialize(mapload)
|
|
. = ..()
|
|
AddComponent(/datum/component/butchering, \
|
|
speed = 9 SECONDS, \
|
|
effectiveness = 105, \
|
|
)
|
|
AddElement(/datum/element/bane, mob_biotypes = MOB_PLANT, damage_multiplier = 0.5, requires_combat_mode = FALSE)
|
|
|
|
/obj/item/scythe/suicide_act(mob/living/user)
|
|
user.visible_message(span_suicide("[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
if(iscarbon(user))
|
|
var/mob/living/carbon/C = user
|
|
var/obj/item/bodypart/BP = C.get_bodypart(BODY_ZONE_HEAD)
|
|
if(BP)
|
|
BP.drop_limb()
|
|
playsound(src, SFX_DESECRATION ,50, TRUE, -1)
|
|
return BRUTELOSS
|
|
|
|
/obj/item/scythe/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
|
|
if(!istype(target, /obj/structure/alien/resin/flower_bud) && !istype(target, /obj/structure/spacevine))
|
|
return ..()
|
|
if(swiping || get_turf(target) == get_turf(user))
|
|
return ..()
|
|
var/turf/user_turf = get_turf(user)
|
|
var/dir_to_target = get_dir(user_turf, get_turf(target))
|
|
swiping = TRUE
|
|
var/static/list/scythe_slash_angles = list(0, 45, 90, -45, -90)
|
|
for(var/i in scythe_slash_angles)
|
|
var/turf/adjacent_turf = get_step(user_turf, turn(dir_to_target, i))
|
|
for(var/obj/structure/spacevine/vine in adjacent_turf)
|
|
if(user.Adjacent(vine))
|
|
melee_attack_chain(user, vine)
|
|
for(var/obj/structure/alien/resin/flower_bud/flower in adjacent_turf)
|
|
if(user.Adjacent(flower))
|
|
melee_attack_chain(user, flower)
|
|
swiping = FALSE
|
|
return TRUE
|
|
*/
|
|
|
|
/obj/item/secateurs
|
|
name = "secateurs"
|
|
desc = "It's a tool for cutting grafts off plants or changing podperson looks."
|
|
desc_controls = "Right-click to stylize podperson hair or other plant features!"
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
icon_state = "secateurs"
|
|
inhand_icon_state = null
|
|
worn_icon_state = "cutters"
|
|
icon_angle = -135
|
|
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 5
|
|
throwforce = 6
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
slot_flags = ITEM_SLOT_BELT
|
|
custom_materials = list(/datum/material/iron= SHEET_MATERIAL_AMOUNT*2)
|
|
attack_verb_continuous = list("slashes", "slices", "cuts", "claws")
|
|
attack_verb_simple = list("slash", "slice", "cut", "claw")
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
|
|
///Catch right clicks so we can stylize!
|
|
/obj/item/secateurs/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
|
|
if(user.combat_mode)
|
|
return NONE
|
|
|
|
restyle(interacting_with, user)
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
///Send a signal to whatever we clicked and ask them if they wanna be PLANT RESTYLED YEAAAAAAAH
|
|
/obj/item/secateurs/proc/restyle(atom/target, mob/living/user)
|
|
SEND_SIGNAL(target, COMSIG_ATOM_RESTYLE, user, target, user.zone_selected, EXTERNAL_RESTYLE_PLANT, 6 SECONDS)
|
|
|
|
/obj/item/secateurs/cyborg
|
|
name = "cyborg secateurs"
|
|
icon = 'icons/obj/items_cyborg.dmi'
|
|
icon_state = "sili_secateur"
|
|
icon_angle = 0
|
|
|
|
/obj/item/geneshears
|
|
name = "botanogenetic plant shears"
|
|
desc = "A high tech, high fidelity pair of plant shears, capable of cutting genetic traits out of a plant."
|
|
icon = 'icons/obj/service/hydroponics/equipment.dmi'
|
|
icon_state = "genesheers"
|
|
inhand_icon_state = null
|
|
worn_icon_state = "cutters"
|
|
lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
|
|
obj_flags = CONDUCTS_ELECTRICITY
|
|
force = 10
|
|
throwforce = 8
|
|
w_class = WEIGHT_CLASS_SMALL
|
|
slot_flags = ITEM_SLOT_BELT
|
|
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2, /datum/material/uranium=HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/gold=SMALL_MATERIAL_AMOUNT*5)
|
|
attack_verb_continuous = list("slashes", "slices", "cuts")
|
|
attack_verb_simple = list("slash", "slice", "cut")
|
|
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
|
|
|
// *************************************
|
|
// Nutrient defines for hydroponics
|
|
// *************************************
|
|
|
|
|
|
/obj/item/reagent_containers/cup/bottle/nutrient
|
|
name = "bottle of nutrient"
|
|
volume = 50
|
|
amount_per_transfer_from_this = 10
|
|
possible_transfer_amounts = list(1,2,5,10,15,25,50)
|
|
|
|
/obj/item/reagent_containers/cup/bottle/nutrient/Initialize(mapload)
|
|
. = ..()
|
|
pixel_x = base_pixel_x + rand(-5, 5)
|
|
pixel_y = base_pixel_y + rand(-5, 5)
|
|
|
|
|
|
/obj/item/reagent_containers/cup/bottle/nutrient/ez
|
|
name = "bottle of E-Z-Nutrient"
|
|
desc = "Contains a fertilizer that causes mild mutations and gradual plant growth with each harvest."
|
|
list_reagents = list(/datum/reagent/plantnutriment/eznutriment = 50)
|
|
|
|
/obj/item/reagent_containers/cup/bottle/nutrient/l4z
|
|
name = "bottle of Left 4 Zed"
|
|
desc = "Contains a fertilizer that lightly heals the plant but causes significant mutations in plants over generations."
|
|
list_reagents = list(/datum/reagent/plantnutriment/left4zednutriment = 50)
|
|
|
|
/obj/item/reagent_containers/cup/bottle/nutrient/rh
|
|
name = "bottle of Robust Harvest"
|
|
desc = "Contains a fertilizer that increases the yield of a plant while gradually preventing mutations."
|
|
list_reagents = list(/datum/reagent/plantnutriment/robustharvestnutriment = 50)
|
|
|
|
/obj/item/reagent_containers/cup/bottle/nutrient/empty
|
|
name = "bottle"
|
|
|
|
/obj/item/reagent_containers/cup/bottle/killer
|
|
volume = 30
|
|
amount_per_transfer_from_this = 1
|
|
possible_transfer_amounts = list(1,2,5)
|
|
|
|
/obj/item/reagent_containers/cup/bottle/killer/weedkiller
|
|
name = "bottle of weed killer"
|
|
desc = "Contains a herbicide."
|
|
list_reagents = list(/datum/reagent/toxin/plantbgone/weedkiller = 30)
|
|
|
|
/obj/item/reagent_containers/cup/bottle/killer/pestkiller
|
|
name = "bottle of pest spray"
|
|
desc = "Contains a pesticide."
|
|
list_reagents = list(/datum/reagent/toxin/pestkiller = 30)
|