silicons
|
08f251a88c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-27 10:44:51 -07:00 |
|
silicons
|
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 |
|
silicons
|
01e0fa16fe
|
it works.
|
2021-06-14 13:52:48 -07:00 |
|
zerothebigboy
|
53e95b7356
|
theseventeenthofmany
|
2021-06-11 19:48:04 -04:00 |
|
silicons
|
1a800cc470
|
modifications
|
2021-06-07 19:40:16 -07:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
silicons
|
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 |
|
silicons
|
02b52e6142
|
framework
|
2021-03-20 16:02:26 -07:00 |
|
silicons
|
5d51025ad6
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-15 14:39:16 -07:00 |
|
silicons
|
e43838739d
|
changes
|
2021-02-28 00:37:39 -07:00 |
|
silicons
|
70c828f74d
|
changes
|
2021-02-28 00:27:14 -07:00 |
|
kiwedespars
|
081b669345
|
Merge branch 'master' into we-hate-cqc
|
2021-02-27 22:19:16 -08:00 |
|
silicons
|
178fe9cf55
|
Merge pull request #14253 from keronshb/eutactic_blade_restoration
Hyperblade restored to uplink
|
2021-02-22 13:10:21 -07:00 |
|
kiwedespars
|
de69e9996a
|
nerfs cqc
|
2021-02-21 13:10:08 -08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
keronshb
|
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 |
|
silicons
|
7f611a98e1
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-10-10 22:23:22 -07:00 |
|
Hatterhat
|
96e55d6233
|
the last bit
|
2020-10-07 17:50:21 -05:00 |
|
Hatterhat
|
9928a172d0
|
initial commit - sabres
|
2020-10-06 21:58:59 -05:00 |
|
silicons
|
1ea0dd9f76
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-09-19 15:56:13 -07:00 |
|
Putnam
|
6028c66ceb
|
Fixed the combat log issue
|
2020-08-30 08:26:29 -07:00 |
|
Putnam
|
4cf040a11a
|
Makes plastitanium rapier not silently poison for pacifists.
|
2020-08-30 06:25:00 -07:00 |
|
silicons
|
de3227e3e0
|
fix
|
2020-08-04 22:55:33 -07:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Lin
|
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 |
|
silicons
|
69335bae0e
|
buff
|
2020-07-26 17:20:21 -07:00 |
|
silicons
|
0b17c761e7
|
whew
|
2020-07-26 17:11:23 -07:00 |
|
silicons
|
3ab4b62dc1
|
huh
|
2020-07-26 17:03:52 -07:00 |
|
silicons
|
279b3e7aed
|
fix
|
2020-07-26 16:52:16 -07:00 |
|
silicons
|
349874e512
|
haha
|
2020-07-26 16:49:47 -07:00 |
|
silicons
|
2a29f73ac8
|
ok
|
2020-07-25 17:34:12 -07:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
Ghommie
|
0779dd560e
|
More and more fixes.
|
2020-06-29 18:52:37 +02:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Timothy Teakettle
|
7fbfb4ad0e
|
Merge remote-tracking branch 'upstream/master' into embed-changes
|
2020-06-15 22:48:26 +01:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
Timothy Teakettle
|
95b8cd3956
|
first port
|
2020-06-10 20:33:01 +01:00 |
|
kevinz000
|
1a9787a9c2
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-06-02 21:49:43 -07:00 |
|
Ghom
|
d7954ca077
|
Yet another PR fixing some issues. (#12424)
|
2020-06-02 15:29:01 -07:00 |
|
kevinz000
|
34d8aa0ee9
|
refactor
|
2020-05-30 23:13:16 -07:00 |
|
kevinz000
|
1fef5825a9
|
definition fixes
|
2020-05-30 22:09:13 -07:00 |
|
kevinz000
|
e5c32c1746
|
changes
|
2020-05-30 20:11:18 -07:00 |
|