Commit Graph

2147 Commits

Author SHA1 Message Date
Linzolle 4c58c1a427 Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into mrjwhit-boxstation 2021-07-23 13:18:33 -07:00
MrJWhit 96878c28cf Update BoxStation.dmm 2021-07-22 15:12:41 -04:00
MrJWhit b2ccb22888 fixing theater access and adding a whoopsie light 2021-07-22 15:09:44 -04:00
silicons 806ecf63ca why 2021-07-18 15:16:34 -07:00
silicons 3fcf8dc78b Merge pull request #14935 from bunny232/metatestinglab
Meta station toxins
2021-07-12 12:32:02 -07:00
Lin 97f8698f8a Merge pull request #14918 from MrJWhit/pubby-cap-mirror
Pubby mirror for the captains office
2021-07-12 00:04:21 -07:00
Lin 108c9dba9e Merge pull request #14936 from shellspeed1/woops
fixes to the new survival pod.
2021-07-10 12:06:26 -07:00
shellspeed1 5eff532b03 Woops, lets fix that 2021-07-09 01:12:10 -07:00
Lin 975846c7eb Merge pull request #14932 from MrJWhit/pubby-atmos-fixins
Makes it so AIs can plasmaflood in pubby
2021-07-08 17:11:15 -07:00
Lin b152052c70 Merge pull request #14929 from MrJWhit/engine-map-fixes
Adds another wall to the AM engine
2021-07-08 12:16:27 -07:00
bunny232 6aebfb08fc Update MetaStation.dmm 2021-07-08 12:35:31 -04:00
MrJWhit 9063ad262b Update PubbyStation.dmm 2021-07-07 16:21:40 -04:00
MrJWhit 46937f67ce areas 2021-07-06 23:00:34 -04:00
MrJWhit 26b186d24f Update engine_am.dmm 2021-07-06 16:29:45 -04:00
MrJWhit 3f5f639c42 Update PubbyStation.dmm 2021-07-06 01:45:44 -04:00
MrJWhit e1f8b5ba55 AAAAAAAAAH 2021-07-06 01:34:15 -04:00
silicons 472fda9504 Merge pull request #14833 from zeroisthebiggay/finallytools
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
2021-07-04 10:59:43 -07:00
MrJWhit 8e092394e1 Update PubbyStation.dmm 2021-07-03 19:20:48 -04:00
MrJWhit b09d305f1d I hate APCs 2021-07-01 00:35:26 -04:00
MrJWhit 7ebee01f70 another room 2021-07-01 00:14:49 -04:00
MrJWhit 8ca5b7624d Update BoxStation.dmm 2021-06-30 23:45:46 -04:00
MrJWhit 36de878d54 I hate APCs, did you know that? 2021-06-30 22:52:27 -04:00
MrJWhit d5edba7d7e WAITSHITFUCK 2021-06-30 22:46:18 -04:00
MrJWhit d3056e3f84 Boxstation rooms 'n stuff 2021-06-30 22:26:18 -04:00
WanderingFox95 5dab84ad81 Okay, let's try this again.
I don't like you, you don't like me,
can we please just get along?
2021-06-29 18:30:04 +02:00
silicons e04c940819 Merge pull request #14861 from bunny232/pubbymos
Pubby xenobiology atmospherics update among other things
2021-06-29 08:49:54 -07:00
silicons c7766b0f02 Merge pull request #14895 from shellspeed1/another-pod
Adds a new survival pod, the penthouse pod.
2021-06-29 08:48:55 -07:00
silicons f4c6888f96 Merge pull request #14822 from qweq12yt/more-cargo-features
Solving inconsistencies regarding QM being command
2021-06-29 08:46:33 -07:00
silicons 5204f5a6d9 Merge pull request #13991 from Putnam3145/auxtools-atmos
Replaces extools with auxtools; atmos overhaul
2021-06-27 11:01:32 -07:00
shellspeed1 d6b69b2800 The actual map 2021-06-27 03:39:21 -07:00
Lin 2064da4842 Merge pull request #14887 from MrJWhit/teg-reinforced-floors
Swapping some floors on the TEG-map
2021-06-24 14:45:53 -07:00
MrJWhit 084ec04782 Update engine_sm_5x5.dmm 2021-06-23 12:51:30 -04:00
MrJWhit b5e38ba4b3 Update engine_teg.dmm 2021-06-23 02:07:59 -04:00
Lin be3260f7a6 Merge pull request #14870 from bunny232/metaxenodoor
Metastation xenobiology pen door
2021-06-21 10:12:51 -07:00
Putnam3145 f77495f45d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-21 02:19:51 -07:00
qweq12yt 663a8c4853 Merge branch 'master' into more-cargo-features 2021-06-20 00:20:03 -03:00
silicons 0cfe2ec4ca Merge pull request #14863 from miniusAreas/fdmm-patch-28485128-miniusAreas
Various Fixes (freelance)
2021-06-19 07:04:48 -07:00
bunny232 a509506985 Update PubbyStation.dmm 2021-06-19 06:22:15 -04:00
qweq12yt 55e3db9169 changes Box HoP console to request only (like in the other maps) 2021-06-19 03:15:41 -03:00
qweq12yt d0ebf31b8c blue airlocks (maybe will remove that) 2021-06-19 03:15:40 -03:00
bunny232 e7f4213082 Update MetaStation.dmm 2021-06-18 05:29:17 -04:00
bunny232 db6d05db6f Incinerator mapping tweak 2021-06-17 05:04:05 -04:00
Putnam3145 dbdc3001ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-06-16 23:33:14 -07:00
EmeraldSundisk d823c5b168 Update Snaxi.dmm 2021-06-16 21:58:32 -07:00
miniusAreas cf0d7f704a AAAAAAAAAAA 2021-06-16 22:20:52 -04:00
miniusAreas 04b67e3584 metapubbydelta 2021-06-16 22:14:57 -04:00
bunny232 6fa06e6c04 Update PubbyStation.dmm 2021-06-16 05:03:55 -04:00
EmeraldSundisk 4fec75fe87 initialfix 2021-06-14 08:48:14 -07:00
silicons ddf885f42e Merge pull request #14818 from EmeraldSundisk/snaxiforrealthistime
HEY HEY! COME ON OVER, HAVE SOME FUN WITH SNOW TAXI!!!
2021-06-13 15:19:46 -07:00
EmeraldSundisk 686798b789 stronk 2021-06-12 21:21:43 -07:00