 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 |
|
|
Hatterhat
|
197e426432
|
heho funny uplink thefties
|
2020-08-08 23:54:31 -05:00 |
|
|
Letter N
|
4bed3a5349
|
OH FUCK
|
2020-08-09 12:49:14 +08:00 |
|
|
Letter N
|
5abcc1c220
|
reverts this change
|
2020-08-09 12:00:12 +08: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 |
|
|
Letter N
|
c4b4801132
|
shockies
|
2020-08-08 15:20:03 +08: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 |
|
|
silicons
|
13c9954f74
|
fix
|
2020-08-07 17:00:27 -07: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
|
8a0f44cb19
|
sounds
|
2020-08-07 07:23:34 -07:00 |
|