 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 |
|
|
Putnam
|
48fadffbfb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-10 17:57:03 -08:00 |
|
|
Lin
|
cd8e83e7c0
|
Merge pull request #10486 from Seris02/observe
moves observe to ghost tab instead of sticking it in the ooc tab
|
2020-01-10 23:56:46 +00:00 |
|
|
kevinz000
|
b6e14c6b86
|
compile
|
2020-01-10 14:30:20 -08:00 |
|
|
kevinz000
|
8f60099595
|
Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
|
2020-01-10 14:01:06 -08:00 |
|
|
kevinz000
|
2c245a18fd
|
compile
|
2020-01-10 13:43:53 -08:00 |
|
|
kevinz000
|
c0274b1bc6
|
compile
|
2020-01-10 13:28:56 -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
|
24c1baddd0
|
compile compile compile
|
2020-01-10 05:50:19 -08:00 |
|
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
|
Unknown
|
e008388176
|
Bee models
|
2020-01-09 16:13:23 -07:00 |
|
|
Unknown
|
8a8d0bf6da
|
Merge branch 'master' into xantholne-cowboy02
|
2020-01-08 20:36:22 -07:00 |
|
|
Unknown
|
afc0ca44f2
|
Merge branch 'master' into xantholne-cowboy02
|
2020-01-08 20:35:36 -07:00 |
|
|
Seris02
|
c7790aba1a
|
moves observe to ghost tab
|
2020-01-09 10:46:18 +08:00 |
|
|
Putnam
|
244d46ee41
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-08 17:08:01 -08:00 |
|
|
kevinz000
|
1e6d05dc59
|
Merge pull request #10470 from deathride58/deletesminers
[s] adds a cooldown to area creation attempts
|
2020-01-08 13:29:36 -08:00 |
|
|
Unknown
|
4773a3e374
|
Fuggin Cowboy Clothes
|
2020-01-08 07:15:42 -07:00 |
|
|
Putnam
|
12a04da2d2
|
Added second flavor text, not copied on save.
|
2020-01-08 00:57:42 -08:00 |
|
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
|
kevinz000
|
5b2c4deaa0
|
lockcharge --> locked_down
|
2020-01-07 12:04:41 -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 |
|
|
deathride58
|
6f2cf0b636
|
[s] adds a cooldown to area creation attempts
|
2020-01-07 10:04:09 -05:00 |
|
|
kevinz000
|
5f7f1b09f3
|
Update observer.dm
|
2020-01-07 02:41:05 -08:00 |
|
|
kevinz000
|
ae73927b67
|
patches
|
2020-01-07 02:39:16 -08:00 |
|
|
kevinz000
|
8a29c5a7a9
|
Update mob_defines.dm
|
2020-01-07 02:20:44 -08:00 |
|
|
kevinz000
|
b9260a62df
|
Update observer.dm
|
2020-01-07 02:16:52 -08:00 |
|
|
kevinz000
|
5975f4c17d
|
Update observer.dm
|
2020-01-07 02:12:47 -08:00 |
|
|
kevinz000
|
d461e70a9b
|
Update life.dm
|
2020-01-06 23:45:39 -08:00 |
|
|
kevinz000
|
05c903e4a3
|
Update life.dm
|
2020-01-06 23:44:33 -08:00 |
|
|
kevinz000
|
3efdf013e6
|
mobility flags
|
2020-01-06 21:47:27 -08:00 |
|
|
BlackMajor
|
5a97259ba9
|
Fix a couple of bugs, add wrapping paper and destination tagger
|
2020-01-07 15:33:16 +13:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Lin
|
46420a693d
|
Merge branch 'master' into Ghommie-cit425
|
2020-01-07 00:28:37 +00:00 |
|
|
kevinz000
|
7006f2b1be
|
more compile stuff
|
2020-01-06 04:23:52 -08:00 |
|
|
kevinz000
|
c77005af8a
|
changes
|
2020-01-06 04:17:53 -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 |
|
|
Lin
|
7ad6021472
|
Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-06 03:49:52 +00:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|