Commit Graph

955 Commits

Author SHA1 Message Date
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
deathride58
d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87
ports "More variety for dorms bedsheets" + 3 new bed sheets.
2019-07-08 18:06:11 -04:00
Ghommie
9600f66c47 Adding one pAI to the wizard shuttle and ERT prep rooms. 2019-07-07 23:56:35 +02:00
kevinz000
a9738e0790 Merge pull request #8819 from Sishen1542/publiclathe
All maps in rotation now have a public autolathe.
2019-07-07 02:44:32 -07:00
Sishen
e76954455c fixed lathes 2019-07-03 17:21:05 -04:00
Linzolle
84f0554fc1 ai display was on the ground too 2019-07-03 16:02:53 -05:00
Linzolle
52a6201f41 oops 2019-07-01 02:24:12 -05:00
Linzolle
5577014d10 i'm dumb 2019-07-01 02:19:30 -05:00
Linzolle
42a5f4ac9f fixes supply display being on the ground 2019-07-01 01:43:35 -05:00
Sishen
97241cd1e8 jetpacks, take 2 2019-06-29 00:29:49 -04:00
Sishen
8cd14ea48a Update BoxStation.dmm 2019-06-26 15:06:38 -04:00
Sishen
e3af8a1a6b Update BoxStation.dmm 2019-06-26 14:50:48 -04:00
Ghommie
9f0278c34f map merging. 2019-06-24 06:13:42 +02:00
Ghommie
fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00
kevinz000
c9d67ecd49 Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
2019-06-23 06:54:43 -07:00
kevinz000
94d92f7b1b Merge pull request #8664 from BlackMajor/MeMapGood
Adds another space ruin
2019-06-23 06:49:37 -07:00
kevinz000
f34d850d77 Merge pull request #8716 from Sishen1542/pubbyfix
Replaces medical protolathe with medical techfab on Pubbystation.
2019-06-23 06:08:00 -07:00
Trilbyspaceclone
51e4ac0f67 fixes plant disk design and hacked autolathen (#8674)
* fixes plant disk design and hacked autolathen

* Update lavaland_surface_seed_vault.dmm
2019-06-23 05:59:19 -07:00
Ghommie
a2d896351b Sort of porting "Changes the type pathing of some "random" items" 2019-06-23 07:10:11 +02:00
Sishen
054ec6e710 Update PubbyStation.dmm 2019-06-21 21:38:53 -04:00
Ghommie
50dd512be7 Ports system for randomized semi-persistent chem reactions. 2019-06-17 10:50:40 +02:00
BlackMajor
1060bb05b4 Space hermit ruin 2019-06-17 17:41:46 +12:00
kevinz000
27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
2019-06-16 19:40:01 -07:00
kevinz000
d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood
Adds more space ruins.
2019-06-16 19:29:23 -07:00
deathride58
88a8db87c2 Merge pull request #8612 from BlackMajor/Ooga
Makes a small adjustment to the ash walker camp.
2019-06-15 21:29:55 -04:00
BlackMajor
9219a2c813 Adding more ruins 2019-06-15 21:17:34 +12:00
BlackMajor
4528384976 Fuck it lets add way more spiciest PR 2019-06-15 19:03:04 +12:00
BlackMajor
9b01830987 Added fuel tank and welding goggles 2019-06-13 21:37:45 +12:00
BlackMajor
0f8b6f72f8 Get the fuck out step_x/y 2019-06-12 15:08:20 +12:00
BlackMajor
b2c5430f6a Shit's done 2019-06-12 14:46:23 +12:00
BlackMajor
e2ad96f4c9 Made a shitty space ruin robotics lab 2019-06-12 01:21:16 +12:00
BlackMajor
e90fe8faf1 Update lavaland_surface_ash_walker1.dmm 2019-06-10 23:50:09 +12:00
BlackMajor
7523c86071 Wasn't I supposed to do this in January 2019-06-10 22:55:38 +12:00
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
Trilbyspaceclone
c0d1ac5bd3 Update originalcontent.dmm 2019-06-07 18:42:23 -04: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