Commit Graph

437 Commits

Author SHA1 Message Date
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
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
MrJWhit
65fa7e72bf Removing fire locker and adding a maint spawner instead 2020-10-22 18:52:16 -04:00
MrJWhit
504447f3ae Space Hermit buff 2020-10-22 15:23:33 -04:00
EmeraldSundisk
ec45402192 Add files via upload 2020-10-03 13:32:02 -07:00
EmeraldSundisk
1bf6ca9181 Update skelter.dmm 2020-10-02 14:46:37 -07:00
EmeraldSundisk
f310e940d1 Add files via upload 2020-09-30 14:52:58 -07:00
EmeraldSundisk
d7e9f39667 pixel fix 2020-09-30 12:43:18 -07:00
EmeraldSundisk
d2ae67aeea Add files via upload 2020-09-29 14:25:00 -07:00
EmeraldSundisk
ff1094b33b Create skelter.dmm 2020-09-29 14:10:20 -07:00
MrJWhit
dc61b0fbd7 Captain Plasma -> Mumkey Jones 2020-08-19 23:25:27 -04:00
MrJWhit
92a664bb68 Update engine_teg.dmm 2020-08-18 04:32:47 -04:00
MrJWhit
5adb1c75d5 Update engine_teg.dmm 2020-08-18 03:45:37 -04:00
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
Letter N
186482ecef map fix 2020-08-09 19:50:45 +08:00
dapnee
cb17ea4874 More Active Turf Fixes
None of these nerds make their map names logically and it's hard to find which is which wihout going through a hundred of them.
2020-08-04 12:16:29 -06:00
Lin
0c85e3f127 Merge pull request #12989 from dapnee/why-is-box-even-fucked-like-this,-smh
You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
2020-08-02 12:50:34 -05:00
dapnee
825ac6124b missed a tile
oopsy
2020-07-31 16:29:25 -06:00
dapnee
e197cb44b2 You Thought I Was Done Fucking With Box BUT YOU WERE WRONG!
Fixed active turfs from plating that sat in space, removed random catwalk to nowhere, turned the medical console in the sleeper room to not face a window, FIXED MAINTENANCE BAR APC NOT ACTUALLY BEING FOR THE MAINTENANCE BAR. As well as fixed the xeno hive ruin on lavaland from having active turfs.
2020-07-31 15:37:40 -06:00