 Artur
|
7964d768fa
|
Initial Commit
|
2020-02-13 20:51:52 +02:00 |
|
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
|
Ghommie
|
d13d8dd953
|
Less hacky.
|
2020-02-04 02:13:11 +01:00 |
|
|
Ghommie
|
63c8612ccd
|
Refactoring mob holders into an element.
|
2020-02-04 01:42:59 +01:00 |
|
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
|
Seris02
|
9761d68f4b
|
more merge conflict fixes
|
2020-01-24 10:14:31 +08:00 |
|
|
GhomandGitHub
|
038f5e4b0e
|
Yea, sorry for being so naive right now.
|
2020-01-20 21:59:12 +01:00 |
|
|
GhomandGitHub
|
a921b27c63
|
I want a different maintainer to merge this now.
|
2020-01-20 21:58:21 +01:00 |
|
|
Ghommie
|
9604b27482
|
github web editor is so bad
|
2020-01-20 21:55:02 +01:00 |
|
|
GhomandGitHub
|
5500e349e3
|
Merge branch 'master' into kevinz000-patch-10
|
2020-01-20 21:48:28 +01:00 |
|
|
GhomandGitHub
|
9ea6e896fb
|
Kevinz, please.
|
2020-01-20 21:43:00 +01:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
Seris02
|
718ff58e0b
|
fixes + advanced injectors
|
2020-01-19 15:17:57 +08:00 |
|
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
|
Seris02
|
16b5c83a3a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-13 12:53:52 +08:00 |
|
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Seris02
|
ac4489c6a8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-11 13:55:29 +08:00 |
|
|
Seris02
|
29b66db9e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport
|
2020-01-11 11:29:30 +08:00 |
|
|
Seris02
|
0b0b80f174
|
explosions
|
2020-01-11 11:22:59 +08:00 |
|
|
kevinz000
|
f1a4956afc
|
easier for me to type
|
2020-01-10 13:26:34 -08:00 |
|
|
kevinz000
|
830054c106
|
sigh
|
2020-01-10 13:25:47 -08:00 |
|
|
kevinz000
|
e4cfb1fa39
|
more
|
2020-01-07 12:03:46 -08:00 |
|
|
kevinz000
|
2a304800df
|
more reformatting
|
2020-01-07 11:46:32 -08:00 |
|
|
kevinz000andGitHub
|
d461e70a9b
|
Update life.dm
|
2020-01-06 23:45:39 -08:00 |
|
|
kevinz000andGitHub
|
05c903e4a3
|
Update life.dm
|
2020-01-06 23:44:33 -08:00 |
|
|
kevinz000
|
a8cc37eaf0
|
ok
|
2020-01-06 03:57:58 -08:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
|
Ghommie
|
e1949b0131
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-23 19:02:20 +01:00 |
|
|
Ghommie
|
d88f50ac15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-23 05:02:31 +01:00 |
|
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
|
GhomandGitHub
|
a7cda1aea0
|
Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
|
2019-12-21 11:05:36 +01:00 |
|
|
Ghommie
|
542c9007ee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-12-06 20:09:35 +01:00 |
|
|
Sishen
|
69e11e4203
|
olllll
|
2019-11-28 23:01:15 -07:00 |
|
|
Sishen
|
3a1e4dec5a
|
Revert "lol"
This reverts commit 7f6a1a6fda.
|
2019-11-28 23:00:13 -07:00 |
|
|
Sishen
|
7f6a1a6fda
|
lol
|
2019-11-28 22:53:39 -07:00 |
|
|
Ghommie
|
d5e7f77c13
|
A
|
2019-11-18 18:47:34 +01:00 |
|
|
Ghommie
|
bddb437872
|
It works now.
|
2019-11-18 18:30:46 +01:00 |
|
|
Ghommie
|
6e9d2d57c0
|
check_shields from human to living, part 2
|
2019-11-17 22:06:19 +01:00 |
|
|
Ghommie
|
b560ff8284
|
refactoring code to allow all living mobs to use shields.
|
2019-11-17 06:23:12 +01:00 |
|
|
lolman360
|
aed866339f
|
pickup pickup pickup pickup 100% pickup
|
2019-11-17 12:00:17 +11:00 |
|
|
Ghommie
|
2c578ca683
|
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2019-10-24 18:01:46 +02:00 |
|
|
Ghommie
|
9c3e532be7
|
Fixes lack of arguments on mobs' can_equip.
|
2019-10-09 00:21:55 +02:00 |
|