Commit Graph

8624 Commits

Author SHA1 Message Date
Detective-Google
f41c412cb9 material -> mineral 2020-08-14 23:41:29 -05:00
Letter N
15a1ffde52 fix 2020-08-15 09:46:50 +08:00
Detective-Google
76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google
81f7307575 yeah 2020-08-14 15:38:27 -05:00
Detective Google
83e1b4f0df woo yeah yeah woo 2020-08-14 15:07:22 -05:00
Lin
e1774fb56f Merge pull request #13133 from Citadel-Station-13/silicons-patch-7
clockwork chairs now keep spinning because it's no longer that laggy to maintain it since it's a processing system instead of while(TRUE) now
2020-08-14 13:00:12 -05:00
kiwedespars
61486f1287 adds custom parry data. 2020-08-14 01:59:46 -07:00
kiwedespars
53be29d9c2 Update dualsaber.dm 2020-08-14 01:43:47 -07:00
Hatterhat
d5b788a655 shortparry window restored, glaive parry req wield 2020-08-12 23:33:59 -05:00
Letter N
833aa86795 comment removal 2020-08-13 12:15:53 +08:00
Letter N
3ff770b38f wrong state 2020-08-13 12:13:42 +08:00
Letter N
2eb6eb5032 state moment 2020-08-13 12:01:36 +08:00
Letter N
8c26b883e9 open on init 2020-08-13 11:44:35 +08:00
Letter N
5727add7ab commit name 2020-08-13 11:41:33 +08:00
Letter N
1f2d9ca2ef jar moment 2020-08-12 19:35:24 +08:00
Letter N
081f07e259 bye! 2020-08-12 16:38:36 +08:00
silicons
3e67fd11e8 Update chair.dm 2020-08-11 23:39:31 -07:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
ancientpower
99d73388f8 lets ghosts see the contents of closets 2020-08-11 16:40:03 -05:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
silicons
82824f9fb9 Merge pull request #13100 from lolzalolka/lean2
Suture/Mesh Crafting (take2)
2020-08-11 01:40:50 -07:00
lolman360
49948e77a4 SELLYOULOSE 2020-08-11 18:08:40 +10:00
Letter N
ab7c560f6d revert 2020-08-11 16:04:18 +08:00
lolman360
6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00
lolman360
f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
silicons
5814eba033 Merge pull request #13103 from Hatterhat/oops-all-parries
funny timestop katana is less funny and more gameplay oriented
2020-08-10 23:30:30 -07:00
kiwedespars
036c7dbe39 Merge remote-tracking branch 'upstream/master' into heretics 2020-08-10 21:05:56 -07:00
kiwedespars
415e2556f9 descriptions, conflict, and actually puts requirements for the gamemode. 2020-08-10 20:59:51 -07:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07: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
Hatterhat
ff49790ac9 radius/force/blockchance nerf 2020-08-09 21:27:57 -05:00
lolman360
1b35e02554 eee 2020-08-10 11:21:24 +10:00
chrisbbbbbbb
758d540c9e Suture/Mesh Crafting 2020-08-09 20:33:40 +02:00
silicons
07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)
* Update areas.dm

* Update apc.dm

* Update apc.dm
2020-08-09 15:57:53 +02:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360
308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07: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
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
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
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
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Letter N
2615506ae9 oops, forgot about this 2020-08-09 13:18:10 +08:00