 Ghom
|
0a5e2cf8ff
|
Merge pull request #10601 from Putnam3145/dojo-hilbert
Adds 16777216 dorms to the ghost dojo
|
2020-01-19 03:02:32 +01:00 |
|
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
Putnam
|
133cb89b32
|
hilbert's hotel for ghost dojo
|
2020-01-18 06:55:26 -08:00 |
|
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
|
r4d6
|
4e114d399c
|
Readding Cryo Sleeper in the gulag
|
2020-01-17 22:13:19 -05:00 |
|
|
r4d6
|
98bb9397ea
|
fix cyborgs spawns
|
2020-01-16 21:05:51 -05:00 |
|
|
r4d6
|
1413990ea2
|
Fix another TG snowflake variable.
|
2020-01-16 16:15:54 -05:00 |
|
|
r4d6
|
79256fa698
|
Fix TG's snowflake on_station_override var
|
2020-01-16 15:50:01 -05:00 |
|
|
r4d6
|
a360a89f86
|
Map Changes
|
2020-01-16 15:10:57 -05:00 |
|
|
kevinz000
|
c69d882943
|
Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
|
2020-01-12 00:40:48 -08:00 |
|
|
Ghom
|
5dc598e2ea
|
Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
|
2020-01-11 15:03:45 +01:00 |
|
|
Putnam
|
312da86424
|
Suggested changes
|
2020-01-11 01:28:49 -08:00 |
|
|
BlackMajor
|
30fc5b560b
|
Couple of lingering fixes
|
2020-01-11 17:57:18 +13:00 |
|
|
r4d6
|
f11cc9bcee
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into quick-fix
|
2020-01-10 00:09:24 -05:00 |
|
|
r4d6
|
48abd31dee
|
Fix SM 5x5
|
2020-01-10 00:06:06 -05:00 |
|
|
Putnam
|
57530ab1c9
|
Added one to box, too
|
2020-01-09 19:36:44 -08: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 |
|
|
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
|
c4dd0a393a
|
Revert "Test"
This reverts commit 5414f09b80.
|
2020-01-08 13:38:35 +13:00 |
|
|
BlackMajor
|
3424862746
|
Revert "Adds borg spawns to every map, and fixes a shit load of null vars on them."
This reverts commit cfb553b828.
|
2020-01-08 13:38:25 +13:00 |
|
|
BlackMajor
|
8aaa6db732
|
Revert "Test"
This reverts commit 8746e6091d.
|
2020-01-08 13:38:17 +13:00 |
|
|
BlackMajor
|
0520d3d9b9
|
Revert "Conflcits are pretty bothersome I tell ya hwat"
This reverts commit e6f11aa275.
|
2020-01-08 13:38:10 +13:00 |
|
|
BlackMajor
|
e6f11aa275
|
Conflcits are pretty bothersome I tell ya hwat
|
2020-01-08 13:20:24 +13:00 |
|
|
BlackMajor
|
7ddc356a6f
|
Revert "Test 2"
This reverts commit 6670de8e64.
|
2020-01-08 13:19:33 +13:00 |
|
|
BlackMajor
|
6670de8e64
|
Test 2
|
2020-01-08 13:19:07 +13:00 |
|
|
BlackMajor
|
8746e6091d
|
Test
|
2020-01-08 13:17:49 +13:00 |
|
|
BlackMajor
|
cfb553b828
|
Adds borg spawns to every map, and fixes a shit load of null vars on them.
|
2020-01-08 12:37:31 +13:00 |
|
|
BlackMajor
|
5414f09b80
|
Test
|
2020-01-08 12:29:45 +13: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 |
|
|
Putnam
|
9750eb3d42
|
"quotation marks"
|
2020-01-06 23:52:07 -08:00 |
|
|
Putnam
|
b5026256db
|
aaand a few more
|
2020-01-06 23:42:27 -08:00 |
|
|
Putnam
|
6f6f0cbb62
|
Tweaks to ghost dojo
|
2020-01-06 23:33:29 -08:00 |
|
|
Putnam3145
|
3b6cf8c952
|
Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
|
2020-01-05 23:08:49 -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 |
|
|
Ghom
|
db13f748aa
|
Merge pull request #10317 from Trilbyspaceclone/map_redo
Corrects issues with box map
|
2020-01-05 16:24:46 +01:00 |
|
|
Ghom
|
6f20ab520c
|
Merge pull request #10378 from EmeraldSundisk/metacloset
A simple fix and a simple test.
|
2020-01-04 22:43:22 +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 |
|
|
r4d6
|
46041edab8
|
stuff more collectors in the 1x3 SM.
|
2020-01-02 22:31:20 -05:00 |
|
|
TrilbySpaceClone
|
304ac7b20b
|
fixes
|
2020-01-02 21:06:31 -05: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 |
|
|
r4d6
|
91a8a434f5
|
Fix a bug and allow for the three crystals to be hit.
|
2020-01-02 01:58:34 -05:00 |
|
|
r4d6
|
0fad4aff75
|
change a x of place to make more sense.
|
2020-01-02 01:34:17 -05:00 |
|
|
r4d6
|
4010d72b7a
|
Add 3 SM Variations
|
2020-01-02 01:31:21 -05:00 |
|
|
EmeraldSundisk
|
8255cb82aa
|
C'mon now...
|
2019-12-31 18:06:05 -08:00 |
|
|
Putnam
|
4b6e8cfa18
|
no, not a cryo...
|
2019-12-30 01:26:03 -08:00 |
|
|
Putnam
|
8d00e4f094
|
added crematorium, replaced every floor in the ghost cafe with indestructible ones
|
2019-12-30 01:17:48 -08:00 |
|