Commit Graph

36779 Commits

Author SHA1 Message Date
lolman360
6e2bb79834 Update medipenrefill.dm 2020-08-11 17:32:44 +10:00
lolman360
f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
lolman360
391be0fb4b THESUN 2020-08-11 16:44:45 +10:00
lolman360
c18f0defd8 medi8el 2020-08-11 16:44:08 +10:00
lolman360
957b3948bd aare 2020-08-10 20:26:32 +10:00
lolman360
1b35e02554 eee 2020-08-10 11:21:24 +10:00
lolman360
c160d73265 ee 2020-08-10 10:40:30 +10:00
lolman360
900b0b068a linter take 3
love u putnam
2020-08-10 10:38:53 +10:00
lolman360
d9c198825b linter 2: 2020-08-10 10:29:17 +10:00
lolman360
6c4c3e4255 lint! 2020-08-10 09:47:55 +10:00
lolman360
a44afad849 Update autohydro.dm 2020-08-10 08:26:06 +10:00
lolman360
cbe783023d Update autohydro.dm 2020-08-09 23:55:06 +10:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360
fee304fb19 Update medical_designs.dm 2020-08-09 22:55:10 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
CitadelStationBot
f96989c029 Automatic changelog generation for PR #12853 [ci skip] 2020-08-09 07:46:25 -05:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
CitadelStationBot
60a29174fb Automatic changelog generation for PR #13047 [ci skip] 2020-08-09 07:45:53 -05:00
silicons
1c2e42136c Merge pull request #13047 from Sishen1542/tbat
replaces box whiteship tbaton with truncheon
2020-08-09 05:45:50 -07:00
CitadelStationBot
e103fec532 Automatic changelog generation for PR #13040 [ci skip] 2020-08-09 07:44:17 -05:00
silicons
ed07497835 Merge pull request #13040 from Sishen1542/blockstool
funny chair loses block chance and gains active block/parry
2020-08-09 05:44:13 -07:00
CitadelStationBot
4dbc4096ca Automatic changelog generation for PR #13051 [ci skip] 2020-08-09 07:44:03 -05:00
silicons
70c22d55af Merge pull request #13051 from kappa-sama/patch-38
juice spilled
2020-08-09 05:43:59 -07:00
CitadelStationBot
2ff084cf4e Automatic changelog generation for PR #13053 [ci skip] 2020-08-09 07:43:40 -05:00
silicons
8ef539b417 Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
2020-08-09 05:43:37 -07:00
CitadelStationBot
52a1da766a Automatic changelog generation for PR #13054 [ci skip] 2020-08-09 07:42:34 -05:00
silicons
fb43e9a2d2 Merge pull request #13054 from KeRSedChaplain/zombies!
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
CitadelStationBot
1e6376f3c3 Automatic changelog generation for PR #13060 [ci skip] 2020-08-09 07:41:58 -05:00
silicons
25d7b15478 Merge pull request #13060 from Hatterhat/timestop-katana
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
CitadelStationBot
b8b628b37f Automatic changelog generation for PR #13085 [ci skip] 2020-08-09 07:41:29 -05:00
silicons
cd18e3f4d3 Merge pull request #13085 from Hatterhat/glaive-parry-cont
KC-G Phase 2.1 - Parry Tweaks
2020-08-09 05:41:26 -07:00
CitadelStationBot
9437bcda91 Automatic changelog generation for PR #13084 [ci skip] 2020-08-09 07:41:14 -05:00
silicons
d2f5c6688b Merge pull request #13084 from Putnam3145/ic-wording-fix
Made IC issue wording less salt-assuming
2020-08-09 05:41:10 -07:00
CitadelStationBot
57b02b10f9 Automatic changelog generation for PR #13082 [ci skip] 2020-08-09 07:40:00 -05:00
silicons
3068accd2b Merge pull request #13082 from Putnam3145/anaphro
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
CitadelStationBot
d9595e0f81 Automatic changelog generation for PR #13081 [ci skip] 2020-08-09 07:39:46 -05:00
silicons
d25daec117 Merge pull request #13081 from Putnam3145/ethereals
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
Letter N
773509719a TGUI-Go for launch 2020-08-09 20:39:04 +08:00
CitadelStationBot
2bd75034c9 Automatic changelog generation for PR #13078 [ci skip] 2020-08-09 07:38:27 -05:00
silicons
ba6eefc945 Merge pull request #13078 from Putnam3145/fix-reroll
Made traitor reroll reroll to MI13 only.
2020-08-09 05:38:23 -07:00
CitadelStationBot
bf1e9b5c1e Automatic changelog generation for PR #13079 [ci skip] 2020-08-09 07:37:45 -05: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
CitadelStationBot
719e5a7c80 Automatic changelog generation for PR #13066 [ci skip] 2020-08-09 07:37:11 -05:00
silicons
d9764bf5ea Merge pull request #13066 from timothyteakettle/make-speech-verbs-dna-based
speech verbs now copy through dna copying
2020-08-09 05:37:08 -07:00
CitadelStationBot
0f732ef295 Automatic changelog generation for PR #13068 [ci skip] 2020-08-09 07:36:54 -05:00
silicons
88cb61b08a Merge pull request #13068 from Hatterhat/med-stack-buff
sterilized gauze, ointment and suture stacksizes
2020-08-09 05:36:51 -07:00
CitadelStationBot
dadd50ca44 Automatic changelog generation for PR #13069 [ci skip] 2020-08-09 07:35:11 -05:00
silicons
3acd4ac6de Merge pull request #13069 from Chiirno/radioactive-port
Ports TG #51879 - Makes rads glow, buffs rad goggles
2020-08-09 05:35:08 -07:00
Letter N
186482ecef map fix 2020-08-09 19:50:45 +08:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00