From f9963454db602041f0132759a480db91f313cee1 Mon Sep 17 00:00:00 2001 From: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com> Date: Thu, 5 Mar 2020 22:17:52 -0500 Subject: [PATCH] Adds tackling (VIDEO INSIDE) (#49476) * huthtuthuthuthtuhtuthuthuthuthtuthuthuthtuthut * documents and expands, adds new glove types * Adds slamming into tables and neatens up throwingdatum handling (+stuff) * bit less squishy * adds sprites, offbrands, swaps most combat insuls for tacklers * adds dolphin and rocket gloves to BEPIS * changes dna to traits, buffs tackling * same as last commit but moreso * updates docs, nerfs stuns * vending machines, better docs * window tackles for good measure * gets window splats working * polish off * LAST DAY OF SCHOOL --- code/__DEFINES/dcs/signals.dm | 4 +- code/__DEFINES/traits.dm | 2 + code/_globalvars/lists/maintenance_loot.dm | 1 + code/_globalvars/traits.dm | 2 + code/datums/components/crafting/recipes.dm | 8 + code/datums/components/tackle.dm | 496 ++++++++++++++++++ code/datums/elements/squish.dm | 24 +- code/datums/mutations/body.dm | 4 + code/game/atoms_movable.dm | 9 +- code/game/gamemodes/clown_ops/clown_ops.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/objects/items/stacks/tape.dm | 9 +- .../crates_lockers/closets/gimmick.dm | 4 +- .../objects/structures/ghost_role_spawners.dm | 2 +- .../antagonists/fugitive/fugitive_outfits.dm | 4 +- code/modules/awaymissions/capture_the_flag.dm | 2 +- code/modules/awaymissions/corpse.dm | 4 +- code/modules/cargo/packs.dm | 6 +- code/modules/clothing/gloves/tacklers.dm | 100 ++++ code/modules/clothing/outfits/ert.dm | 1 + code/modules/clothing/outfits/standard.dm | 8 +- code/modules/clothing/outfits/vr.dm | 2 +- .../mob/living/simple_animal/corpse.dm | 10 +- .../hostile/mining_mobs/hivelord.dm | 2 +- .../chemistry/reagents/alcohol_reagents.dm | 2 +- code/modules/research/designs/misc_designs.dm | 24 + code/modules/research/techweb/all_nodes.dm | 15 +- code/modules/ruins/lavaland_ruin_code.dm | 2 +- code/modules/vending/security.dm | 3 +- icons/mob/clothing/hands.dmi | Bin 11008 -> 11611 bytes icons/obj/clothing/gloves.dmi | Bin 17604 -> 18887 bytes strings/tips.txt | 10 +- tgstation.dme | 2 + 33 files changed, 723 insertions(+), 43 deletions(-) create mode 100644 code/datums/components/tackle.dm create mode 100644 code/modules/clothing/gloves/tacklers.dm diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index e3b66881cae..46c75d05b93 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -148,9 +148,11 @@ #define COMSIG_MOVABLE_CROSSED "movable_crossed" ///from base of atom/movable/Crossed(): (/atom/movable) #define COMSIG_MOVABLE_UNCROSS "movable_uncross" ///from base of atom/movable/Uncross(): (/atom/movable) #define COMPONENT_MOVABLE_BLOCK_UNCROSS 1 -#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" ///from base of atom/movable/Uncrossed(): (/atom/movable) +#define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" ///from base of atom/movable/Uncrossed(): (/atom/movable) #define COMSIG_MOVABLE_BUMP "movable_bump" ///from base of atom/movable/Bump(): (/atom) #define COMSIG_MOVABLE_IMPACT "movable_impact" ///from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum) + #define COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH 1 ///if true, flip if the impact will push what it hits + #define COMPONENT_MOVABLE_IMPACT_NEVERMIND 2 ///return true if you destroyed whatever it was you're impacting and there won't be anything for hitby() to run on #define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone" ///from base of mob/living/hitby(): (mob/living/target, hit_zone) #define COMSIG_MOVABLE_BUCKLE "buckle" ///from base of atom/movable/buckle_mob(): (mob, force) #define COMSIG_MOVABLE_UNBUCKLE "unbuckle" ///from base of atom/movable/unbuckle_mob(): (mob, force) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 09584eb27e5..d38d858f2bc 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -167,6 +167,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_GUNFLIP "gunflip" #define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat" #define TRAIT_GAMERGOD "gamer-god" //double arcade prizes +#define TRAIT_GIANT "giant" +#define TRAIT_DWARF "dwarf" //non-mob traits #define TRAIT_PARALYSIS "paralysis" //Used for limb-based paralysis, where replacing the limb will fix it diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index c0d3557f63d..235cf1892af 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -97,6 +97,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/clothing/glasses/science = 1, /obj/item/clothing/glasses/meson = 1, /obj/item/storage/belt/fannypack = 1, + /obj/item/clothing/gloves/tackler/offbrand = 1, ) = 1, list(//construction and crafting diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index c486bb96bf5..3e624226aa3 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -101,6 +101,8 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_PRIMITIVE" = TRAIT_PRIMITIVE, //unable to use mechs. Given to Ash Walkers "TRAIT_GUNFLIP" = TRAIT_GUNFLIP, "TRAIT_BLOODCRAWL_EAT" = TRAIT_BLOODCRAWL_EAT, + "TRAIT_DWARF" = TRAIT_DWARF, + "TRAIT_GIANT" = TRAIT_GIANT ), /obj/item/bodypart = list( "TRAIT_PARALYSIS" = TRAIT_PARALYSIS diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 2be6ec371f0..ab03bf3e829 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -804,3 +804,11 @@ /obj/item/stack/sheet/sinew = 5) result = /obj/item/key/lasso category = CAT_PRIMAL + +/datum/crafting_recipe/gripperoffbrand + name = "Improvised Gripper Gloves" + reqs = list( + /obj/item/clothing/gloves/fingerless = 1, + /obj/item/stack/sticky_tape = 1) + result = /obj/item/clothing/gloves/tackler/offbrand + category = CAT_CLOTHING diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm new file mode 100644 index 00000000000..2719cf65a0a --- /dev/null +++ b/code/datums/components/tackle.dm @@ -0,0 +1,496 @@ +#define MAX_TABLE_MESSES 8 // how many things can we knock off a table at once? + +/** + *#tackle.dm + * + * For when you want to throw a person at something and have fun stuff happen + * + * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your + * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll + * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, + * and take a bit of extra damage and stun for each thing launched. + * + * There are 2 """skill rolls""" involved here, which are handled and explained in sack() and rollTackle() (for roll 1, carbons), and splat() (for roll 2, walls and solid objects) +*/ +/datum/component/tackler + dupe_mode = COMPONENT_DUPE_UNIQUE + + ///If we're currently tackling or are on cooldown. Actually, shit, if I use this to handle cooldowns, then getting thrown by something while on cooldown will count as a tackle..... whatever, i'll fix that next commit + var/tackling = TRUE + ///How much stamina it takes to launch a tackle + var/stamina_cost + ///Launching a tackle calls Knockdown on you for this long, so this is your cooldown. Once you stand back up, you can tackle again. + var/base_knockdown + ///Your max range for how far you can tackle. + var/range + ///How fast you sail through the air. Standard tackles are 1 speed, but gloves that throw you faster come at a cost: higher speeds make it more likely you'll be badly injured if you fly into a non-mob obstacle. + var/speed + ///A flat modifier to your roll against your target, as described in [rollTackle()][/datum/component/tackler/proc/rollTackle]. Slightly misleading, skills aren't relevant here, this is a matter of what type of gloves (or whatever) is granting you the ability to tackle. + var/skill_mod + ///Some gloves, generally ones that increase mobility, may have a minimum distance to fly. Rocket gloves are especially dangerous with this, be sure you'll hit your target or have a clear background if you miss, or else! + var/min_distance + ///The throwdatum we're currently dealing with, if we need it + var/datum/thrownthing/tackle + +/datum/component/tackler/Initialize(stamina_cost = 25, base_knockdown = 1 SECONDS, range = 4, speed = 1, skill_mod = 0, min_distance = min_distance) + if(!iscarbon(parent)) + return COMPONENT_INCOMPATIBLE + + src.stamina_cost = stamina_cost + src.base_knockdown = base_knockdown + src.range = range + src.speed = speed + src.skill_mod = skill_mod + src.min_distance = min_distance + + var/mob/P = parent + to_chat(P, "You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.") + + addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + +/datum/component/tackler/Destroy() + var/mob/P = parent + to_chat(P, "You can no longer tackle.") + ..() + +/datum/component/tackler/RegisterWithParent() + RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle) + +/datum/component/tackler/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW)) + +///Store the thrownthing datum for later use +/datum/component/tackler/proc/registerTackle(mob/living/carbon/user, datum/thrownthing/TT) + tackle = TT + +///See if we can tackle or not. If we can, leap! +/datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, params) + if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckling) + return + + if(HAS_TRAIT(user, TRAIT_HULK)) + to_chat(user, "You're too angry to remember how to tackle!") + return + + if(user.restrained()) + to_chat(user, "You need free use of your hands to tackle!") + return + + if(!(user.mobility_flags & MOBILITY_STAND)) + to_chat(user, "You must be standing to tackle!") + return + + if(tackling) + to_chat(user, "You're not ready to tackle!") + return + + if(user.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) // can't tackle if you just got shoved + to_chat(user, "You're too off balance to tackle!") + return + + user.face_atom(A) + + var/list/modifiers = params2list(params) + if(modifiers["alt"] || modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"]) + return + + tackling = TRUE + RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) + playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) + + if(can_see(user, A, 7)) + user.visible_message("[user] leaps at [A]!", "You leap at [A]!") + else + user.visible_message("[user] leaps!", "You leap!") + + if(get_dist(user, A) < min_distance) + A = get_ranged_target_turf(user, get_dir(user, A), min_distance) //TODO: this only works in cardinals/diagonals, make it work with in-betweens too! + + user.Knockdown(base_knockdown, TRUE, TRUE) + user.adjustStaminaLoss(stamina_cost) + user.throw_at(A, range, speed, user, FALSE) + addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + return(COMSIG_MOB_CANCEL_CLICKON) + +/** + * sack() + * + * sack() is called when you actually smack into something, assuming we're mid-tackle. First it deals with smacking into non-carbons, in two cases: + * * If it's a non-carbon mob, we don't care, get out of here and do normal thrown-into-mob stuff + * * Else, if it's something dense (walls, machinery, structures, most things other than the floor), go to splat() and get ready for some high grade shit + * + * If it's a carbon we hit, we'll call rollTackle() which rolls a die and calculates modifiers for both the tackler and target, then gives us a number. Negatives favor the target, while positives favor the tackler. + * Check [rollTackle()][/datum/component/tackler/proc/rollTackle] for a more thorough explanation on the modifiers at play. + * + * Then, we figure out what effect we want, and we get to work! Note that with standard gripper gloves and no modifiers, the range of rolls is (-3, 3). The results are as follows, based on what we rolled: + * * -inf to -5: Seriously botched tackle, tackler suffers a concussion, brute damage, and a 3 second paralyze, target suffers nothing + * * -4 to -2: weak tackle, tackler gets 3 second knockdown, target gets shove slowdown but is otherwise fine + * * -1 to 0: decent tackle, tackler gets up a bit quicker than the target + * * 1: solid tackle, tackler has more of an advantage getting up quicker + * * 2 to 4: expert tackle, tackler has sizeable advantage and lands on their feet with a free passive grab + * * 5 to inf: MONSTER tackle, tackler gets up immediately and gets a free aggressive grab, target takes sizeable stamina damage from the hit and is paralyzed for one and a half seconds and knocked down for three seconds + * + * Finally, we return a bitflag to [COMSIG_MOVABLE_IMPACT] that forces the hitpush to false so that we don't knock them away. +*/ +/datum/component/tackler/proc/sack(mob/living/carbon/user, atom/hit) + if(!tackling || !tackle) + return + + if(!iscarbon(hit)) + if(hit.density) + return splat(user, hit) + return + + var/mob/living/carbon/target = hit + var/mob/living/carbon/human/T = target + var/mob/living/carbon/human/S = user + + var/roll = rollTackle(target) + tackling = FALSE + tackle.gentle = TRUE + + switch(roll) + if(-INFINITY to -5) + user.visible_message("[user] botches [user.p_their()] tackle and slams [user.p_their()] head into [target], knocking [user.p_them()]self silly!", "You botch your tackle and slam your head into [target], knocking yourself silly!", target) + to_chat(target, "[user] botches [user.p_their()] tackle and slams [user.p_their()] head into you, knocking [user.p_them()]self silly!") + + user.Paralyze(30) + var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) + if(hed) + hed.receive_damage(brute=20, updating_health=TRUE) + user.gain_trauma(/datum/brain_trauma/mild/concussion) + + if(-4 to -2) // glancing blow at best + user.visible_message("[user] lands a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", target) + to_chat(target, "[user] lands a weak tackle on you, briefly knocking you off-balance!") + + user.Knockdown(30) + if(ishuman(target) && !T.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) + T.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH) // maybe define a slightly more severe/longer slowdown for this + addtimer(CALLBACK(T, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH) + + if(-1 to 0) // decent hit, both parties are about equally inconvenienced + user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target) + to_chat(target, "[user] lands a passable tackle on you, sending you both tumbling!") + + target.adjustStaminaLoss(stamina_cost) + target.Paralyze(5) + user.Knockdown(20) + target.Knockdown(25) + + if(1 to 2) // solid hit, tackler has a slight advantage + user.visible_message("[user] lands a solid tackle on [target], knocking them both down hard!", "You land a solid tackle on [target], knocking you both down hard!", target) + to_chat(target, "[user] lands a solid tackle on you, knocking you both down hard!") + + target.adjustStaminaLoss(30) + target.Paralyze(5) + user.Knockdown(10) + target.Knockdown(20) + + if(3 to 4) // really good hit, the target is definitely worse off here. Without positive modifiers, this is as good a tackle as you can land + user.visible_message("[user] lands an expert tackle on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!", "You land an expert tackle on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!", target) + to_chat(target, "[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab!") + + user.SetKnockdown(0) + user.forceMove(get_turf(target)) + target.adjustStaminaLoss(40) + target.Paralyze(5) + target.Knockdown(30) + if(ishuman(target) && ishuman(user)) + S.dna.species.grab(S, T) + S.setGrabState(GRAB_PASSIVE) + + if(5 to INFINITY) // absolutely BODIED + user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) + to_chat(target, "[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you!") + + user.SetKnockdown(0) + user.forceMove(get_turf(target)) + target.adjustStaminaLoss(40) + target.Paralyze(5) + target.Knockdown(30) + if(ishuman(target) && ishuman(user)) + S.dna.species.grab(S, T) + S.setGrabState(GRAB_AGGRESSIVE) + + + return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH + +/** + * rollTackle() + * + * This handles all of the modifiers for the actual carbon-on-carbon tackling, and gets its own proc because of how many there are (with plenty more in mind!) + * + * The base roll is between (-3, 3), with negative numbers favoring the target, and positive numbers favoring the tackler. The target and the tackler are both assessed for + * how easy they are to knock over, with clumsiness and dwarfiness being strong maluses for each, and gigantism giving a bonus for each. These numbers and ideas + * are absolutely subject to change. + + * In addition, after subtracting the defender's mod and adding the attacker's mod to the roll, the component's base (skill) mod is added as well. Some sources of tackles + * are better at taking people down, like the bruiser and rocket gloves, while the dolphin gloves have a malus in exchange for better mobility. +*/ +/datum/component/tackler/proc/rollTackle(mob/living/carbon/target) + var/defense_mod = 0 + var/attack_mod = 0 + + // DE-FENSE + if(target.drunkenness > 60) // drunks are easier to knock off balance + defense_mod -= 3 + else if(target.drunkenness > 30) + defense_mod -= 1 + if(HAS_TRAIT(target, TRAIT_CLUMSY)) + defense_mod -= 2 + if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over + defense_mod += 1 + if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS)) + defense_mod -= 2 + if(HAS_TRAIT(target, TRAIT_DWARF)) + defense_mod -= 2 + if(HAS_TRAIT(target, TRAIT_GIANT)) + defense_mod += 2 + + if(ishuman(target)) + var/mob/living/carbon/human/T = target + var/suit_slot = T.get_item_by_slot(ITEM_SLOT_OCLOTHING) + + if(isnull(T.wear_suit) && isnull(T.w_uniform)) // who honestly puts all of their effort into tackling a naked guy? + defense_mod += 2 + if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/space/hardsuit))) + defense_mod += 1 + if(T.is_shove_knockdown_blocked()) // riot armor and such + defense_mod += 5 + if(T.is_holding_item_of_type(/obj/item/shield)) + defense_mod += 2 + + if(islizard(T)) + if(!T.getorganslot(ORGAN_SLOT_TAIL)) // lizards without tails are off-balance + defense_mod -= 1 + else if(T.dna.species.is_wagging_tail()) // lizard tail wagging is robust and can swat away assailants! + defense_mod += 1 + + // OF-FENSE + var/mob/living/carbon/sacker = parent + + if(sacker.drunkenness > 60) // you're far too drunk to hold back! + attack_mod += 1 + else if(sacker.drunkenness > 30) // if you're only a bit drunk though, you're just sloppy + attack_mod -= 1 + if(HAS_TRAIT(sacker, TRAIT_CLUMSY)) + attack_mod -= 2 + if(HAS_TRAIT(sacker, TRAIT_DWARF)) + attack_mod -= 2 + if(HAS_TRAIT(sacker, TRAIT_GIANT)) + attack_mod += 2 + + if(ishuman(target)) + var/mob/living/carbon/human/S = sacker + + var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/riot))) // tackling in riot armor is more effective, but tiring + attack_mod += 2 + sacker.adjustStaminaLoss(20) + + var/r = rand(-3, 3) - defense_mod + attack_mod + skill_mod + return r + + +/** + * splat() + * + * This is where we handle diving into dense atoms, generally with effects ranging from bad to REALLY bad. This works as a percentile roll that is modified in two steps as detailed below. The higher + * the roll, the more severe the result. + * + * Mod 1: Speed + * * Base tackle speed is 1, which is what normal gripper gloves use. For other sources with higher speed tackles, like dolphin and ESPECIALLY rocket gloves, we obey Newton's laws and hit things harder. + * * For every unit of speed above 1, move the lower bound of the roll up by 15. Unlike Mod 2, this only serves to raise the lower bound, so it can't be directly counteracted by anything you can control. + * + * Mod 2: Misc + * -Flat modifiers, these take whatever you rolled and add/subtract to it, with the end result capped between the minimum from Mod 1 and 100. Note that since we can't roll higher than 100 to start with, + * wearing a helmet should be enough to remove any chance of permanently paralyzing yourself and dramatically lessen knocking yourself unconscious, even with rocket gloves. Will expand on maybe + * * Wearing a helmet: -6 + * * Wearing riot armor: -6 + * * Clumsy: +6 + * + * Effects: Below are the outcomes based off your roll, in order of increasing severity + * * 1-63: Knocked down for a few seconds and a bit of brute and stamina damage + * * 64-83: Knocked silly, gain some confusion as well as the above + * * 84-93: Cranial trauma, get a concussion and more confusion, plus more damage + * * 94-98: Knocked unconscious, significant chance to get a random mild brain trauma, as well as a fair amount of damage + * * 99-100: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky! +*/ +/datum/component/tackler/proc/splat(mob/living/carbon/user, atom/hit) + if(istype(hit, /obj/machinery/vending)) // before we do anything else- + var/obj/machinery/vending/darth_vendor = hit + darth_vendor.tilt(user, TRUE) + return + else if(istype(hit, /obj/structure/window)) + var/obj/structure/window/W = hit + splatWindow(user, W) + if(QDELETED(W)) + return COMPONENT_MOVABLE_IMPACT_NEVERMIND + return + + var/oopsie_mod = 0 + var/danger_zone = (speed - 1) * 15 // for every extra speed we have over 1, take away 15 of the safest chance + danger_zone = max(min(danger_zone, 100), 1) + + if(ishuman(user)) + var/mob/living/carbon/human/S = user + var/head_slot = S.get_item_by_slot(ITEM_SLOT_HEAD) + var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(head_slot && (istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) + oopsie_mod -= 6 + if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/riot))) + oopsie_mod -= 6 + + if(HAS_TRAIT(user, TRAIT_CLUMSY)) + oopsie_mod += 6 //honk! + + var/oopsie = rand(danger_zone, 100) + if(oopsie >= 94 && oopsie_mod < 0) // good job avoiding getting paralyzed! gold star! + to_chat(user, "You're really glad you're wearing protection!") + oopsie += oopsie_mod + + switch(oopsie) + if(99 to INFINITY) + // can you imagine standing around minding your own business when all of the sudden some guy fucking launches himself into a wall at full speed and irreparably paralyzes himself? + user.visible_message("[user] slams face-first into [hit] at an awkward angle, severing [user.p_their()] spinal column with a sickening crack! Holy shit!", "You slam face-first into [hit] at an awkward angle, severing your spinal column with a sickening crack! Holy shit!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(30) + playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE) + playsound(user, 'sound/effects/splat.ogg', 70, TRUE) + user.emote("scream") + user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed! + shake_camera(user, 7, 7) + user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + user.clear_fullscreen("flash", 4.5) + + if(94 to 98) + user.visible_message("[user] slams face-first into [hit] with a concerning squish, immediately going limp!", "You slam face-first into [hit], and immediately lose consciousness!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(30) + user.Unconscious(100) + user.gain_trauma_type(BRAIN_TRAUMA_MILD) + user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) + shake_camera(user, 6, 6) + user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + user.clear_fullscreen("flash", 3.5) + + if(84 to 93) + user.visible_message("[user] slams head-first into [hit], suffering major cranial trauma!", "You slam head-first into [hit], and the world explodes around you!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(30) + user.confused += 15 + if(prob(80)) + user.gain_trauma(/datum/brain_trauma/mild/concussion) + user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) + user.Knockdown(40) + shake_camera(user, 5, 5) + user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + user.clear_fullscreen("flash", 2.5) + + if(64 to 83) + user.visible_message("[user] slams hard into [hit], knocking [user.p_them()] senseless!", "You slam hard into [hit], knocking yourself senseless!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(10) + user.confused += 10 + user.Knockdown(30) + shake_camera(user, 3, 4) + + if(1 to 63) + user.visible_message("[user] slams into [hit]!", "You slam into [hit]!") + user.adjustStaminaLoss(20) + user.adjustBruteLoss(10) + user.Knockdown(30) + shake_camera(user, 2, 2) + + playsound(user, 'sound/weapons/smash.ogg', 70, TRUE) + + +/datum/component/tackler/proc/resetTackle() + tackling = FALSE + QDEL_NULL(tackle) + UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) + +///A special case for splatting for handling windows +/datum/component/tackler/proc/splatWindow(mob/living/carbon/user, obj/structure/window/W) + playsound(user, "sound/effects/Glasshit.ogg", 140, TRUE) + + if(W.type in list(/obj/structure/window, /obj/structure/window/fulltile, /obj/structure/window/unanchored, /obj/structure/window/fulltile/unanchored)) // boring unreinforced windows + for(var/i = 0, i < speed, i++) + var/obj/item/shard/shard = new /obj/item/shard(get_turf(user)) + shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult=3, pain_chance=5) + shard.AddElement(/datum/element/embed, shard.embedding) + user.hitby(shard, skipcatch = TRUE, hitpush = FALSE) + shard.embedding = list() + shard.AddElement(/datum/element/embed, shard.embedding) + W.obj_destruction() + user.adjustStaminaLoss(10 * speed) + user.Paralyze(30) + user.visible_message("[user] slams into [W] and shatters it, shredding [user.p_them()]self with glass!", "You slam into [W] and shatter it, shredding yourself with glass!") + + else + user.visible_message("[user] slams into [W] like a bug, then slowly slides off it!", "You slam into [W] like a bug, then slowly slide off it!") + user.Paralyze(10) + user.Knockdown(30) + W.take_damage(20 * speed) + user.adjustStaminaLoss(10 * speed) + user.adjustBruteLoss(5 * speed) + +/datum/component/tackler/proc/delayedSmash(obj/structure/window/W) + if(W) + W.obj_destruction() + playsound(W, "shatter", 70, TRUE) + +///Check to see if we hit a table, and if so, make a big mess! +/datum/component/tackler/proc/checkObstacle(mob/living/carbon/owner) + if(!tackling) + return + + var/turf/T = get_turf(owner) + var/obj/structure/table/kevved = locate(/obj/structure/table) in T.contents + if(!kevved) + return + + var/list/messes = list() + + // we split the mess-making into two parts (check what we're gonna send flying, intermission for dealing with the tackler, then actually send stuff flying) for the benefit of making sure the face-slam text + // comes before the list of stuff that goes flying, but can still adjust text + damage to how much of a mess it made + for(var/obj/item/I in T.contents) + if(!I.anchored) + messes += I + if(messes.len >= MAX_TABLE_MESSES) + break + + /// for telling HOW big of a mess we just made + var/HOW_big_of_a_miss_did_we_just_make = "" + if(messes.len) + if(messes.len < MAX_TABLE_MESSES / 4) + HOW_big_of_a_miss_did_we_just_make = ", making a mess" + else if(messes.len < MAX_TABLE_MESSES / 2) + HOW_big_of_a_miss_did_we_just_make = ", making a big mess" + else if(messes.len < MAX_TABLE_MESSES) + HOW_big_of_a_miss_did_we_just_make = ", making a giant mess" + else + HOW_big_of_a_miss_did_we_just_make = ", making a ginormous mess!" // an extra exclamation point!! for emphasis!!! + + owner.visible_message("[owner] trips over [kevved] and slams into it face-first[HOW_big_of_a_miss_did_we_just_make]!", "You trip over [kevved] and slam into it face-first[HOW_big_of_a_miss_did_we_just_make]!") + owner.adjustStaminaLoss(20 + messes.len * 2) + owner.adjustBruteLoss(10 + messes.len) + owner.Paralyze(5 * messes.len) // half a second of paralyze for each thing you knock around + owner.Knockdown(20 + 5 * messes.len) // 2 seconds of knockdown after the paralyze + + for(var/obj/item/I in messes) + var/dist = rand(1, 3) + var/sp = 2 + if(prob(25 * (src.speed - 1))) // if our tackle speed is higher than 1, with chance (speed - 1 * 25%), throw the thing at our tackle speed + 1 + sp = speed + 1 + I.throw_at(get_ranged_target_turf(I, pick(GLOB.alldirs), range = dist), range = dist, speed = sp) + I.visible_message("[I] goes flying[sp > 3 ? " dangerously fast" : ""]!") // standard embed speed + + playsound(owner, 'sound/weapons/smash.ogg', 70, TRUE) + tackle.finalize(hit=TRUE) + resetTackle() + +#undef MAX_TABLE_MESSES diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm index 823d391e14c..c41afef681d 100644 --- a/code/datums/elements/squish.dm +++ b/code/datums/elements/squish.dm @@ -1,24 +1,38 @@ #define SHORT 5/7 #define TALL 7/5 +/** + # squish.dm + * + * It's an element that squishes things. After the duration passes, it reverses the transformation it squished with, taking into account if they are a different orientation than they started (read: rotationally-fluid) + * + * Normal squishes apply vertically, as if the target is being squished from above, but you can set reverse to TRUE if you want to squish them from the sides, like if they pancake into a wall from the East or West +*/ /datum/element/squish element_flags = ELEMENT_DETACH -/datum/element/squish/Attach(datum/target, duration) +/datum/element/squish/Attach(datum/target, duration=20 SECONDS, reverse=FALSE) . = ..() if(!iscarbon(target)) return ELEMENT_INCOMPATIBLE var/mob/living/carbon/C = target - var/was_lying = (C.lying != 0) - addtimer(CALLBACK(src, .proc/Detach, C, was_lying), duration) + var/was_lying = (C.lying != 0) // is our spessmen sideways? the eternal question.. + addtimer(CALLBACK(src, .proc/Detach, C, was_lying, reverse), duration) - C.transform = C.transform.Scale(TALL, SHORT) + if(reverse) + C.transform = C.transform.Scale(SHORT, TALL) + else + C.transform = C.transform.Scale(TALL, SHORT) -/datum/element/squish/Detach(mob/living/carbon/C, was_lying) +/datum/element/squish/Detach(mob/living/carbon/C, was_lying, reverse) . = ..() if(istype(C)) var/is_lying = (C.lying != 0) + + if(reverse) + is_lying = !is_lying + if(was_lying == is_lying) C.transform = C.transform.Scale(SHORT, TALL) else diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index cf05b7aedb0..2346edaf847 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -92,6 +92,7 @@ /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner) if(..()) return + ADD_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION) owner.transform = owner.transform.Scale(1, 0.8) passtable_on(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") @@ -99,6 +100,7 @@ /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner) if(..()) return + REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION) owner.transform = owner.transform.Scale(1, 1.25) passtable_off(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") @@ -337,6 +339,7 @@ /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner) if(..()) return + ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.resize = 1.25 owner.update_transform() owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") @@ -344,6 +347,7 @@ /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner) if(..()) return + REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.resize = 0.8 owner.update_transform() owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 2f217a3f26c..93fc3631956 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -566,8 +566,13 @@ /atom/movable/proc/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) set waitfor = 0 - SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) - return hit_atom.hitby(src, throwingdatum=throwingdatum) + var/hitpush = TRUE + var/impact_signal = SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) + if(impact_signal & COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH) + hitpush = FALSE // hacky, tie this to something else or a proper workaround later + + if(impact_signal & ~COMPONENT_MOVABLE_IMPACT_NEVERMIND) // in case a signal interceptor broke or deleted the thing before we could process our hit + return hit_atom.hitby(src, throwingdatum=throwingdatum, hitpush=hitpush) /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked, datum/thrownthing/throwingdatum) if(!anchored && hitpush && (!throwingdatum || (throwingdatum.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)))) diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm index 255f13520cf..3180e896ab6 100644 --- a/code/game/gamemodes/clown_ops/clown_ops.dm +++ b/code/game/gamemodes/clown_ops/clown_ops.dm @@ -31,7 +31,7 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/clown_shoes/combat mask = /obj/item/clothing/mask/gas/clown_hat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack/clown ears = /obj/item/radio/headset/syndicate/alt l_pocket = /obj/item/pinpointer/nuke/syndicate diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 334e0447855..a1f5e58c5fa 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -115,7 +115,7 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack/fireproof ears = /obj/item/radio/headset/syndicate/alt l_pocket = /obj/item/pinpointer/nuke/syndicate diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm index ec5a1e2d98f..37084a8d886 100644 --- a/code/game/objects/items/stacks/tape.dm +++ b/code/game/objects/items/stacks/tape.dm @@ -27,10 +27,17 @@ user.visible_message("[user] begins wrapping [I] with [src].", "You begin wrapping [I] with [src].") if(do_after(user, 30, target=I)) + use(1) + if(istype(I, /obj/item/clothing/gloves/fingerless)) + var/obj/item/clothing/gloves/tackler/offbrand/O = new /obj/item/clothing/gloves/tackler/offbrand + to_chat(user, "You turn [I] into [O] with [src].") + QDEL_NULL(I) + user.put_in_hands(O) + return + I.embedding = conferred_embed I.AddElement(/datum/element/embed, I.embedding) to_chat(user, "You finish wrapping [I] with [src].") - use(1) I.name = "[prefix] [I.name]" if(istype(I, /obj/item/grenade)) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 417e7505bc3..2320c39acd2 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -39,8 +39,8 @@ ..() new /obj/item/clothing/glasses/eyepatch(src) new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/clothing/gloves/combat(src) - new /obj/item/clothing/gloves/combat(src) + new /obj/item/clothing/gloves/tackler/combat(src) + new /obj/item/clothing/gloves/tackler/combat(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/mask/gas/sechailer/swat(src) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 9648fa0c214..7f4c3a55cfb 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -465,7 +465,7 @@ name = "Syndicate Operative Empty" uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt back = /obj/item/storage/backpack implants = list(/obj/item/implant/weapons_auth) diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index 42d33ec0859..1e5f08ae614 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -67,7 +67,7 @@ suit = /obj/item/clothing/suit/armor/vest/blueshirt belt = /obj/item/gun/ballistic/automatic/pistol/m1911 head = /obj/item/clothing/head/helmet/police - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat shoes = /obj/item/clothing/shoes/jackboots mask = /obj/item/clothing/mask/gas/sechailer/swat/spacepol glasses = /obj/item/clothing/glasses/sunglasses @@ -97,7 +97,7 @@ uniform = /obj/item/clothing/under/rank/prisoner head = /obj/item/clothing/head/hunter suit = /obj/item/clothing/suit/space/hunter - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat shoes = /obj/item/clothing/shoes/jackboots mask = /obj/item/clothing/mask/gas/hunter glasses = /obj/item/clothing/glasses/sunglasses/garb diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 6d33ad62e63..f40168e1ece 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -485,7 +485,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf toggle_helmet = FALSE // see the whites of their eyes shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat id = /obj/item/card/id/away belt = /obj/item/gun/ballistic/automatic/pistol/deagle/ctf l_pocket = /obj/item/ammo_box/magazine/recharge/ctf diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 0cb1b9e5431..1665b340022 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -475,7 +475,7 @@ glasses = /obj/item/clothing/glasses/eyepatch mask = /obj/item/clothing/mask/cigarette/cigar/cohiba head = /obj/item/clothing/head/centhat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat shoes = /obj/item/clothing/shoes/combat/swat r_pocket = /obj/item/lighter id = /obj/item/card/id @@ -492,7 +492,7 @@ uniform = /obj/item/clothing/under/rank/security/officer suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat mask = /obj/item/clothing/mask/gas/sechailer/swat head = /obj/item/clothing/head/helmet/swat/nanotrasen back = /obj/item/storage/backpack/security diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index c7a2b723c50..8d7698e0bce 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -602,7 +602,7 @@ /obj/item/clothing/suit/armor/vest/russian, /obj/item/clothing/head/helmet/rus_helmet, /obj/item/clothing/shoes/russian, - /obj/item/clothing/gloves/combat, + /obj/item/clothing/gloves/tackler/combat, /obj/item/clothing/under/syndicate/rus_army, /obj/item/clothing/under/costume/soviet, /obj/item/clothing/mask/russian_balaclava, @@ -629,8 +629,8 @@ /obj/item/clothing/mask/gas/sechailer/swat, /obj/item/storage/belt/military/assault, /obj/item/storage/belt/military/assault, - /obj/item/clothing/gloves/combat, - /obj/item/clothing/gloves/combat) + /obj/item/clothing/gloves/tackler/combat, + /obj/item/clothing/gloves/tackler/combat) crate_name = "swat crate" /datum/supply_pack/security/armory/wt550_single diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm new file mode 100644 index 00000000000..b86b2697173 --- /dev/null +++ b/code/modules/clothing/gloves/tacklers.dm @@ -0,0 +1,100 @@ +/obj/item/clothing/gloves/tackler + name = "gripper gloves" + desc = "Special gloves that manipulate the blood vessels in the wearer's hands, granting them the ability to launch headfirst into walls." + icon_state = "tackle" + item_state = "tackle" + transfer_prints = TRUE + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + resistance_flags = NONE + custom_premium_price = 350 + /// For storing our tackler datum so we can remove it after + var/datum/component/tackler + /// See: [/datum/component/tackler/var/stamina_cost] + var/tackle_stam_cost = 25 + /// See: [/datum/component/tackler/var/base_knockdown] + var/base_knockdown = 1 SECONDS + /// See: [/datum/component/tackler/var/range] + var/tackle_range = 4 + /// See: [/datum/component/tackler/var/min_distance] + var/min_distance = 0 + /// See: [/datum/component/tackler/var/speed] + var/tackle_speed = 1 + /// See: [/datum/component/tackler/var/skill_mod] + var/skill_mod = 0 + +/obj/item/clothing/gloves/tackler/equipped(mob/user, slot) + . = ..() + if(!ishuman(user)) + return + if(slot == ITEM_SLOT_GLOVES) + var/mob/living/carbon/human/H = user + tackler = H.AddComponent(/datum/component/tackler, stamina_cost=tackle_stam_cost, base_knockdown = base_knockdown, range = tackle_range, speed = tackle_speed, skill_mod = skill_mod, min_distance = min_distance) + +/obj/item/clothing/gloves/tackler/dropped(mob/user) + . = ..() + if(!ishuman(user)) + return + var/mob/living/carbon/human/H = user + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) + qdel(tackler) + +/obj/item/clothing/gloves/tackler/dolphin + name = "dolphin gloves" + desc = "Sleek, aerodynamic gripper gloves that are less effective at actually performing takedowns, but more effective at letting the user sail through the hallways and cause accidents." + icon_state = "tackledolphin" + item_state = "tackledolphin" + + tackle_stam_cost = 15 + base_knockdown = 0.5 SECONDS + tackle_range = 5 + tackle_speed = 2 + min_distance = 2 + skill_mod = -2 + +/obj/item/clothing/gloves/tackler/combat + name = "gorilla gloves" + desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!" + icon_state = "black" + item_state = "blackgloves" + + tackle_stam_cost = 35 + base_knockdown = 1.5 SECONDS + tackle_range = 5 + skill_mod = 2 + + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + resistance_flags = NONE + +/obj/item/clothing/gloves/tackler/combat/insulated + name = "guerilla gloves" + desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks." + siemens_coefficient = 0 + permeability_coefficient = 0.05 + +/obj/item/clothing/gloves/tackler/rocket + name = "rocket gloves" + desc = "The ultimate in high risk, high reward, perfect for when you need to stop a criminal from fifty feet away or die trying. Banned in most Spinward gridiron football and rugby leagues." + icon_state = "tacklerocket" + item_state = "tacklerocket" + + tackle_stam_cost = 50 + base_knockdown = 2 SECONDS + tackle_range = 10 + min_distance = 7 + tackle_speed = 6 + skill_mod = 7 + +/obj/item/clothing/gloves/tackler/offbrand + name = "improvised gripper gloves" + desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose." + icon_state = "fingerless" + item_state = "fingerless" + + tackle_stam_cost = 30 + base_knockdown = 1.75 SECONDS + min_distance = 2 + skill_mod = -1 diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 9e23a71609c..068c5394bb3 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -59,6 +59,7 @@ id = /obj/item/card/id/ert/security suit = /obj/item/clothing/suit/space/hardsuit/ert/sec glasses = /obj/item/clothing/glasses/hud/security/sunglasses + gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack/ert/security belt = /obj/item/storage/belt/security/full backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 06e814fc1a6..80eee7351fe 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -11,7 +11,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/officer shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated glasses = /obj/item/clothing/glasses/thermal/eyepatch ears = /obj/item/radio/headset/headset_cent/commander mask = /obj/item/clothing/mask/cigarette/cigar/havana @@ -244,7 +244,7 @@ uniform = /obj/item/clothing/under/rank/centcom/commander suit = /obj/item/clothing/suit/armor/bulletproof shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/headset_cent/commander glasses = /obj/item/clothing/glasses/eyepatch mask = /obj/item/clothing/mask/cigarette/cigar/cohiba @@ -322,7 +322,7 @@ uniform = /obj/item/clothing/under/costume/soviet head = /obj/item/clothing/head/pirate/captain shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/headset_cent glasses = /obj/item/clothing/glasses/thermal/eyepatch suit = /obj/item/clothing/suit/pirate/captain @@ -380,7 +380,7 @@ uniform = /obj/item/clothing/under/rank/centcom/commander suit = /obj/item/clothing/suit/space/hardsuit/deathsquad shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated mask = /obj/item/clothing/mask/gas/sechailer/swat glasses = /obj/item/clothing/glasses/hud/toggle/thermal back = /obj/item/storage/backpack/security diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm index 5b46df7f600..520c4c0f8b7 100644 --- a/code/modules/clothing/outfits/vr.dm +++ b/code/modules/clothing/outfits/vr.dm @@ -17,7 +17,7 @@ name = "Syndicate VR Operative - Basic" uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack id = /obj/item/card/id/syndicate belt = /obj/item/gun/ballistic/automatic/pistol diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 8a966ae7dec..346d9d94d2f 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -20,7 +20,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/helmet/swat @@ -39,7 +39,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen @@ -59,7 +59,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen/harness @@ -130,7 +130,7 @@ uniform = /obj/item/clothing/under/syndicate/camo suit = /obj/item/clothing/suit/armor/bulletproof shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/helmet/alt mask = /obj/item/clothing/mask/balaclava @@ -177,7 +177,7 @@ uniform = /obj/item/clothing/under/rank/security/officer suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/sechailer/swat head = /obj/item/clothing/head/helmet/swat/nanotrasen diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 47fc10108b2..59dda323800 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -197,7 +197,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) visible_message("[name] burrows into the flesh of [H]!") var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L - if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff! + if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff! L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc) else L = new(H.loc) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 1fc9bd473e7..d95cd03347d 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -717,7 +717,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/manly_dorf/on_mob_metabolize(mob/living/M) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE)) + if(HAS_TRAIT(H, TRAIT_DWARF) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE)) to_chat(H, "Now THAT is MANLY!") boozepwr = 5 //We've had worse in the mines dorf_mode = TRUE diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 851ce8d842d..bf11112bd6f 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -584,3 +584,27 @@ build_path = /obj/item/stack/sticky_tape/pointy category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SERVICE + + + +///////////////////////////////////////// +////////////Tackle Gloves//////////////// +///////////////////////////////////////// + +/datum/design/tackle_dolphin + name = "Dolphin Gloves" + id = "tackle_dolphin" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 2500) + build_path = /obj/item/clothing/gloves/tackler/dolphin + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/tackle_rocket + name = "Rocket Gloves" + id = "tackle_rocket" + build_type = PROTOLATHE + materials = list(/datum/material/plasma = 1000, /datum/material/plastic = 2000) + build_path = /obj/item/clothing/gloves/tackler/rocket + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index e1b6897e00a..23748a32aea 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1145,9 +1145,6 @@ hidden = TRUE experimental = TRUE - - -// Can be researched after getting the basic sticky technology from the BEPIS major reward /datum/techweb_node/sticky_advanced id = "sticky_advanced" display_name = "Advanced Sticky Technology" @@ -1159,6 +1156,18 @@ hidden = TRUE experimental = TRUE +/datum/techweb_node/tackle_advanced + id = "tackle_advanced" + display_name = "Advanced Grapple Technology" + description = "Nanotrasen would like to remind its researching staff that it is never acceptable to \"glomp\" your coworkers, and further \"scientific trials\" on the subject \ + will no longer be accepted in its academic journals." + design_ids = list("tackle_dolphin", "tackle_rocket") + + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + export_price = 2500 + hidden = TRUE + experimental = TRUE + //Helpers for debugging/balancing the techweb in its entirety! /proc/total_techweb_exports() var/list/datum/techweb_node/processing = list() diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index a62b462c551..3d76787edea 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -130,7 +130,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/toggle/labcoat shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt back = /obj/item/storage/backpack r_pocket = /obj/item/gun/ballistic/automatic/pistol diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index b8a21fc5798..8a25cd96b0c 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -18,7 +18,8 @@ premium = list(/obj/item/storage/belt/security/webbing = 5, /obj/item/coin/antagtoken = 1, /obj/item/clothing/head/helmet/blueshirt = 1, - /obj/item/clothing/suit/armor/vest/blueshirt = 1) + /obj/item/clothing/suit/armor/vest/blueshirt = 1, + /obj/item/clothing/gloves/tackler = 5) refill_canister = /obj/item/vending_refill/security default_price = 650 extra_price = 700 diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index cb4251fd3c6240b89b7d7340c5c03331577990d9..f1ae2afed728e482394121a41faf6a3c66ac7679 100644 GIT binary patch literal 11611 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QU8F8|9&OUOfp9_@1Xi!M%!tmiCTQq5 z3lbFIId<$doxEOa7>@Bv!5{CB;!f9y{c0KrM3HT!w0FkAq5WAZ$APOv6sBP6)wvHd zW1k(1$HK#JQf*Y=g)walqZZim0=*XzXZ zVVK!Mqe~E9rV<9k(E(y2Ia?vxm#xHKEcGi7(tKV0NDmjnM7E23nmV%E!hiPSVoJ0K zj9Cv?*ROcOUh)z6!Wx(DT}+lzvM_-=36scUm)2(oyunu5m;2X)uwbYHE>`evZy3Rm zG0>Tt1PCrFtWMGud~Oj4g|0jcd7QOKfb9~v>bCM>TRiK_9l40KH4e9xq$`mfXw_BH zOn+OUiqdcx?0Q-d;y1kX!BFpoO!HA^DkfujYgp~sz-L7)tBq6C3JC%a40C!jK+bXL zh^@~Am|zL7#Hn2H^C7ZS3=jA>+N-zKT+_}CRazZ&DRC^jBH(=j!gHg`dNE<>{iqfa zm-c(aspGTwbLXCyl{wBD8Xmp`du#Gsar+AK^DMr^nSYTL*^ffZbo9nV=*a7T6KanI z_ruBZ1=&> ziXayC^IB0CBSg9`N1EXn0L~C<0&@?~*H_Si2B&X-N$8OiKXZ+V^@>P_* zhkJmKp$FV@PqFFYy&ZfYU~r=Cd2XQ{w|`;LphfC<8Kx5WphYUQ+cc8z&m$?J1Vj4Z zS7^RIede4J!-OgTVn|r$gK8}oM_id0g*4v|=YvNH7QI6$gwZ8x1bwZRTt^PGp?($F z;0}(fXzzL?Bemn+57p*PTXVz!6r9P*vh)YApYnyeKDU&W>v8ZWcJE9H8s4v^3$+za zxI(J81R>fs3Wrh_uaApX^C{*X8NpdhC7MHHIty&?P+rD7=|TDd_(?wol64mhV-C0rmgp+xt-y_a2lf_Ai)Ty|wfFIx zFnSo0P>iTp-YX1YAfLn1p|3D9pfIX#e+%&h> zL=*UD@1tKSsSF33w9vFS%cdba+{r0g>7zlP%GQ<%_Rw zdZy=L6c)?w?W^s_IYolQsRg;y!PqwrK7L<-R#RJ1%*^BiagZYTH%*hFUBCz2$ldrj z^~Ms6{)#MSg5`g?e|m&yShtIzzaaN!c60NtFs@gGwQc9~7lcpP&^&pEoIC8wyTM(a zTVF*6R{0^IXY=uPx&Lt_>1XD5X@;-6$mRtuepLe4S1QONftsDDzU|kFJtv%3OK{cd z4@fs?w}oNWPOgK)=ZY1M*=)0K^Va*@>Z8FyzLh}V-r+OEXp~nuGH?&)4P0;q6&lv$ z+oOxG{nQ>ive(FW!VFK`_lVhfqVnOc8>ZJ z0}tRxzsg17`YU3pqb7In0?Ww}q@xs%tcz@w#S?O#&0H`YL1_z0sGs_OmtOy5m=RRo>Cmpq9pne&+t#@aP{>`sl#%-7@d%B^ic>D=dNrLD<4=71 z0CHd7^NM;dcPceY!LYT#1Phwhu8m(CxN#>2*lRW+R>K!tfpLu=1J5qC4MtSbBbn

rp%FWRCykb()%{-* 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 diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 3570c01732c6db62833d144265c467807a5bbd1c..4c742f541e432cdcc55e4c5f4ea50f58289964e9 100644 GIT binary patch literal 18887 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ξh7_MSm}-7+a?#%U(*{hB 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 literal 17604 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 diff --git a/strings/tips.txt b/strings/tips.txt index 50b52275206..574ddeda91e 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -92,7 +92,7 @@ As the Chief Engineer, you can rename areas or create entirely new ones using yo As the Chief Engineer, your hardsuit is significantly better than everybody else's. It has the best features of both engineering and atmospherics hardsuits - boasting nigh-invulnerability to radiation and all atmospheric conditions. As the Chief Engineer, you can spy on and even forge PDA communications with the message monitor console! The key is in your office. As the Chief Engineer, your locker contains a jetpack upgrade that can be attached to hardsuits. -As the Chief Engineer, the power flow control console in your office will show you APC infos and lets you control them remotely. +As the Chief Engineer, the power flow control console in your office will show you APC infos and lets you control them remotely. As an Engineer, the supermatter shard is an extremely dangerous piece of equipment: touching it will disintegrate you. So will touching it with telepathy. As an Engineer, you can electrify grilles by placing wire "nodes" beneath them: the big seemingly unconnected bulges from a half completed wiring job. As an Engineer, return to Engineering once in a while to check on the engine and SMES cells. It's always a good idea to make sure containment isn't compromised. @@ -121,7 +121,7 @@ As the Head of Security, don't let the power go to your head. You may have high As the Warden, your duty is to be the watchdog of the brig and handler of prisoners when little is happening, and to hand out equipment and weapons to the security officers when a crisis strikes. As the Warden, keep a close eye on the armory at all times, as it is a favored strike point of nuclear operatives and cocky traitors. As the Warden, if a prisoner's crimes are heinous enough you can put them in permabrig or the gulag. Make sure to check on them once in a while! -As the Warden, you can implant criminals you suspect might re-offend with devices that will track their location and allow you to remotely inject them with disabling chemicals. +As the Warden, you can implant criminals you suspect might re-offend with devices that will track their location and allow you to remotely inject them with disabling chemicals. As the Warden, you can use handcuffs on orange prisoner shoes to turn them into cuffed shoes, forcing prisoners to walk and potentially thwarting an escape. As a Security Officer, communicate and coordinate with your fellow officers using the security channel (:s) to avoid confusion. As a Security Officer, your sechuds or HUDsunglasses can not only see crewmates' job assignments and criminal status, but also if they are mindshield implanted. You can tell by the flashing blue outline around their job icon. Use this to your advantage in a revolution to definitively tell who is on your side! @@ -240,9 +240,9 @@ As a Ghost, you can see the inside of a container on the ground by clicking on i As a Ghost, you can double click on just about anything to follow it. Or just warp around! As a Devil, you gain power for every three souls you control, however you also become more obvious. As a Devil, as long as you control at least one other soul, you will automatically resurrect, as long as a banishment ritual is not performed. -At which time a Devil's nameth is spake on the tongue of man, the Devil may appeareth. +At which time a Devil's nameth is spake on the tongue of man, the Devil may appeareth. As a Security Officer, remember that correlation does not equal causation. Someone may have just been at the wrong place at the wrong time! -As a Security Officer, remember that you can attach a sec-lite to your taser or your helmet! +As a Security Officer, remember that you can attach a sec-lite to your disabler or your helmet! You can swap floor tiles by holding a crowbar in one hand and a stack of tiles in the other. When hacking doors, cutting and mending a "test light wire" will restore power to the door. When crafting most items, you can either manually combine parts or use the crafting menu. @@ -250,3 +250,5 @@ Suit storage units not only remove blood and dirt from clothing, but also radiat Remote devices will work when used through cameras. For example: Bluespace RPEDs and door remotes. You can light a cigar on a supermatter crystal. Using sticky tape on items can make them stick to people and walls! Be careful, grenades might stick to your hand during the moment of truth! +In a pinch, stripping yourself naked will give you a sizeable resistance to being tackled. What do you value more, your freedom or your dignity? +Wearing riot armor makes you significantly more effective at performing tackle takedowns, but will use extra stamina with each leap! It will also significantly protect you from other tackles! diff --git a/tgstation.dme b/tgstation.dme index 860e01b8c03..bc9abfcf9c9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -436,6 +436,7 @@ #include "code\datums\components\stationstuck.dm" #include "code\datums\components\summoning.dm" #include "code\datums\components\swarming.dm" +#include "code\datums\components\tackle.dm" #include "code\datums\components\tactical.dm" #include "code\datums\components\tether.dm" #include "code\datums\components\thermite.dm" @@ -1654,6 +1655,7 @@ #include "code\modules\clothing\gloves\boxing.dm" #include "code\modules\clothing\gloves\color.dm" #include "code\modules\clothing\gloves\miscellaneous.dm" +#include "code\modules\clothing\gloves\tacklers.dm" #include "code\modules\clothing\head\_head.dm" #include "code\modules\clothing\head\beanie.dm" #include "code\modules\clothing\head\collectable.dm"