silicons
|
40f2c06f2e
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-06-07 16:47:11 -07:00 |
|
zerothebigboy
|
36fe3fef76
|
abuse
|
2021-05-24 21:40:15 -04:00 |
|
silicons
|
275b532a8c
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-04-26 14:17:43 -07:00 |
|
silicons
|
02b52e6142
|
framework
|
2021-03-20 16:02:26 -07:00 |
|
silicons
|
604a6efeca
|
baton change
|
2021-03-20 13:45:39 -07:00 |
|
LetterN
|
292f67e098
|
Merge remote-tracking branch 'origin/master' into perlin-genny
|
2021-03-20 20:36:56 +08:00 |
|
silicons
|
5d51025ad6
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-15 14:39:16 -07:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
silicons
|
519c694252
|
removes combat mode effects
|
2021-02-28 00:44:56 -07:00 |
|
silicons
|
70c828f74d
|
changes
|
2021-02-28 00:27:14 -07:00 |
|
kiwedespars
|
123f686e7f
|
makes chokehold mute
|
2021-02-27 22:18:44 -08:00 |
|
kiwedespars
|
de69e9996a
|
nerfs cqc
|
2021-02-21 13:10:08 -08:00 |
|
keronshb
|
99a890b355
|
Adds block_parry_data
Ooops forgot one line of code
|
2020-12-29 09:30:29 -05:00 |
|
keronshb
|
3d7c896100
|
Scarp Changes and Bundle
This should really fix it now.
|
2020-12-15 20:10:21 -05:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
silicons
|
9fef16964c
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-09-21 03:13:51 -07:00 |
|
Artur
|
3bef4ba35e
|
TGUI updates + statpanel
|
2020-09-02 17:52:47 +03:00 |
|
silicons
|
42db990836
|
why am i doing this
|
2020-08-03 13:37:37 -07:00 |
|
timothyteakettle
|
e17e1c3a11
|
conforms to same as everything else
|
2020-07-31 22:45:03 +01:00 |
|
timothyteakettle
|
caaedce6e2
|
end our suffering
|
2020-07-30 02:33:39 +01:00 |
|
silicons
|
ce87d3e8c5
|
Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
|
2020-07-23 10:28:44 -07:00 |
|
zerothebigboy
|
7870d90de3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly
# Conflicts:
# icons/mob/clothing/hands.dmi
# icons/mob/clothing/head.dmi
# icons/obj/clothing/gloves.dmi
# icons/obj/clothing/hats.dmi
|
2020-07-22 01:03:55 -04:00 |
|
zerothebigboy
|
75c87077ec
|
a
|
2020-07-21 17:22:35 -04:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
Timothy Teakettle
|
11148b0a26
|
optimisaiton
|
2020-07-14 18:51:46 +01:00 |
|
Timothy Teakettle
|
1f8e47c0f5
|
actually works
|
2020-07-14 18:40:20 +01:00 |
|
Timothy Teakettle
|
dd1cce50e8
|
better solution
|
2020-07-14 17:23:18 +01:00 |
|
Timothy Teakettle
|
657810bb13
|
please fix it
|
2020-07-14 17:08:57 +01:00 |
|
Timothy Teakettle
|
98f63772b3
|
fix wrestling rotation
|
2020-07-14 14:35:13 +01:00 |
|
Ghommie
|
e3b1ca4942
|
Linter.
|
2020-07-03 19:57:38 +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 |
|
Ghommie
|
1bca74465f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-30 03:29:02 +02:00 |
|
kevinz000
|
03ee37bb06
|
let's finish parrying
|
2020-05-28 04:55:43 -07:00 |
|
kevinz000
|
162e79df23
|
fixes dreamchecker errors
|
2020-05-27 18:17:00 -07:00 |
|
kevinz000
|
433bd1af79
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-27 18:11:15 -07:00 |
|
Ghom
|
968426fd48
|
Combat mode component. (#12338)
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
|
2020-05-27 18:00:32 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
kevinz000
|
f034c7c536
|
Merge remote-tracking branch 'citadel/master' into combat_rework
|
2020-05-05 17:38:43 -07:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
necromanceranne
|
9919a23966
|
This fixes everyone being a pugilist holy fuck
|
2020-04-21 00:36:54 +10:00 |
|
necromanceranne
|
97bd52f03e
|
haha me too
|
2020-04-19 04:49:11 +10:00 |
|
necromanceranne
|
cb39ba3491
|
Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps
|
2020-04-19 04:25:41 +10:00 |
|
necromanceranne
|
4d1abaad3a
|
fecc
|
2020-04-15 19:59:55 +10:00 |
|
necromanceranne
|
80ce9b70af
|
hecc
|
2020-04-15 19:48:18 +10:00 |
|
necromanceranne
|
d0d766efb5
|
Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts
|
2020-04-15 19:00:01 +10:00 |
|
Ghom
|
3f573fb611
|
Merge pull request #11814 from kappa-sama/patch-19
fixes stomping and increases Stam damage from krav
|
2020-04-12 06:24:57 +02:00 |
|
necromanceranne
|
b6d079f91f
|
fixes rising bass and sleeping carp not dodging
|
2020-04-11 13:00:32 +10:00 |
|
kappa-sama
|
2afda4c216
|
forgot oop
|
2020-04-10 14:24:20 -04:00 |
|
kappa-sama
|
91726f340a
|
Update krav_maga.dm
|
2020-04-10 14:08:16 -04:00 |
|