Lin
f7b91f9b65
Merge pull request #10238 from Ghommie/Ghommie-cit478
...
Brings in some mapping code updates.
2020-01-03 00:01:54 +00: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
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
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
4d466e17f3
Merge pull request #10173 from Ghommie/Ghommie-cit461
...
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
Lin
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
ffdfa5c409
Update Boxstation to have Engines landmark
2019-12-19 15:21:36 -05:00
r4d6
8a4b3f2681
Add Engines submaps
2019-12-19 15:20:32 -05:00
Ghommie
8566e2396d
Brings in some mapping code updates.
2019-12-19 00:44:14 +01:00
Trilbyspaceclone
0f5c8db456
Merge branch 'master' into donut
2019-12-17 15:12:51 -05:00
Ghommie
3cb8391f38
Hopefully this won't screw up travis.
2019-12-17 12:15:28 +01:00
GrayRachnid
774d853607
Adds gas miners to all maps.
2019-12-17 01:39:25 -05:00
Ghommie
3f06661de5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
2019-12-17 03:34:11 +01:00
Ghommie
f738e370a4
Fixes pubby wall meds being var-edited snowflakes.
2019-12-16 15:22:50 +01:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
Ghommie
0b879f0f73
Fixing a boxstation pipenet mapping issue.
2019-12-13 16:57:48 +01:00
Ghommie
911685ff0a
Fixes raven's shuttle computer not being of the emergency shuttle type.
2019-12-12 23:28:50 +01:00
Ghommie
4502d7b795
Ports improved and simplier fire alarms.
2019-12-12 22:44:20 +01:00
Useroth
5e836c51e4
Forgot to track the new files
2019-12-08 14:05:05 +01:00
TrilbySpaceClone
562bf2d492
fix
2019-12-07 04:04:07 -05:00
Ghommie
e0caf6007b
Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter...
2019-12-07 04:02:33 +01:00
kevinz000
b05854ac98
Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf
...
Removes Clockie Surgical capabilities
2019-12-05 22:02:38 -07:00
kevinz000
fbcdc4d330
Merge pull request #9575 from KathrinBailey/Kat'sBoxRework
...
Box Beautification & Bar Rework & Issue 9706 Fix
2019-12-05 21:38:30 -07:00
KathrinBailey
ae729d400b
Permabrig broken area fix
...
oopsie I forgot because I'm always tired fuck 6am morning shifts.
2019-11-30 03:25:21 +00:00
KathrinBailey
d73b93d4a7
Addresses Aelita + Gray + Sylvara, fixes cams, detective office & HoP stamp, room names and airlock cyclelink
...
Fixes:
• Missing HoP stamp
• Missing Detective handcuffs
• Improper dorms camera names
• Luxury rooms not really mentioned to be luxury
• Missing airlock cyclelink helper on maint south area that was reworked for better EVA spacewalking on the outside.
2019-11-30 01:30:12 +00:00
KathrinBailey
90009904cf
Maaapmeeergeeee?
...
I forgot last commit. Hopefully this'll do it.
2019-11-28 19:35:08 +00:00
Iroquois Pliskin
9a9c63bea3
Removes Clockie Surgical capabilities, including table, tools, and implanter/implant case.
2019-11-26 09:28:40 -05:00
KathrinBailey
c1e3b07b2c
Bugfixes
...
Fixes incorrect areas
Fixes disconnected air canisters in maint
Adds Persi's sleepers back into perma
Small changes to perma to make it look slightly cleaner. Kink room in perma because it's probably really boring in there.
2019-11-25 16:11:06 +00:00
