Commit Graph

3856 Commits

Author SHA1 Message Date
Hatterhat bc0ca30647 there is no cooldown, press G 2020-08-16 15:45:11 -05:00
Hatterhat d5b788a655 shortparry window restored, glaive parry req wield 2020-08-12 23:33:59 -05:00
Hatterhat f4f8812318 whitespace (tm) 2020-08-10 11:30:36 -05:00
Hatterhat 4610908b8e Merge branch 'master' into parries-but-dumber 2020-08-10 11:29:27 -05:00
silicons 05290c85f3 Merge pull request #13094 from Hatterhat/tc-theft-patch
PDA Uplinks Can Now Siphon Pens
2020-08-10 02:30:11 -07:00
silicons ef2c024fbe Merge pull request #13093 from kappa-sama/patch-41
Tracer's a human, not a changeling.
2020-08-10 02:29:58 -07:00
Hatterhat 301adc6769 ung 2020-08-09 23:58:12 -05:00
silicons f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
silicons fb43e9a2d2 Merge pull request #13054 from KeRSedChaplain/zombies!
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
silicons 25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
silicons d25daec117 Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
silicons bd65c8efc6 Merge pull request #13079 from Hatterhat/parry-text
parry counterattack text now actually shows up
2020-08-09 05:37:42 -07:00
Letter N f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Hatterhat 197e426432 heho funny uplink thefties 2020-08-08 23:54:31 -05:00
kappa-sama 8c61dd875b poggers 2020-08-08 21:30:42 -04:00
Hatterhat a496588171 bokken cooldown nerf but slightly 2020-08-08 14:31:45 -05:00
Hatterhat c7e850ae19 longparry stagger reduced, cooldown made universal 2020-08-08 14:14:47 -05:00
Hatterhat 98d305e5f6 bokken nerfs, desword deflects 2020-08-08 14:11:47 -05:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Hatterhat 56bf84abfe parry debug stick 2020-08-08 00:48:55 -05:00
Hatterhat a7d1a0ea48 gauze! stacksizes! shit. 2020-08-07 18:40:46 -05:00
Hatterhat 029d88ac9d play a real shin megami tensei game 2020-08-07 03:32:54 -05:00
Hatterhat 32a1c90b67 what are we in for 2020-08-07 03:25:05 -05:00
Hatterhat 965efe6dab funny timestop katana adminbus only 2020-08-07 03:13:43 -05:00
Letter N cc98f50eb6 what if slabs still show things even if ratvar is free? Does not fix "the sleeper" though 2020-08-07 11:25:36 +08:00
Dan-Neposh 9e62c7b7c3 Improves zombies, the gimped threat
Makes zombies take no stamina damage due to being a reanimated corpse, makes zombies not enter softcrit (but still hardcrit for the fake death thing), gives the romerol kit a guide on proper usage of the chem.
2020-08-06 22:43:15 -04:00
silicons 6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
2020-08-06 19:40:09 -07:00
Lin 865a2bf181 Merge pull request #13030 from Citadel-Station-13/silicons-patch-71
off balanace
2020-08-06 12:32:50 -05:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Lin ad4a96c73a Merge pull request #13001 from Citadel-Station-13/silicons-patch-66
makes explosions only recurse one level into storage at full power before dropping 1 level per storage object recursed
2020-08-05 19:50:57 -05:00
Lin c310b1a70e Merge pull request #12997 from silicons/lavastaff
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
2020-08-05 19:43:38 -05:00
silicons bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
2020-08-05 15:26:37 -07:00
Letter N f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
silicons 3e2ab66afa Update shields.dm 2020-08-04 21:34:59 -07:00
Letter N ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
Letter N 7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08:00
Hatterhat 25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
Letter N 454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Timothy Teakettle 289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
silicons d4d2e4ae0d Update _storage.dm 2020-08-01 21:07:07 -07:00
silicons 20dea7e41f fix 2020-08-01 20:45:49 -07:00
silicons 7e0e60c126 Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis
Toyslabfixfortravis
2020-08-01 13:31:33 -07:00
Dan-Neposh 44e6b6ccc7 I removed the Dread_Ipad, Clockwork Slab reigns supreme 2020-08-01 16:18:25 -04:00
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
silicons e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits
Durathread Reinforcement Kits
2020-08-01 03:35:45 -07:00
silicons 30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
2020-08-01 02:24:01 -07:00
CitadelStationBot a2f6a7c207 Automatic changelog generation for PR #12979 [ci skip] 2020-08-01 00:16:53 -04:00
Hatterhat 6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00