Commit Graph

272 Commits

Author SHA1 Message Date
Ghommie
19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
kevinz000
5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292
Fixing deep space gorilla runtimes, how ape...
2019-11-03 06:20:06 -07:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
Ghommie
9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
kevinz000
455a9922ff Merge pull request #9600 from Trilbyspaceclone/patch-233
Adds two cotten seeds to ash walker home
2019-10-27 16:09:39 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54
ports in the Hilbert's Hotel.
2019-10-24 19:07:33 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw
Adds posibrains to the spawners menu for ghosts.
2019-10-24 18:45:57 -07:00
Trilbyspaceclone
841f9ae878 Update lavaland_surface_ash_walker1.dmm 2019-10-24 10:05:26 -04:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
Ghommie
31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-10-06 21:54:15 +02:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kevinz000
09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice
RCDs can be upgraded to create computer/machine frames, moved deconstruction to the upgrade tier
2019-09-07 11:35:09 -07:00
Ghommie
f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-24 12:52:16 +02:00
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
BlackMajor
1d22b77293 Merge pull request #8636 from Trilbyspaceclone/lighten_up
Fixes missing air in Gas the Lizards in the freezer/surgery
2019-08-19 20:02:26 +12:00
Sishen
3281f23eb6 made changes as per bhijns request 2019-08-14 16:30:54 -04:00
Sishen
0693f27010 Update lavaland_surface_ash_walker1.dmm 2019-08-09 03:43:55 -04:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00
Ghommie
23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-08-08 04:46:54 +02:00
kevinz000
aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee
Abductor Replication Lab space ruin - take 2
2019-08-05 00:55:40 -07:00
Poojawa
dcbcf704da I accidentally all the maps. whoops 2019-08-04 06:27:28 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
72413c893f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-27 01:38:20 +02:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
Ghommie
28d3747c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-24 16:55:10 +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
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
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
Ghommie
a055f12394 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-06-16 12:41:06 +02:00
Ghommie
ba3a2c00bb ports in the Hilbert's Hotel. 2019-06-16 10:50:59 +02: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
TrilbySpaseClone
8be37e0494 Update gasthelizards.dmm 2019-06-12 18:50:52 -04: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
Poojawa
1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-06-03 05:35:52 -05:00