d83aa6d000
brings back telebaton stamina damage up. They may have been OP before, but nerfing the heads main and often only weapon so that it can't even stam crit is too much
2025-09-04 22:45:21 +02:00
998c54868d
nerfed telebatons
...
nerfed telescopic batons on the basis that all heads start with one, and it seems to win most combats far too easily due to how much you can keep knocking someone down, dealing constant stam damage. The cooldown to hit is much longer now and it deals much less stamina damage
2025-06-28 12:30:00 +02:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
b8bc94ba13
man
2023-01-29 00:49:55 -05:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
3070f178e0
Merge remote-tracking branch 'citadel/master' into combat_patches_1
2021-07-18 15:12:52 -07:00
8710731b87
tweaks
2021-07-01 20:42:55 -07:00
22ad8f2c8c
Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
...
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
9bd1433bbe
Adds a child item to the telebaton
...
identical stats for the future but different looks.
2021-06-25 11:38:21 +02:00
98ff06fa1a
the roasted roasted roasted roasted roasted roasted roasted roasted......... ( #14850 )
...
* Update misc.dm
* Update code/game/objects/items/melee/misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
* Update misc.dm
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2021-06-21 17:54:56 +02:00
01e0fa16fe
it works.
2021-06-14 13:52:48 -07:00
53e95b7356
theseventeenthofmany
2021-06-11 19:48:04 -04:00
1a800cc470
modifications
2021-06-07 19:40:16 -07:00
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
a62d942bee
telescopic batons now have a message when being toggled. you can now threateningly point extended telebatons at people. ( #14580 )
...
* Update misc.dm
* Update code/game/objects/items/melee/misc.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-04-13 10:22:01 +02:00
02b52e6142
framework
2021-03-20 16:02:26 -07:00
5d51025ad6
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-15 14:39:16 -07:00
e43838739d
changes
2021-02-28 00:37:39 -07:00
70c828f74d
changes
2021-02-28 00:27:14 -07:00
de69e9996a
nerfs cqc
2021-02-21 13:10:08 -08:00
1ea0dd9f76
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-09-19 15:56:13 -07:00
6028c66ceb
Fixed the combat log issue
2020-08-30 08:26:29 -07:00
4cf040a11a
Makes plastitanium rapier not silently poison for pacifists.
2020-08-30 06:25:00 -07:00
de3227e3e0
fix
2020-08-04 22:55:33 -07:00
9721025582
Merge branch 'master' into wounds-part-2
2020-07-29 15:47:44 +01:00
2a29f73ac8
ok
2020-07-25 17:34:12 -07:00
7fb55a02a5
section one
2020-07-24 22:34:22 +01:00
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
584e74590f
port1
2020-07-17 02:01:33 +01:00
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
0779dd560e
More and more fixes.
2020-06-29 18:52:37 +02:00
34d8aa0ee9
refactor
2020-05-30 23:13:16 -07:00
1fef5825a9
definition fixes
2020-05-30 22:09:13 -07:00
e5c32c1746
changes
2020-05-30 20:11:18 -07:00
05fe0c7dcc
ok
2020-05-30 00:59:29 -07:00
f8741b6a0b
adjust
2020-05-29 19:50:11 -07:00
18bef15afc
captain rapier
2020-05-29 02:36:13 -07:00
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
95c6c7345c
implementations
2020-05-24 14:56:01 -07:00
ffd5dd9615
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit732
2020-05-08 19:01:28 +02:00
a412e840f7
'mob_run_block' and 'mob_check_block' macros
2020-05-08 18:52:32 +02:00
001109cfcd
About ready.
2020-05-05 20:58:44 +02:00
b383066e57
Replacing the MATERIAL_NO_EFFECTS flag with MATERIAL_EFFECTS.
2020-05-02 00:00:49 +02:00
300c8e3c6d
Merge remote-tracking branch 'citadel/master' into shield_refactor
2020-03-21 09:53:39 -07:00
0e3193e929
relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important ( #11376 )
...
* combat refactoring
* i hate this
* mobility flags part 2 time xd
* whew
* stuff
* a
* ok
* changes
* Wew
* k
* add flags
* FUCKYOUVORE
* fixes
* typo
* no using this in hard stamcrit
* update icon
* woopsy
* . = ..()
* sigh
* Update living_combat.dm
* wew
* wups
* fix
* i hate you
* wrong button
* k
* ok
* bet
* k
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* Update code/modules/mob/living/living_combat.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
* early returns
* skreee
* agony
* k
* k
* k
* k
* wack
* compile
* wack
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-21 16:04:26 +01:00
761b4a2152
compile
2020-03-20 23:13:01 -07:00
Phantastic-Swan