silicons
|
9e6fb3a310
|
Merge pull request #14281 from kiwedespars/undo-what-has-been-done
parrying nerf/pugilism buff
|
2021-02-26 13:36:09 -07:00 |
|
kiwedespars
|
15a8d1d5e0
|
i did a thing
- reverted salt nerf
- made it so you can't parry while resting
|
2021-02-20 17:24:30 -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 |
|
DeltaFire
|
06101ee9c8
|
sigh
|
2021-02-12 03:30:15 +01:00 |
|
Lin
|
fe263ae2ff
|
Merge pull request #13890 from silicons/parry
ablative parry armwraps
|
2021-02-05 23:52:18 -06:00 |
|
silicons
|
9ddb3dc5d9
|
fix
|
2021-01-13 16:22:43 -07:00 |
|
silicons
|
1dfe6d3685
|
Update miscellaneous.dm
|
2020-12-28 12:59:05 -07:00 |
|
silicons
|
8d981bfa82
|
high cooldown on failure
|
2020-12-27 12:05:32 -08:00 |
|
silicons
|
4da7a3867c
|
fix
|
2020-12-27 10:22:27 -08:00 |
|
silicons
|
53253bfce1
|
changes
|
2020-12-27 10:13:09 -08:00 |
|
Hatterhat
|
aa7c871b59
|
yea
|
2020-12-24 18:15:04 -06:00 |
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
Hatterhat
|
0db189333a
|
>one fucking callback
|
2020-08-30 21:21:27 -05:00 |
|
Hatterhat
|
7ed2a3cbfe
|
update
|
2020-08-28 20:28:05 -05:00 |
|
silicons
|
82d8b7266f
|
Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
|
2020-08-23 17:36:03 -07:00 |
|
silicons
|
7f942abef2
|
Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
|
2020-08-23 05:08:14 -07:00 |
|
zerothebigboy
|
21836b4ec8
|
: )
|
2020-08-22 18:11:03 -04:00 |
|
Hatterhat
|
8645a2954f
|
tackle hando
|
2020-08-22 16:13:41 -05:00 |
|
Hatterhat
|
02194633b5
|
initial commit - za hando
|
2020-08-20 09:14:30 -05:00 |
|
lolman360
|
c9de596fde
|
Verified!
|
2020-08-09 15:31:49 +10:00 |
|
lolman360
|
50448549fb
|
ee
|
2020-08-09 15:26:08 +10: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
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|
silicons
|
49070d732b
|
ohhhhhhh boy
|
2020-07-26 15:10:08 -07:00 |
|
Hatterhat
|
af08e8a37f
|
altclick for fucked up parries! also bugfixes
|
2020-07-26 13:02:56 -05:00 |
|
silicons
|
33d5ba788b
|
aight
|
2020-07-24 20:19:18 -07:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
9222933d77
|
Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
|
2020-07-23 10:25:25 -07:00 |
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
zerothebigboy
|
fb35248e3b
|
a
|
2020-07-21 02:24:22 -04:00 |
|
silicons
|
910869d6bf
|
more
|
2020-07-18 19:44:12 -07:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
Ghommie
|
6fc584518a
|
Fixing (un)equip penalties from obscured inv slots.
|
2020-07-03 00:07:30 +02:00 |
|
Ghom
|
8cb15f9279
|
Actually Balanced and Standardized Vendor Prices. (#12495)
|
2020-06-09 22:22:53 -07:00 |
|
Ghom
|
ab5d65a454
|
Porting the BEPIS research machinery. (#12277)
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
|
2020-05-24 13:05:15 -07:00 |
|
Ghommie
|
94f014589d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-25 17:09:34 +02:00 |
|
Ghom
|
e4c6df71fc
|
Update tacklers.dm
|
2020-04-23 14:35:36 +02:00 |
|
kevinz000
|
c43f4e2e5e
|
Update tacklers.dm
|
2020-04-22 22:27:48 -07:00 |
|
kevinz000
|
af222768fe
|
Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
|
2020-04-22 22:27:17 -07:00 |
|
kevinz000
|
b6a47a06ed
|
Update tacklers.dm
|
2020-04-22 22:26:39 -07:00 |
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
Artur
|
f0823bc2b6
|
Combat looks better
|
2020-04-18 13:57:34 +03:00 |
|
Ghommie
|
87a6bd013c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-17 21:57:21 +02:00 |
|
Artur
|
eafc69aa65
|
Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
|
2020-04-17 16:22:15 +03:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
Artur
|
375c62175f
|
Finishing touches, fixes icons
|
2020-04-15 12:04:25 +03: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 |
|