Putnam3145 and GitHub
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 and GitHub
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 and GitHub
db13f748aa
Merge pull request #10317 from Trilbyspaceclone/map_redo
...
Corrects issues with box map
2020-01-05 16:24:46 +01:00
Ghom and GitHub
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 and GitHub
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 and GitHub
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
TrilbySpaceClone
0edbbc5a04
remves cable
2019-12-29 00:33:39 -05:00
Ghom and GitHub
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 and GitHub
f8c039f9eb
Update CentCom.dmm
2019-12-27 21:39:01 -05:00
Ghom and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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
r4d6
3524bc24ea
Fix areas and tiles getting ripped off
2019-12-22 17:04:08 -05:00
r4d6
b53c3869ca
Connect the fuel pipe to somewhere
2019-12-22 08:19:23 -05:00
TrilbySpaceClone
b7ee64dd5d
Steos are bad
2019-12-22 02:45:07 -05:00
TrilbySpaceClone
c7dbdd73df
Merge branch 'master' into donut
2019-12-22 02:36:57 -05:00
TrilbySpaceClone
d3a8025675
Wew
2019-12-22 02:17:24 -05:00
r4d6
aa0507dc03
Forgot a button on the Tesla
2019-12-21 23:46:12 -05:00
r4d6
04f0496322
Forgot a "
2019-12-21 23:23:32 -05:00
r4d6
5a189b2354
QoL Update
...
- Rename the cameras and place two more
- Unanchor the shields generators and emitters because they were bugged and will save more time
- Put more rad closets on the Singulo
- Put more insuls on the Tesla since they protect
- Moved the Engineer clothing locker to Boxstation instead of having it in the Engine
- Added a button to the shutters on the north side of PA
- Added a marker to show where to place the console
- Rewire the power wire to be more in a straight line.
2019-12-21 23:09:43 -05:00
r4d6
c5aef98252
Make things even more organized
2019-12-21 09:17:15 -05:00
r4d6
fb078e18f9
QoL Update
...
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
2019-12-21 09:12:04 -05:00
r4d6
445a7fb855
Redo my changes on Box
...
Hopefully this will fix the conflict with the fire alarms.
2019-12-19 23:57:49 -05:00
r4d6
61a702bad5
Merge remote-tracking branch 'upstream/master' into substationV2
2019-12-19 23:51:14 -05:00
Lin and GitHub
4d466e17f3
Merge pull request #10173 from Ghommie/Ghommie-cit461
...
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
Lin and GitHub
f38747ed70
Merge pull request #10207 from Ghommie/Ghommie-cit468
...
Fixes pubby wall meds being var-edited snowflakes.
2019-12-19 23:41:36 +00:00
r4d6 and GitHub
ffdfa5c409
Update Boxstation to have Engines landmark
2019-12-19 15:21:36 -05:00