Blue Wildrose
|
3d8f8ffe27
|
Bringin' back the ding
|
2021-04-02 02:19:19 -07:00 |
|
zerothebigboy
|
01d92230a3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/mask.dmi
|
2021-03-16 19:19:12 -04:00 |
|
Fabian
|
7e50d878ca
|
Merge branch 'master' into the-fuck-am-i-doing
|
2021-03-15 14:09:30 +01:00 |
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
Putnam
|
cc360288bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-08 14:46:46 -08:00 |
|
Letter N
|
de6f1401bb
|
final fix
|
2021-03-08 13:24:28 +08:00 |
|
Fabian
|
8178b7073a
|
It's done, atleast the code is
|
2021-03-05 21:50:29 +01:00 |
|
Fabian
|
2f1aba4f80
|
Revert "i can't believe kevin made me code"
This reverts commit 7f38564838.
|
2021-03-05 21:19:59 +01:00 |
|
Fabian
|
a061f02b5b
|
Revert "objectives"
This reverts commit dbabbb1062.
|
2021-03-05 21:19:56 +01:00 |
|
Fabian
|
dbabbb1062
|
objectives
hrnrghghgh
|
2021-03-05 20:31:57 +01:00 |
|
Fabian
|
7f38564838
|
i can't believe kevin made me code
im taking severe offense to this
|
2021-03-05 19:55:53 +01:00 |
|
Letter N
|
34697acf74
|
missing icon fix & stop throwing out parts
|
2021-03-05 19:29:52 +08:00 |
|
Letter N
|
4f8d6c7c11
|
bruh
|
2021-03-05 17:21:22 +08:00 |
|
Letter N
|
e967590dfa
|
fix verb
|
2021-03-05 17:17:30 +08:00 |
|
Letter N
|
cb346a3847
|
a
|
2021-03-05 14:29:36 +08:00 |
|
Letter N
|
a87e4533e5
|
support for tgs4 noconfigs needed***
|
2021-03-03 17:33:14 +08:00 |
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
Putnam
|
f07a9c13fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-02 01:44:58 -08:00 |
|
zerothebigboy
|
165966ffeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/suit.dmi
|
2021-02-28 22:13:00 -05:00 |
|
Letter N
|
c208f82abf
|
oops! all dumb cat
|
2021-02-27 09:15:39 +08:00 |
|
Letter N
|
5c39381117
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-23 11:36:05 +08:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
timothyteakettle
|
69e9a94829
|
prioritise clients
|
2021-02-21 00:18:25 +00:00 |
|
Letter N
|
6abad913ff
|
the sqel
|
2021-02-19 14:52:18 +08:00 |
|
Letter N
|
7d39949a2f
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-19 12:38:32 +08:00 |
|
Letter N
|
501d33cddd
|
agony
|
2021-02-19 10:32:24 +08:00 |
|
Letter N
|
7b24456e2d
|
does not exist
|
2021-02-16 20:33:46 +08:00 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
Letter N
|
8a0c932d55
|
oops! All Refactors!
|
2021-02-12 11:07:58 +08:00 |
|
Letter N
|
834e4730b3
|
not existing
|
2021-02-09 15:44:49 +08:00 |
|
zerothebigboy
|
85886f563f
|
f
|
2021-02-08 16:59:54 -05:00 |
|
Letter N
|
f87aa0ac5b
|
toast. And DiscoFox™️
|
2021-02-08 18:46:05 +08:00 |
|
Putnam
|
6faf6af961
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-29 16:31:01 -08:00 |
|
Timothy Teakettle
|
938b924a37
|
yes
|
2021-01-28 11:12:27 +00:00 |
|
Timothy Teakettle
|
8569c40ce5
|
Update adminpm.dm
|
2021-01-21 22:23:48 +00:00 |
|
Timothy Teakettle
|
401e6a7690
|
test
|
2021-01-21 20:17:25 +00:00 |
|
Letter N
|
125cd17cee
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-01-20 15:40:41 +08:00 |
|
Putnam
|
158dd11d8d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-19 17:52:40 -08:00 |
|
silicons
|
e680d58a03
|
fixes
|
2021-01-09 14:56:29 -08:00 |
|
silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
Putnam
|
186bb483b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-06 23:55:24 -08:00 |
|
Artur
|
9e16df56aa
|
Ding for prayers
|
2021-01-04 23:23:55 +02:00 |
|
Letter N
|
cd5d558fad
|
safety? what's that?
* maybe table-breaking change
|
2021-01-04 11:57:12 +08:00 |
|
Letter N
|
56789c5924
|
firsthit-lib_machines
|
2020-12-31 16:46:40 +08:00 |
|
Letter N
|
ce5ab2f3a4
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-28 09:35:58 +08:00 |
|
silicons
|
017db3de90
|
Update topic.dm
|
2020-12-26 11:05:18 -07:00 |
|
Letter N
|
56fb81d02c
|
Immursive Audio 2
|
2020-12-24 11:06:49 +08:00 |
|
Letter N
|
47a3afff54
|
DB stickies
|
2020-12-23 16:50:48 +08:00 |
|
Letter N
|
e9ca58446c
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-23 12:25:24 +08:00 |
|
DeltaFire
|
c37bb9cc2a
|
Merge pull request #13842 from Citadel-Station-13/silicons-patch-35
deletes a tiny segment of dead code
|
2020-12-22 17:56:13 +01:00 |
|