Commit Graph

6013 Commits

Author SHA1 Message Date
silicons 3068accd2b Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -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 467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07: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
Sishen 1bd30ddf41 value tweak, add forced 2h 2020-08-07 21:52:16 -06:00
Hatterhat a7d1a0ea48 gauze! stacksizes! shit. 2020-08-07 18:40:46 -05:00
Hatterhat 6f754188ac funny guns go pew 2020-08-07 18:02:33 -05:00
silicons 891afed687 hoh 2020-08-07 06:27:49 -07: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 5b63f0acce fix fix fix^2 2020-08-07 15:15:34 +08: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
silicons d6a5442a37 fix 2020-08-06 12:00:15 -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
TrilbySpaceClone 3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons 2a0f2a38a7 Fix 2020-08-05 21:42:05 -07:00
silicons 815ddd1866 oh boy 2020-08-05 21:34:26 -07: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
Sishen ec8cd31950 funny chair loses block chance and gains active block/parry 2020-08-05 14:21:48 -06:00
Letter N f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
silicons de3227e3e0 fix 2020-08-04 22:55:33 -07:00
silicons 0a36f9fbb5 changes 2020-08-04 22:40:28 -07: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
Timothy Teakettle ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01: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
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
Trilbyspaceclone e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Trilbyspaceclone b3fea77468 Update necropolis_tendril.dm 2020-08-03 10:45:01 -04: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