kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
kevinz000
|
b854cb5980
|
Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
|
2020-02-27 01:22:25 -07:00 |
|
YakumoChen
|
f6c170d31b
|
Update tails.dm
|
2020-02-27 08:15:27 +00:00 |
|
YakumoChen
|
e682845ebf
|
Update tails.dm
|
2020-02-27 08:09:34 +00:00 |
|
YakumoChen
|
2cb95e200a
|
Update tails.dm
|
2020-02-27 08:04:32 +00:00 |
|
YakumoChen
|
e0c7c98253
|
Update tails.dm
|
2020-02-27 08:01:13 +00:00 |
|
kevinz000
|
a8a8e242d8
|
Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
|
2020-02-27 00:54:47 -07:00 |
|
Ghom
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
YakumoChen
|
6385445fd5
|
ruining the joke
|
2020-02-24 10:31:47 +00:00 |
|
YakumoChen
|
ff10b70ffe
|
2cat heating up
|
2020-02-24 10:20:47 +00:00 |
|
YakumoChen
|
96bf8d6969
|
Update tails.dm
|
2020-02-24 09:55:39 +00:00 |
|
Hatterhat
|
b89a2314a2
|
mmm that's compiling i don't like that
|
2020-02-22 16:17:51 -06:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghommie
|
698f0b8177
|
Something about pAIs and silicon access priviledges.
|
2020-02-18 16:20:44 +01:00 |
|
kevinz000
|
7ee04aa608
|
Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
|
2020-02-15 12:17:37 -07:00 |
|
kevinz000
|
ee9b38017e
|
Merge pull request #10995 from Ghommie/Ghommie-cit568
Something about cryopods.
|
2020-02-15 12:17:02 -07:00 |
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
Ghom
|
1e57664a99
|
Merge pull request #10934 from kevinz000/actual_ghost_newscasters
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
|
2020-02-14 19:21:48 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
kevinz000
|
4e419eed03
|
Merge pull request #10987 from Ghommie/Ghommie-cit567
Something about missing privates sprites and bad code.
|
2020-02-12 23:56:53 -07:00 |
|
kevinz000
|
276f4b5fae
|
Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters
|
2020-02-10 04:32:01 -07:00 |
|
kevinz000
|
c9e5fd1c17
|
Merge pull request #10988 from YakumoChen/master
Reverts 10486 (Observe verb in the Ghost tab)
|
2020-02-10 04:14:33 -07:00 |
|
Ghommie
|
c34714cb90
|
Something about the in operator and spaceDMM version update.
|
2020-02-10 07:37:59 +01:00 |
|
Ghommie
|
d4c74c19de
|
Something about cryopods.
|
2020-02-10 04:26:50 +01:00 |
|
YakumoChen
|
1c24797de1
|
revert 10486
|
2020-02-09 06:41:13 +00:00 |
|
Ghommie
|
f6adce72fb
|
Something about missing private sprites and their bad code.
|
2020-02-09 06:51:57 +01:00 |
|
Ghommie
|
eaa6bc2db5
|
fixing another issue with the hear comsig proc.
|
2020-02-08 19:37:18 +01:00 |
|
Ghommie
|
2d8f85d810
|
A few nuisances solved.
|
2020-02-07 02:59:59 +01:00 |
|
kevinz000
|
927b9d0622
|
Revert "Merge pull request #10883 from ancientpower/ghost-newscasters"
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
|
2020-02-05 23:50:41 -07:00 |
|
kevinz000
|
3c5a3cb4d4
|
Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
|
2020-02-05 23:46:04 -07:00 |
|
Ghom
|
aaa45f102e
|
Merge pull request #10875 from ancientpower/m-bunny-ears
Adds bunny ear style for humans and anthromorphs
|
2020-02-05 06:50:10 +01:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
ancientpower
|
5aecdb6a4d
|
initial commit
|
2020-02-03 20:10:39 -06:00 |
|
ancientpower
|
be0695e146
|
bunny ear style
|
2020-02-03 12:05:00 -06:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
CygnusB
|
675e6cb9a6
|
Reunites Shaggy (hair from virgo) with Scooby Terrowin
self-insert baby pr florida man tries to merge his hair back into citadel
|
2020-01-27 15:51:38 -03:00 |
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
Kraseo
|
14b7711590
|
i will end whoever ported virgo hairs and thought it was fine to do it like that
|
2020-01-23 17:29:21 +01:00 |
|
Ghom
|
bf62563507
|
Merge pull request #10410 from CameronWoof/free-the-lizard
Humans and anthromorphs can now use lizard tails.
|
2020-01-23 03:06:52 +01:00 |
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
Ghom
|
7a3f0d140c
|
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
|
2020-01-21 02:26:25 +01:00 |
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
kevinz000
|
14aaca8fa5
|
compile
|
2020-01-16 19:18:54 -07:00 |
|
kevinz000
|
b22e1a1cb4
|
compile
|
2020-01-16 02:27:35 -07:00 |
|
Ghommie
|
1d948907f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-13 23:26:21 +01:00 |
|