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
cf51a4dce9
dusting off
2023-01-10 18:32:49 -03:00
f066a260f2
previous could break
2023-01-09 08:05:48 -03:00
c94aa43432
quick fix and little extra usage!
2023-01-08 22:02:30 -03:00
f2a49bc319
first commit with everything
2023-01-08 21:36:57 -03:00
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
cd0c2aa496
your jordans are fake
2022-01-02 04:33:25 -06: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
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
30134a0d2f
cool
2021-09-01 06:32:33 -04: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
081b669345
Merge branch 'master' into we-hate-cqc
2021-02-27 22:19:16 -08:00
178fe9cf55
Merge pull request #14253 from keronshb/eutactic_blade_restoration
...
Hyperblade restored to uplink
2021-02-22 13:10:21 -07:00
de69e9996a
nerfs cqc
2021-02-21 13:10:08 -08:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
d87ac38e58
Eutactic Blade Restoration + Hyperblade
...
Brings the Eutatic Blade back to the traitor uplink, same for the Hyperblade.
2021-02-15 21:36:47 -05:00
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
96e55d6233
the last bit
2020-10-07 17:50:21 -05:00
9928a172d0
initial commit - sabres
2020-10-06 21:58:59 -05: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
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
69335bae0e
buff
2020-07-26 17:20:21 -07:00
0b17c761e7
whew
2020-07-26 17:11:23 -07:00
3ab4b62dc1
huh
2020-07-26 17:03:52 -07:00
279b3e7aed
fix
2020-07-26 16:52:16 -07:00
evilew