Commit Graph
259 Commits
Author SHA1 Message Date
TrilbySpaceClone 92e355267f Revert "correct door to vault being all access"
This reverts commit f145dd1730.
2020-01-28 16:07:15 -05:00
TrilbySpaceClone f145dd1730 correct door to vault being all access 2020-01-27 02:31:19 -05:00
r4d6 1ae106cca2 Fixes 2020-01-21 09:23:34 -05:00
GhomandGitHub d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01: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 98bb9397ea fix cyborgs spawns 2020-01-16 21:05:51 -05:00
r4d6 a360a89f86 Map Changes 2020-01-16 15:10:57 -05:00
BlackMajor 30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
Putnam 57530ab1c9 Added one to box, too 2020-01-09 19:36:44 -08:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
TrilbySpaceClone 304ac7b20b fixes 2020-01-02 21:06:31 -05:00
TrilbySpaceClone 9adb7a718d random airlock b-gone 2019-12-30 03:10:13 -05: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 0edbbc5a04 remves cable 2019-12-29 00:33:39 -05: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 1c34ab661d Update BoxStation.dmm 2019-12-25 02:07:33 -05:00
TrilbySpaceClone b7ee64dd5d Steos are bad 2019-12-22 02:45:07 -05:00
TrilbySpaceClone d3a8025675 Wew 2019-12-22 02:17:24 -05:00
LinandGitHub 4d466e17f3 Merge pull request #10173 from Ghommie/Ghommie-cit461
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
Ghommie 3cb8391f38 Hopefully this won't screw up travis. 2019-12-17 12:15:28 +01:00
Ghommie 0b879f0f73 Fixing a boxstation pipenet mapping issue. 2019-12-13 16:57:48 +01:00
Ghommie 4502d7b795 Ports improved and simplier fire alarms. 2019-12-12 22:44:20 +01:00
kevinz000andGitHub 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
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
KathrinBailey 9ee4acd143 Persi's Sleepers 2019-11-23 16:00:30 +00:00
KathrinBailey 532fab092f Bugfix from testmerge
Fixes the terrible stupid mistake.
Blood bank generator in medical lathe room on request, it's there on Pubby and heck I suppose it's something for doctors to do.
2019-11-23 06:41:23 +00:00
FermiandFermi 18e1246fd0 Classic fixes 2019-11-21 03:16:18 +00:00
FermiandFermi ff7b070fa1 Maps 2019-11-21 02:16:15 +00:00
KathrinBailey 7adf8da43e weh work please no error
error man bad
2019-11-17 06:32:33 +00:00
KathrinBailey 51c1642976 yeah there we go self-confidence destroyed misshun accomplished 2019-11-17 06:18:53 +00:00
Persi 1f2a32b94d Adds two VR sleepers to all current maps' perma. 2019-11-13 00:49:50 -05:00
Ghommie f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
Ghommie 22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
FermiandFermi 489e711b4f pls 2019-10-11 18:49:30 +01:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000andGitHub 143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
nik707andGitHub b46c41cafd Merge pull request #9379 from jakeramsay007/Medbay-Doors
Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps
2019-10-07 18:23:23 -05:00
EmeraldSundisk 6fc2373a58 Adds some potted plants. 2019-10-07 12:59:43 -07:00
Poojawa 27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05:00
Chayse Ramsay 986ac16b93 Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps 2019-10-01 22:21:32 +01:00
Poojawa 53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kevinz000andGitHub 076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
Poojawa 583cf3d2ed Maps in Blood generators 2019-08-29 23:15:44 -05:00