Commit Graph

455 Commits

Author SHA1 Message Date
Lin
d7cbb017f6 Fix few instances of bleeding white blood (#15398)
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
2022-01-09 17:23:48 +01:00
Chayse Ramsay
d1611ddf42 Lavaland ruin rad storm fix (#15242)
* Lavaland rad storm fix

* whoops

* double whoops

* Update Lavaland.dmm
2021-10-06 17:28:29 +02:00
zeroisthebiggay
41169d4366 helter skelter fixes so it doesn't break comms and does not come with a fucking uplink (#15210)
* .

* .
2021-09-27 17:49:01 +02:00
Emily
04284f8025 Un-Spaces the Library and also removes some leftover snow. 2021-09-02 20:11:49 +02:00
Artur
772bfaba75 line ending fuckery 2021-08-03 00:59:48 +03:00
silicons
c5438c73be Merge pull request #14879 from WanderingFox95/WanderingFox95-IcemoonRuinsOnLavaland
[Review/Testmerge] Icemoon Ruins but on Lavaland!
2021-07-29 22:39:42 -07:00
MrJWhit
26b186d24f Update engine_am.dmm 2021-07-06 16:29:45 -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
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
WanderingFox95
74ae090f8f Now it shouldn't spawn plating around the shack.
kinda ruins the immersion.
2021-06-23 03:14:16 +02:00
WanderingFox95
2f801dd9a3 Not needed. Was just big and empty anyway. 2021-06-22 17:18:02 +02:00
WanderingFox95
f15a1d551c Miner in the mining site, no more underground needed. 2021-06-22 17:17:28 +02:00
WanderingFox95
130d617842 I missed two frozen tiles, woops. 2021-06-21 17:27:58 +02:00
WanderingFox95
0a136d9669 Adds safe ruins as lavaland ruins. 2021-06-21 16:38:41 +02:00
zerothebigboy
e0a311435b thetwentysecondofmany 2021-06-11 20:53:35 -04:00
MrJWhit
fe9fdf0975 Update lavaland_surface_alien_nest.dmm 2021-06-01 11:26:46 -04:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
silicons
5910950a49 Merge pull request #14473 from ItzGabby/bark-box
Bark Box Remastered Edition
2021-03-22 21:15:14 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
ItzGabby
7121295935 finalfix??? 2021-03-19 03:08:10 -04:00
LetterN
2fe6125955 fixes this map 2021-03-15 22:16:49 +08:00
LetterN
a478555dbd mapfix 2021-03-15 21:02:50 +08:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Letter N
69a054826b add art areas on meta, and adds lapvend on box,delta,meta.
Other map changes are cosmetic.
2021-03-10 16:34:37 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Letter N
b3bfeb9858 it does not exist 2021-02-16 20:42:42 +08:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
silicons
efecc1804b Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
2021-01-25 22:59:09 -07:00
Hatterhat
95db018de8 itt: i dont test my code again 2021-01-20 18:34:57 -06:00
silicons
66874fe252 Merge pull request #14083 from shellspeed1/alternative-xeno-hive
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
2021-01-20 15:22:06 -07:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
Putnam3145
f7f9185073 Merge pull request #13826 from LetterN/semi-sync
/tg/ ""hardsync"" part one of many*
2021-01-19 17:22:05 -08:00
shellspeed1
450937a8f3 Update lavaland_surface_alien_nest.dmm 2021-01-18 15:27:40 -08:00
MrJWhit
4f49dab040 Update Mining_Station_Public_01.dmm 2021-01-18 01:57:05 -05:00
shellspeed1
bbd3fd54ba fixed map alteration I think 2021-01-17 19:44:18 -08:00
shellspeed1
eabecb1618 Revert "Reworks lavaland xeno ruin a bit"
This reverts commit e8e92cb805.
2021-01-17 18:07:48 -08:00
shellspeed1
e8e92cb805 Reworks lavaland xeno ruin a bit 2021-01-17 18:01:38 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
MrJWhit
abffac67b2 Port'n 2021-01-06 03:16:08 -05:00
Letter N
64f9605b51 map conflict any% 2021-01-02 19:56:04 +08:00
Letter N
d82def21b8 linter shoo 2020-12-29 12:32:10 +08:00
The0bserver
4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
The0bserver
5e9e984fd0 a few more crumbs we missed. Travis might be happy now. 2020-11-20 18:45:32 -05:00
The0bserver
902cb94ee7 Whoo, we almost forgot this one. 2020-11-20 05:19:54 -05:00
The0bserver
6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841
Here I fix a few issues.
2020-10-28 07:53:22 -07:00