forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Knights in AR: Secure with swords and shocking batons (#303)
* standing here, I realize * you were just like me * now the animals slowly retreat to the shadows * o kurwa perkele * look what you did there you found a secret * makes rclick not draw both weapons * lets the batons actually be recharged * fixes text * lets you rename them * real * war * item slot back * makes the sheath fit where juni's dumb puppy needs it to * fixes quickdraw * its over
- Loading branch information
1 parent
291411b
commit 9e8cbd5
Showing
16 changed files
with
790 additions
and
3 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
175 changes: 175 additions & 0 deletions
175
modular_doppler/modular_weapons/code/sec_swords/baton.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| /obj/item/melee/baton/doppler_security | ||
| name = "electro baton" | ||
| desc = "A high power baton for incapacitating humans and similar with. Delivers powerful jolts of electricity \ | ||
| that may cause bodily harm, but will -- without a doubt -- entice cooperation." | ||
|
|
||
| desc_controls = "<b>Left Click</b> to stun, <b>Right Click</b> to harm." | ||
| context_living_rmb_active = "Harmful Stun" | ||
| attack_verb_continuous = list("beats") | ||
| attack_verb_simple = list("beat") | ||
|
|
||
| icon = 'modular_doppler/modular_weapons/icons/obj/sec_swords.dmi' | ||
| icon_state = "baton_two" | ||
| lefthand_file = 'modular_doppler/modular_weapons/icons/mob/inhands/melee_lefthand.dmi' | ||
| righthand_file = 'modular_doppler/modular_weapons/icons/mob/inhands/melee_righthand.dmi' | ||
| inhand_icon_state = "baton_two" | ||
| icon_angle = -20 | ||
|
|
||
| on_stun_sound = 'sound/items/weapons/taserhit.ogg' | ||
| on_stun_volume = 50 | ||
| drop_sound = 'sound/items/baton/stun_baton_active_drop.ogg' | ||
| pickup_sound = 'sound/items/baton/stun_baton_active_pickup.ogg' | ||
| sound_vary = TRUE | ||
|
|
||
| active = TRUE | ||
| force = 10 | ||
| wound_bonus = 0 | ||
| armor_type = /datum/armor/baton_security | ||
| throwforce = 7 | ||
| force_say_chance = 50 | ||
| stamina_damage = 35 // DOPPLER EDIT - 4 baton crit now (Original: 60) | ||
| knockdown_time = 5 SECONDS | ||
| clumsy_knockdown_time = 15 SECONDS | ||
| cooldown = 2.5 SECONDS | ||
|
|
||
| var/obj/item/stock_parts/power_store/cell | ||
| var/preload_cell_type //if not empty the baton starts with this type of cell | ||
| var/cell_hit_cost = STANDARD_CELL_CHARGE | ||
|
|
||
| /obj/item/melee/baton/doppler_security/Initialize(mapload) | ||
| . = ..() | ||
| if(preload_cell_type) | ||
| if(!ispath(preload_cell_type, /obj/item/stock_parts/power_store/cell)) | ||
| log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].") | ||
| else | ||
| cell = new preload_cell_type(src) | ||
|
|
||
| /obj/item/melee/baton/doppler_security/get_cell() | ||
| return cell | ||
|
|
||
| /obj/item/melee/baton/doppler_security/suicide_act(mob/living/user) | ||
| if(cell?.charge && active) | ||
| user.visible_message(span_suicide("[user] is putting the live [name] right to [user.p_their()] heart! It looks like [user.p_theyre()] trying to commit suicide!")) | ||
| attack(user, user) | ||
| return FIRELOSS | ||
| return | ||
|
|
||
| /obj/item/melee/baton/doppler_security/Destroy() | ||
| if(cell) | ||
| QDEL_NULL(cell) | ||
| UnregisterSignal(src, COMSIG_ATOM_ATTACKBY) | ||
| return ..() | ||
|
|
||
| /obj/item/melee/baton/doppler_security/examine(mob/user) | ||
| . = ..() | ||
| if(cell) | ||
| . += span_notice("\The [src] is [round(cell.percent())]% charged.") | ||
| else | ||
| . += span_warning("\The [src] does not have a power source installed.") | ||
|
|
||
| /obj/item/melee/baton/doppler_security/proc/deductcharge(deducted_charge) | ||
| if(!cell) | ||
| return | ||
| //Note this value returned is significant, as it will determine | ||
| //if a stun is applied or not | ||
| . = cell.use(deducted_charge) | ||
|
|
||
| /obj/item/melee/baton/doppler_security/clumsy_check(mob/living/carbon/human/user) | ||
| if(!active || !HAS_TRAIT(user, TRAIT_CLUMSY) || prob(50)) | ||
| return FALSE | ||
| user.visible_message(span_danger("[user] accidentally touches the prongs of [src]! Fool they are!"), span_userdanger("You accidentally touch the prongs of [src]!")) | ||
|
|
||
| if(iscyborg(user)) | ||
| if(affect_cyborg) | ||
| user.flash_act(affect_silicon = TRUE) | ||
| user.Paralyze(clumsy_knockdown_time) | ||
| additional_effects_cyborg(user, user) // user is the target here | ||
| if(on_stun_sound) | ||
| playsound(get_turf(src), on_stun_sound, on_stun_volume, TRUE, -1) | ||
| else | ||
| playsound(get_turf(src), 'sound/items/weapons/taserhit.ogg', 10, TRUE) | ||
| else | ||
| if(ishuman(user)) | ||
| var/mob/living/carbon/human/human_user = user | ||
| human_user.force_say() | ||
| user.Knockdown(clumsy_knockdown_time) | ||
| user.apply_damage(stamina_damage, STAMINA) | ||
| additional_effects_non_cyborg(user, user) | ||
| if(on_stun_sound) | ||
| playsound(get_turf(src), on_stun_sound, on_stun_volume, TRUE, -1) | ||
|
|
||
| user.apply_damage(2 * force, BURN, BODY_ZONE_CHEST, attacking_item = src) | ||
|
|
||
| log_combat(user, user, "accidentally stun attacked [user.p_them()]self due to their clumsiness", src) | ||
| if(stun_animation) | ||
| user.do_attack_animation(user) | ||
| SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK) | ||
| deductcharge(cell_hit_cost) | ||
|
|
||
| /// Handles prodding targets with turned off stunbatons and right clicking stun'n'bash | ||
| /obj/item/melee/baton/doppler_security/baton_attack(mob/living/target, mob/living/user, modifiers) | ||
| . = ..() | ||
| if(. != BATON_DO_NORMAL_ATTACK) | ||
| return | ||
| if(LAZYACCESS(modifiers, RIGHT_CLICK)) | ||
| if(active && cooldown_check <= world.time && !check_parried(target, user)) | ||
| finalize_baton_attack(target, user, modifiers, in_attack_chain = FALSE) | ||
| else if(!user.combat_mode) | ||
| target.visible_message(span_warning("[user] prods [target] with [src]. Luckily it was off."), \ | ||
| span_warning("[user] prods you with [src]. Luckily it was off.")) | ||
| return BATON_ATTACK_DONE | ||
|
|
||
| /obj/item/melee/baton/doppler_security/baton_effect(mob/living/target, mob/living/user, modifiers, stun_override) | ||
| if(iscyborg(loc)) | ||
| var/mob/living/silicon/robot/robot = loc | ||
| if(!robot || !robot.cell || !robot.cell.use(cell_hit_cost)) | ||
| return FALSE | ||
| else if(!deductcharge(cell_hit_cost)) | ||
| return FALSE | ||
| stun_override = 0 //Avoids knocking people down prematurely. | ||
| return ..() | ||
|
|
||
| /obj/item/melee/baton/doppler_security/additional_effects_non_cyborg(mob/living/target, mob/living/user) | ||
| target.set_jitter_if_lower(40 SECONDS) | ||
| target.set_stutter_if_lower(16 SECONDS) | ||
| if(iscarbon(target)) | ||
| var/mob/living/carbon/big_shocker = target | ||
| big_shocker.electrocute_act(10, src, 1, jitter_time = 0 SECONDS, stutter_time = 0 SECONDS, stun_duration = 0 SECONDS) | ||
| else | ||
| target.electrocute_act(10, src, 1) | ||
| SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK) | ||
| addtimer(CALLBACK(src, PROC_REF(apply_stun_effect_end), target), 2 SECONDS) | ||
|
|
||
| /// After the initial stun period, we check to see if the target needs to have the stun applied. | ||
| /obj/item/melee/baton/doppler_security/proc/apply_stun_effect_end(mob/living/target) | ||
| var/trait_check = HAS_TRAIT(target, TRAIT_BATON_RESISTANCE) //var since we check it in out to_chat as well as determine stun duration | ||
| if(!target.IsKnockdown()) | ||
| to_chat(target, span_warning("Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]")) | ||
|
|
||
| if(!trait_check) | ||
| target.Knockdown(knockdown_time) | ||
|
|
||
| /obj/item/melee/baton/doppler_security/get_wait_description() | ||
| return span_danger("The baton is still charging!") | ||
|
|
||
| /obj/item/melee/baton/doppler_security/get_stun_description(mob/living/target, mob/living/user) | ||
| . = list() | ||
|
|
||
| .["visible"] = span_danger("[user] shocks [target] with [src]!") | ||
| .["local"] = span_userdanger("[user] shocks you with [src]!") | ||
|
|
||
| /obj/item/melee/baton/doppler_security/get_unga_dunga_cyborg_stun_description(mob/living/target, mob/living/user) | ||
| . = list() | ||
|
|
||
| .["visible"] = span_danger("[user] tries to shock [target] with [src], and predictably fails!") | ||
| .["local"] = span_userdanger("[user] tries to... shock you with [src]?") | ||
|
|
||
| /obj/item/melee/baton/doppler_security/emp_act(severity) | ||
| . = ..() | ||
| if (!cell) | ||
| return | ||
| if (!(. & EMP_PROTECT_SELF)) | ||
| deductcharge(STANDARD_CELL_CHARGE / severity) | ||
|
|
||
| /obj/item/melee/baton/doppler_security/loaded //this one starts with a cell pre-installed. | ||
| preload_cell_type = /obj/item/stock_parts/power_store/cell/high |
49 changes: 49 additions & 0 deletions
49
modular_doppler/modular_weapons/code/sec_swords/big_sword.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /obj/item/melee/secblade | ||
| name = "security shortblade" | ||
| desc = "A utilitarian weapon, handle and blade, with little more. \ | ||
| Designed for ease of blade replacement when it inevitably breaks due to mistreatment." | ||
|
|
||
| icon = 'modular_doppler/modular_weapons/icons/obj/sec_swords.dmi' | ||
| icon_state = "sec_sword" | ||
| lefthand_file = 'modular_doppler/modular_weapons/icons/mob/inhands/melee_lefthand.dmi' | ||
| righthand_file = 'modular_doppler/modular_weapons/icons/mob/inhands/melee_righthand.dmi' | ||
| inhand_icon_state = "sec_sword" | ||
| icon_angle = -20 | ||
|
|
||
| hitsound = 'sound/items/weapons/bladeslice.ogg' | ||
| block_sound = 'sound/items/weapons/parry.ogg' | ||
|
|
||
| obj_flags = CONDUCTS_ELECTRICITY | ||
| sharpness = SHARP_EDGED | ||
| w_class = WEIGHT_CLASS_BULKY | ||
| obj_flags = UNIQUE_RENAME | ||
|
|
||
| force = 18 | ||
| throwforce = 10 | ||
| block_chance = 1 // Nah, I'd win | ||
| wound_bonus = 0 | ||
| bare_wound_bonus = 20 | ||
|
|
||
| attack_verb_continuous = list("attacks", "slashes", "slices", "tears", "lacerates", "rips", "dices", "rends") | ||
| attack_verb_simple = list("attack", "slash", "slice", "tear", "lacerate", "rip", "dice", "rend") | ||
|
|
||
| var/list/alt_continuous = list("stabs", "pierces", "impales") | ||
| var/list/alt_simple = list("stab", "pierce", "impale") | ||
|
|
||
| /obj/item/melee/secblade/Initialize(mapload) | ||
| . = ..() | ||
| AddComponent(/datum/component/butchering, speed = 4 SECONDS, effectiveness = 100) | ||
| alt_continuous = string_list(alt_continuous) | ||
| alt_simple = string_list(alt_simple) | ||
| AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple, -5) | ||
|
|
||
| /obj/item/melee/secblade/training | ||
| name = "training shortblade" | ||
| desc = "A utilitarian weapon, handle and blade, with little more. \ | ||
| This one doesn't seem completely real, incapable of bloodshed but likely still hurts quite a lot." | ||
|
|
||
| icon_state = "training_sword" | ||
|
|
||
| damtype = STAMINA | ||
| wound_bonus = -50 | ||
| bare_wound_bonus = -50 |
4 changes: 4 additions & 0 deletions
4
modular_doppler/modular_weapons/code/sec_swords/holodeck_trainer.dm
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| /datum/map_template/holodeck/doppler_sword_trainer | ||
| name = "Holodeck - Shortblade Trainer" | ||
| template_id = "holodeck_doppler_sword_trainer" | ||
| mappath = "_maps/templates/holodeck_doppler_sword_trainer.dmm" |
Oops, something went wrong.