1797 Commits
Author SHA1 Message Date
Chiirno 81fe7f4230 returned access to Starboard Emergency Storage 2020-12-27 03:01:29 -04:00
Chiirno 6beb47ef6d re-removed bedsheet on morgue tray 2020-12-27 02:46:00 -04:00
Blue Wildrose 6d89c9f7b6 I learned about mapmerger 2020-12-26 16:39:20 -07:00
Chiirno 6508f76fcf removed toxins mixing chamber zone and replaced it with toxins mixing lab zone 2020-12-26 18:56:14 -04:00
Chiirno 269182f6ec added al light switch to surgery 2020-12-26 18:53:55 -04:00
Blue Wildrose cac5e6dad6 A Pubby Christmas 2020-12-25 20:59:10 -07:00
Chiirno cb4780739a added one more paramed spawn in office, for a total of three 2020-12-23 22:44:33 -04:00
Chiirno 4d85410327 bleached surgical storage, shrunk office and expanded emergency storage. Minor rearrangements of wallmounts wires and misc objects. 2020-12-23 21:14:46 -04:00
Chiirno 3dc96ce0d2 moved consoles around so they are adjacent to the surgery tables 2020-12-23 03:54:58 -04:00
Chiirno 08b40e3483 added quotation marks to an airlocks name 2020-12-23 02:11:42 -04:00
Chiirno bbbe99e99d switched the air cannister and the heater in Starboard Emergency Storage 2020-12-23 01:59:07 -04:00
Chiirno 739574731f removed the second air alarm in surgery 2020-12-23 01:46:12 -04:00
Chiirno a267e61cbd solidified paramed morgue airlock, moved surgery fridge, and rearranged some of the wall mountings. 2020-12-23 00:56:28 -04:00
Chiirno 35896e92ec Paramedic office added and operating room remodeled 2020-12-22 21:50:22 -04:00
MrJWhit 9f7d87759d Update BoxStation.dmm 2020-12-15 13:55:30 -05:00
MrJWhit c34656c5e8 The rest of the stuff 2020-12-15 13:51:04 -05:00
MrJWhit 68cf6a845c Boxstation fixes 2020-12-15 13:35:41 -05:00
siliconsandGitHub a85c49399d Merge pull request #13746 from keronshb/boxchanges
Reworks Northwest Box Station Maint and adds a bridge between Atmos and the Turbine
2020-12-13 23:09:54 -07:00
siliconsandGitHub c2727ca278 Merge pull request #13743 from Linzolle/thunderdome
thunderdome entertainment monitors fix + stuff
2020-12-12 01:55:53 -07:00
EmeraldSundiskandGitHub 2a35a23509 Add files via upload 2020-12-10 13:35:47 -08:00
keronshb d94c9a5d43 Fixes the paper
oops should've caught this
2020-12-10 15:26:34 -05:00
keronshb bb78b98d6c Box Maint (+1) changes
Changes the northwest box maint and adds a bridge between atmos and the turbine.
2020-12-09 23:02:51 -05:00
EmeraldSundisk c15f946104 Update DeltaStation2.dmm 2020-12-09 10:35:45 -08:00
Linzolle 0ddc053a8b what if mapmerge worked 2020-12-08 17:35:21 -06:00
Linzolle 3e951d334c fix entertainment monitors 2020-12-08 17:21:14 -06:00
MrJWhit 00337392c7 Sneaky opposum 2020-11-26 00:58:48 -05:00
siliconsandGitHub 75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival
Local Assistant man can now bash rock again!*
2020-11-21 18:25:13 -07:00
The0bserver 56b6a42bb8 Tweaks, making sure code is right. Pain is infinite.
Tin
2020-11-20 03:54:28 -05:00
The0bserver d3b0ac882f HERE WE GOOOOOOOOOO!
New maps, new meme.
2020-11-20 03:05:44 -05:00
Putnam3145andGitHub 9d300ade35 Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
EmeraldSundiskandGitHub 330da48518 Add files via upload 2020-11-14 15:38:33 -08:00
EmeraldSundiskandGitHub 00398cb45a Add files via upload 2020-11-14 15:14:53 -08:00
EmeraldSundiskandGitHub 993ac9b52d Add files via upload 2020-11-14 13:32:34 -08:00
EmeraldSundisk 81c9bfecdc Update CogStation.dmm 2020-11-14 10:37:05 -08:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
Dan-Neposh a7936efafc Merge branch 'master' into clockcultrework_v2 2020-11-12 16:12:05 -05:00
MrJWhit be9e5acc19 A few fixes to kilo 2020-11-01 21:02:18 -05:00
zeroisthebiggayandGitHub 44eb62b388 a (#13647) 2020-11-01 22:00:20 +01:00
siliconsandGitHub 453d5081a7 Merge pull request #13628 from MrJWhit/messing-with-boxstations-maint
Adjusting Boxstation's Southeast Maint (three new rooms)
2020-10-28 07:54:04 -07:00
MrJWhit 5806ea8f50 Even cooler.jpg 2020-10-26 20:39:20 -04:00
MrJWhit 5da37ddeb2 Minor fix 2020-10-26 18:57:06 -04:00
MrJWhit 65f82daa44 Update BoxStation.dmm 2020-10-25 17:59:53 -04:00
MrJWhit 1e65afda9d Update BoxStation.dmm 2020-10-25 17:58:00 -04:00
MrJWhit c540bcd0f2 Secret botany 2020-10-25 17:54:02 -04:00
MrJWhit 33cfcc72be Making box maint cooler, bot party room and maint rage cage part 1 2020-10-25 14:31:43 -04:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
MrJWhitandGitHub c860cc78df Giving science a space loop on every map (#13611)
* Boxstation Fix

* DeltaStation and Boxstation Update

* Kilo fix and minor omegastation fix

* Lambda fixing

* Metastation update

* Second to last update

* Pubby and final touches
2020-10-25 14:15:01 +01:00
Dan-Neposh 946acc9c8f various grammar fixes/eminence rework prep 2020-10-19 14:11:19 -04:00
siliconsandGitHub 0c3020d4b8 Merge pull request #13349 from LetterN/git-updates
Updates git, travis, and build tests
2020-10-11 01:24:09 -07:00