Commit Graph

920 Commits

Author SHA1 Message Date
kevinz000
e13efe26bd Merge pull request #8493 from Sishen1542/Oldstat
Fixes THAT Oldstation Tile
2019-06-08 01:08:44 -07:00
kevinz000
8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132
Gives pod lava land ruin a autolathen
2019-06-08 01:00:41 -07:00
Sishen
d7fdaed181 Fixes the Oldstation Tile 2019-05-30 15:45:17 -04:00
Sishen
21c678736b crewmonitor 2019-05-27 22:46:28 -04:00
kevinz000
4be6b352e0 Merge pull request #8423 from Sishen1542/EngiShower3
Engineering Showers! (Fixed 4 REALZIES this time)
2019-05-27 03:31:16 -07:00
kevinz000
d0f61c5f41 Merge pull request #8413 from Useroth/hotel-dorms
Boltable hotel dorms. Now with mapmerge. Also the hotel booze-o-mat doesn't require access anymore.
2019-05-25 11:32:23 -07:00
Sishen
92bbe42337 FOUR TRIES? IT TOOK HIM FOUR TRIES?! 2019-05-24 07:41:18 -04:00
Useroth
90b62234d6 Made the hotel booze-o-mat hacked by default. 2019-05-22 20:13:58 +02:00
Useroth
9441853f6d Boltable hotel. Now with mapmerge. 2019-05-22 19:28:50 +02:00
Poojawa
ab2457d504 Large Maps given an Apothecary 2019-05-21 06:09:10 -05:00
Trilbyspaceclone
a68c40a1a0 Update lavaland_surface_seed_vault.dmm 2019-05-20 15:29:52 -04:00
Trilbyspaceclone
9ff2132055 Update lavaland_surface_seed_vault.dmm 2019-05-18 12:52:59 -04:00
Poojawa
2f4e19bb87 Cryopod mapping fixes
Directional pods are also a thing too, neat.
2019-05-16 11:19:49 -05:00
BurgerLua
3968213bde Increased the spawn area size of the City of Cogs 2019-04-22 12:04:21 -07:00
Poojawa
e6597a192a Fixed duplicate turfs 2019-04-14 00:04:24 -05:00
Poojawa
29f4dfca83 Maps batch fixed 2019-04-13 23:30:22 -05:00
Poojawa
0ae08594a0 These are actually, all 100% unneeded 2019-04-13 23:13:37 -05:00
Poojawa
e170f8523d Let's make sure the lava is also the same airmix too 2019-04-02 05:56:48 -05:00
Poojawa
fc4659f503 Fixes deadly nest area 2019-04-02 05:45:12 -05:00
Trilbyspaceclone
b1205baa76 Update mrow_thats_right.dmm 2019-03-18 17:41:12 -04:00
Ghommie
0e8f356610 Milk. 2019-03-11 11:54:40 +01:00
kevinz000
7628289ad6 Merge pull request #8091 from deathride58/fixesz1hyperspace
Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
2019-03-10 13:43:21 -07:00
deathride58
1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67
Makes Dinner for two have loot
2019-03-08 20:44:23 -05:00
deathride58
64ab4a32a3 Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) 2019-03-04 21:38:34 -05:00
kevinz000
bf829a2d79 Merge pull request #8069 from deathride58/spaceoshacompliancepart1
Makes the holodeck control room on boxstation compliant with space OSHA
2019-03-04 13:56:34 -08:00
deathride58
4abdaa142f Makes the holodeck control room on boxstation compliant with space OSHA 2019-02-28 22:00:35 -05:00
Trilbyspaceclone
7edaff99de Update derelict2.dmm 2019-02-28 19:01:54 -05:00
Trilbyspaceclone
e84683330f Update derelict1.dmm 2019-02-27 16:20:46 -05:00
Tupinambis
58347dad9b Stop self antagging you shits (#7878) 2019-01-03 04:34:55 -08:00
nik707
7ed0303a3b Merge pull request #7880 from Trilbyspaceclone/revert-7862-fan
[Ready] Fixes "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others"
2019-01-02 02:20:59 -06:00
Trilbyspaceclone
9618fecfb7 Correct fans 2019-01-02 02:40:10 -05:00
Trilbyspaceclone
0b556a46af correct fans 2019-01-02 02:39:19 -05:00
Trilbyspaceclone
fc5b9117f2 Correct fans 2019-01-02 02:35:23 -05:00
Trilbyspaceclone
02761a38c9 Correct fans 2019-01-02 02:29:53 -05:00
Trilbyspaceclone
de551bc0c6 Revert "Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)"
This reverts commit addea6f21c.
2019-01-02 02:21:23 -05:00
Trilbyspaceclone
f2ae556ee4 Adds two boxes of candles to DEEP (#7851) 2018-12-31 03:06:50 -08:00
Trilbyspaceclone
addea6f21c Adds fans to each white ship hopefully at all doors leading to space! - Requested by Seras/Others (#7862)
* Fixing updater

* Adds fans

* Adds fan

* Update whiteship_meta.dmm

* Update whiteship_delta.dmm
2018-12-31 03:05:39 -08:00
Tupinambis
828b631570 Increased Ash Walker resistances, makes them ash proof. Improves the Base. 2018-12-15 15:33:19 -06:00
nik707
8e8d77d4c4 Merge pull request #7776 from Tupinambis/OmegaTextureFix
Replaces all missing texture turf on Omega Station with sandy plating as was intended.
2018-11-30 21:50:04 -06:00
Tupinambis
861dd61fe9 Adds a mixed closet to Delta Dorms, and a bottle of unstable mutagen to Botany. (#7772) 2018-11-28 19:48:37 -08:00
Tupinambis
18bc815b55 Replaces all missing textures with sandy plating as was intended. 2018-11-28 16:37:02 -06:00
Tupinambis
e45fde5fa0 Ensures the air injectors in toxins and more importantly the SM engine actually function. 2018-11-18 17:01:16 -06:00
deathride58
90776bc4c9 Merge pull request #7721 from Tupinambis/Oldstation
Oldstation but it doesn't lag the server.
2018-11-18 07:38:37 -05:00
Tupinambis
338a98972f Makes the ruin more of a challenge. 2018-11-16 22:34:34 -06:00
deathride58
005d4d45a8 Merge pull request #7717 from Tupinambis/PubbySM
Pubby Engineering has been redesigned with a SM engine.
2018-11-16 23:32:25 -05:00
Tupinambis
bfe8fda260 Makes hivebots more robust. Makes oldstation not have an excessive amount of hivebots. 2018-11-15 20:25:06 -06:00
Tupinambis
addda0398f Tesla died for our sins. 2018-11-11 20:04:22 -06:00
Tupinambis
a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
Tupinambis
4d644153d2 Adds Cryobeds to perma 2018-10-19 20:12:51 -05:00
deathride58
31ba174020 Merge pull request #7630 from Tupinambis/NukeOpsStart
The cooler nuke op base (featuring more air)
2018-10-10 02:03:02 -04:00