Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +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 |
|
kappa-sama
|
ff5901cadb
|
hi
|
2020-01-08 16:50:40 -05:00 |
|
kevinz000
|
2944a902c6
|
Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
|
2020-01-08 13:36:24 -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
|
f6b9396096
|
Merge pull request #10439 from LetterN/tachelon-logs
doppler logs
|
2020-01-06 19:45:28 -08:00 |
|
Lin
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00:00 |
|
Letter N
|
de14073956
|
limit
|
2020-01-06 08:34:48 +08:00 |
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
Artur
|
c438d39eb3
|
Initial Commit
|
2020-01-05 22:32:29 +01:00 |
|
Letter N
|
ba7f0dab62
|
doppler logs!
|
2020-01-05 19:16:37 +08:00 |
|
Ghom
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
Putnam
|
adf87c7595
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2020-01-02 22:52:24 -08:00 |
|
Lin
|
f7b91f9b65
|
Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
|
2020-01-03 00:01:54 +00: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 |
|
BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +13:00 |
|
BlackMajor
|
aabb39a364
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
|
2020-01-02 22:06:31 +13:00 |
|
BlackMajor
|
30e3edaac1
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:03:58 +13:00 |
|
BlackMajor
|
3239acf74d
|
Sync
|
2020-01-02 22:02:55 +13:00 |
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
Putnam
|
71fcd23f1f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2019-12-30 13:31:15 -08:00 |
|
Seris02
|
bebd1a4600
|
yee.
|
2019-12-30 23:52:36 +08:00 |
|
Putnam
|
cb1403e095
|
oh yeah that's there too
|
2019-12-30 01:54:46 -08:00 |
|
Putnam
|
6e9d13e48f
|
Replace the cryopod with a simple ghost button.
|
2019-12-30 01:52:06 -08:00 |
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
Putnam
|
a4c356ad57
|
added a cryo to the ghost cafe
|
2019-12-29 21:28:09 -08:00 |
|
Seris02
|
9b3654e4ff
|
telescopic IVs
|
2019-12-29 23:26:53 +08:00 |
|
BlackMajor
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13:00 |
|
Ghommie
|
7837688426
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-28 23:41:10 +01:00 |
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
Lin
|
d562a5ba27
|
Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
|
2019-12-28 04:07:03 +00:00 |
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
Seris02
|
8ed4fe9c05
|
changes
|
2019-12-27 18:09:30 +08:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
Ghommie
|
8c5e506a17
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382
|
2019-12-21 18:22:58 +01:00 |
|
Ghommie
|
395457f7ef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471
|
2019-12-21 17:59:32 +01:00 |
|
Ghom
|
9d00072072
|
Merge pull request #10257 from DeltaFire15/communication-magicnumbad
Removes a magicnumber
|
2019-12-21 15:33:27 +01:00 |
|
DeltaFire
|
3738156340
|
Magic number baaad
|
2019-12-21 15:16:28 +01:00 |
|
Ghom
|
71d0c3e257
|
Merge pull request #10232 from DeltaFire15/cc-headmessages
All heads of staff can now spam CC.
|
2019-12-21 11:27:04 +01:00 |
|
Ghom
|
a7cda1aea0
|
Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
|
2019-12-21 11:05:36 +01:00 |
|
DeltaFire
|
685425ed55
|
Atomises out the magicnumber change
|
2019-12-20 15:26:16 +01:00 |
|
Lin
|
8511c44f0f
|
Merge pull request #10199 from Ghommie/Ghommie-cit467
Fixing and cleaning up the blood bank generator code.
|
2019-12-19 23:39:17 +00:00 |
|
Lin
|
66c6659681
|
Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
|
2019-12-19 23:00:52 +00:00 |
|
Ghommie
|
8566e2396d
|
Brings in some mapping code updates.
|
2019-12-19 00:44:14 +01:00 |
|