69 Commits

Author SHA1 Message Date
SandPoot 676cb864b1 missed proc refs 2024-03-12 22:17:30 -03:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot 6d7321b0c4 okay so this is necessary 2024-01-05 22:09:21 -03:00
SandPoot 7eaef36e11 d k daunkey kaung 2024-01-03 22:42:03 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
silicons 7d62753fe4 Update living_active_parry.dm 2021-09-08 04:44:36 -07:00
silicons 66dde6f9ea woo 2021-06-14 14:00:02 -07:00
silicons 01e0fa16fe it works. 2021-06-14 13:52:48 -07:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons d67c4d9fa8 hacky 2021-06-07 16:45:51 -07:00
silicons 2d763a9ab3 auto 2021-06-07 16:37:19 -07:00
silicons a60f801f69 e 2021-05-12 04:23:53 -07:00
silicons 1585d1c2be fixes 2021-04-26 23:32:33 -07:00
silicons a415453540 ripping off my own code 2021-04-26 23:29:37 -07:00
silicons 8fe45263c5 whew 2021-04-26 22:58:30 -07:00
silicons 02b52e6142 framework 2021-03-20 16:02:26 -07:00
silicons cf7d428ac6 changes 2021-03-06 18:11:40 -07:00
silicons c6ba7bfe1f changes 2021-03-06 18:06:53 -07: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 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
Lin fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
silicons c937021b68 Update living_active_parry.dm 2021-01-04 03:17:51 -07:00
silicons 53253bfce1 changes 2020-12-27 10:13:09 -08:00
silicons 97e4aad75f changes 2020-12-21 17:14:22 -07:00
silicons 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
DeltaFire 173ecfaa6c prevents pacifists from performing harmful counter attacks 2020-10-01 17:58:14 +02:00
silicons 1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
silicons e7220e842e things 2020-09-15 15:29:34 -07:00
Hatterhat 8ade386190 fucks around with parry text 2020-08-08 00:12:51 -05: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
Lin e8ab87c396 Merge pull request #12928 from Citadel-Station-13/silicons-patch-58
silicons (and any other nonhuman mob) can now parry
2020-07-28 21:48:03 -05:00
silicons 67b518bf42 experimental 2020-07-27 13:09:54 -07:00
silicons 0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons cebd21696f Update living_active_parry.dm 2020-07-26 16:18:12 -07:00
Hatterhat af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
silicons 389a54590e fix 2020-07-26 00:32:14 -07:00
silicons 2f11fb6a8b ok 2020-07-21 11:59:39 -07:00
silicons a2c3643e20 fix 2020-07-17 12:46:32 -07:00
silicons 7a2818d657 fix 2020-06-29 23:45:18 -07:00
silicons 6a91ce8416 fix 2020-06-29 23:43:53 -07:00
silicons ee34f37ac2 fix 2020-06-29 23:41:53 -07:00
silicons 3b3a3ad44e nayser 2020-06-29 23:37:51 -07:00
kevinz000 b3afed69f4 huffles 2020-06-08 08:47:06 -07:00
kevinz000 92d1af5889 adjustments 2020-06-04 22:18:19 -07:00
kevinz000 bad809ffce fixes 2020-06-04 19:56:06 -07:00
kevinz000 250d078596 that was easy 2020-05-30 23:14:02 -07:00
kevinz000 34d8aa0ee9 refactor 2020-05-30 23:13:16 -07:00
kevinz000 2232271ea5 fixes and render 2020-05-30 22:29:41 -07:00
kevinz000 1fef5825a9 definition fixes 2020-05-30 22:09:13 -07:00