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 |
|
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 |
|
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 |
|
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 |
|
TrilbySpaceClone
|
9adb7a718d
|
random airlock b-gone
|
2019-12-30 03:10:13 -05:00 |
|
Putnam
|
a4c356ad57
|
added a cryo to the ghost cafe
|
2019-12-29 21:28:09 -08:00 |
|
TrilbySpaceClone
|
51742d5da5
|
tada
|
2019-12-29 20:08:30 -05:00 |
|
TrilbySpaceClone
|
c8dcdcbcf2
|
Update BoxStation.dmm
|
2019-12-29 18:09:45 -05:00 |
|
TrilbySpaceClone
|
42f0648f78
|
Merge branch 'master' into map_redo
|
2019-12-29 16:52:47 -05:00 |
|
BlackMajor
|
b811d3e57e
|
More work on it
|
2019-12-30 01:23:41 +13:00 |
|
TrilbySpaceClone
|
0edbbc5a04
|
remves cable
|
2019-12-29 00:33:39 -05:00 |
|
Ghom
|
fe78c98f71
|
Merge pull request #10297 from Hatterhat/tg-45547-luxbar
the one with the luxury bar capsule
|
2019-12-28 17:00:19 +01:00 |
|
TrilbySpaceClone
|
7d23e543e2
|
readds cell 4
|
2019-12-28 00:24:20 -05:00 |
|
TrilbySpaceClone
|
1d40732e3f
|
weh
|
2019-12-27 23:41:34 -05:00 |
|
Trilbyspaceclone
|
f8c039f9eb
|
Update CentCom.dmm
|
2019-12-27 21:39:01 -05:00 |
|
Ghom
|
93248336ea
|
Merge pull request #10265 from Trilbyspaceclone/map_redo
Cit-iftyed Box map as well as adding back blasters back to armory
|
2019-12-27 22:54:35 +01:00 |
|
Ghom
|
13fc20c7c3
|
Merge pull request #10296 from Useroth/ghostcafe
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
|
2019-12-27 16:30:13 +01:00 |
|
Useroth
|
35846c452a
|
Applied suggestions and minor tweaks.
|
2019-12-26 20:03:43 +01:00 |
|
Ghom
|
3203441abe
|
Nope, it didn't compile, Harold.
|
2019-12-26 15:48:46 +01:00 |
|
Hatterhat
|
940efc0c1c
|
holy shit i hope this compiles
|
2019-12-26 01:46:04 -06:00 |
|
Useroth
|
cbff758d1a
|
Added a ghost role with its own spawner for the purposes of chillling in the ninja holding facility.
|
2019-12-26 07:49:48 +01:00 |
|
TrilbySpaceClone
|
1c34ab661d
|
Update BoxStation.dmm
|
2019-12-25 02:07:33 -05:00 |
|
TrilbySpaceClone
|
ec0596c404
|
Update
|
2019-12-23 18:52:33 -05:00 |
|
Ghom
|
9a022f21eb
|
Merge pull request #10245 from r4d6/substationV2
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
|
2019-12-23 18:58:26 +01:00 |
|
kevinz000
|
85ceda474e
|
Merge pull request #10218 from GrayRachnid/ADDS-MINERS
Adds gas miners to all maps.
|
2019-12-23 00:45:22 -08:00 |
|
r4d6
|
f4b3fd7369
|
Also give Tesla's emitters R-floors
|
2019-12-22 17:09:39 -05:00 |
|