fee304fb19
Update medical_designs.dm
2020-08-09 22:55:10 +10:00
308d77da7c
Merge branch 'master' into plumb
2020-08-09 22:48:18 +10:00
f96989c029
Automatic changelog generation for PR #12853 [ci skip]
2020-08-09 07:46:25 -05:00
f20f01cc6b
Merge pull request #12853 from LetterN/TGUI-4
...
TGUI4 port
2020-08-09 05:46:21 -07:00
60a29174fb
Automatic changelog generation for PR #13047 [ci skip]
2020-08-09 07:45:53 -05:00
1c2e42136c
Merge pull request #13047 from Sishen1542/tbat
...
replaces box whiteship tbaton with truncheon
2020-08-09 05:45:50 -07:00
e103fec532
Automatic changelog generation for PR #13040 [ci skip]
2020-08-09 07:44:17 -05:00
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
4dbc4096ca
Automatic changelog generation for PR #13051 [ci skip]
2020-08-09 07:44:03 -05:00
70c22d55af
Merge pull request #13051 from kappa-sama/patch-38
...
juice spilled
2020-08-09 05:43:59 -07:00
2ff084cf4e
Automatic changelog generation for PR #13053 [ci skip]
2020-08-09 07:43:40 -05:00
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
52a1da766a
Automatic changelog generation for PR #13054 [ci skip]
2020-08-09 07:42:34 -05:00
fb43e9a2d2
Merge pull request #13054 from KeRSedChaplain/zombies!
...
Improves zombies, the gimped threat
2020-08-09 05:42:31 -07:00
1e6376f3c3
Automatic changelog generation for PR #13060 [ci skip]
2020-08-09 07:41:58 -05:00
25d7b15478
Merge pull request #13060 from Hatterhat/timestop-katana
...
wizard timestop parrying katana
2020-08-09 05:41:55 -07:00
b8b628b37f
Automatic changelog generation for PR #13085 [ci skip]
2020-08-09 07:41:29 -05:00
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
9437bcda91
Automatic changelog generation for PR #13084 [ci skip]
2020-08-09 07:41:14 -05:00
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
57b02b10f9
Automatic changelog generation for PR #13082 [ci skip]
2020-08-09 07:40:00 -05:00
3068accd2b
Merge pull request #13082 from Putnam3145/anaphro
...
Removed (an)aphrodisiacs.
2020-08-09 05:39:56 -07:00
d9595e0f81
Automatic changelog generation for PR #13081 [ci skip]
2020-08-09 07:39:46 -05:00
d25daec117
Merge pull request #13081 from Putnam3145/ethereals
...
Ports ethereals from TG
2020-08-09 05:39:43 -07:00
773509719a
TGUI-Go for launch
2020-08-09 20:39:04 +08:00
2bd75034c9
Automatic changelog generation for PR #13078 [ci skip]
2020-08-09 07:38:27 -05:00
ba6eefc945
Merge pull request #13078 from Putnam3145/fix-reroll
...
Made traitor reroll reroll to MI13 only.
2020-08-09 05:38:23 -07:00
bf1e9b5c1e
Automatic changelog generation for PR #13079 [ci skip]
2020-08-09 07:37:45 -05:00
bd65c8efc6
Merge pull request #13079 from Hatterhat/parry-text
...
parry counterattack text now actually shows up
2020-08-09 05:37:42 -07:00
719e5a7c80
Automatic changelog generation for PR #13066 [ci skip]
2020-08-09 07:37:11 -05:00
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
0f732ef295
Automatic changelog generation for PR #13068 [ci skip]
2020-08-09 07:36:54 -05:00
88cb61b08a
Merge pull request #13068 from Hatterhat/med-stack-buff
...
sterilized gauze, ointment and suture stacksizes
2020-08-09 05:36:51 -07:00
dadd50ca44
Automatic changelog generation for PR #13069 [ci skip]
2020-08-09 07:35:11 -05:00
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
186482ecef
map fix
2020-08-09 19:50:45 +08:00
f1c4a7f6ac
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-08-09 14:54:16 +08:00
2615506ae9
oops, forgot about this
2020-08-09 13:18:10 +08:00
4bed3a5349
OH FUCK
2020-08-09 12:49:14 +08:00
bdee7bdc63
linters are always your friend
2020-08-08 21:38:53 -07:00
5abcc1c220
reverts this change
2020-08-09 12:00:12 +08:00
5d869f6dd8
skillpannel fix. Turrets next
2020-08-09 10:38:34 +08:00
f545434f65
Merge pull request #13072 from silicons/fancy_floor
...
fixes runtimes from people screwdrivering wooden floors
2020-08-08 20:02:55 -05:00
5f0e31422f
Automatic changelog compile [ci skip]
2020-08-09 00:12:44 +00:00
2b10fc81cf
actually, fully, removed the kegs
2020-08-08 13:46:03 -07:00
e95dcba705
price nerf, tweaks, aprc
2020-08-08 12:17:56 -05:00
66b183e5bb
Automatic changelog generation for PR #13055 [ci skip]
2020-08-08 12:06:46 -05:00
dea2dab536
Merge pull request #13055 from Citadel-Station-13/silicons-patch-78
...
squeaking objects including air horns and clockwork boots now have a default 1 second cooldown. squeaking objects crossing each other will on average only allow 3 squeaks to occur, because if byond is literally running out of sound channels you know the fun has went too far
2020-08-08 12:06:42 -05:00
13d94717f4
Merge pull request #13052 from Citadel-Station-13/silicons-patch-76
...
fixes laptops not being able to be picked up
2020-08-08 12:05:36 -05:00
9db1789ea4
Automatic changelog generation for PR #13059 [ci skip]
2020-08-08 12:02:51 -05:00
lolman360