 silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
|
silicons
|
2095e2705f
|
Merge branch '13169'
|
2020-08-16 18:52:13 -07:00 |
|
|
silicons
|
a900c07846
|
Merge branch '13163'
|
2020-08-16 18:51:24 -07:00 |
|
|
silicons
|
44e2327280
|
Merge branch '13143'
|
2020-08-16 18:47:48 -07:00 |
|
|
silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -07:00 |
|
|
silicons
|
9c63a09907
|
Merge branch 'pr-13087'
|
2020-08-16 18:40:07 -07:00 |
|
|
silicons
|
01dd2f389b
|
Merge branch 'pr-13067'
|
2020-08-16 18:38:13 -07:00 |
|
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
|
Hatterhat
|
bc0ca30647
|
there is no cooldown, press G
|
2020-08-16 15:45:11 -05:00 |
|
|
Navier
|
fc70d3dde2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:13:41 -04:00 |
|
|
silicons
|
b2c65e34fc
|
Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
|
2020-08-15 08:00:43 -07:00 |
|
|
Letter N
|
15a1ffde52
|
fix
|
2020-08-15 09:46:50 +08:00 |
|
|
Detective Google
|
83e1b4f0df
|
woo yeah yeah woo
|
2020-08-14 15:07:22 -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
|
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 |
|
|
silicons
|
3e67fd11e8
|
Update chair.dm
|
2020-08-11 23:39:31 -07: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 |
|
|
Letter N
|
ab7c560f6d
|
revert
|
2020-08-11 16:04:18 +08: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
|
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 |
|
|
chrisbbbbbbb
|
758d540c9e
|
Suture/Mesh Crafting
|
2020-08-09 20:33:40 +02: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 |
|
|
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 |
|