Commit Graph

8162 Commits

Author SHA1 Message Date
Razgriz
a72d1bf3d1 Merge pull request #597 from CHOMPStationBot/upstream-merge-9142
[MIRROR] Add more gas to the fuel depot
2020-10-15 22:39:40 -07:00
Novacat
9f8503fa55 Merge pull request #9142 from Meghan-Rossi/fueldepotfix
Add more gas to the fuel depot
2020-10-15 05:26:47 -07:00
Novacat
a4e9519b0e Merge pull request #9186 from Heroman3003/mapfix3
Fixes double chair
2020-10-15 05:26:29 -07:00
Erik
442b51117d Removes loss POI, gnome, pufferfish and ack 2020-10-08 17:55:03 -07:00
Cadyn
35e799d895 Even more fixy wixies uwu~ 2020-10-05 20:27:14 -07:00
Cadyn
65a58b1841 More fixy wixies 2020-10-05 20:15:22 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Novacat
7b44df4701 Merge pull request #9142 from Meghan-Rossi/fueldepotfix
Add more gas to the fuel depot
2020-10-05 02:16:22 -04:00
Kassc Zeravla
9be893e0a2 Edits
Minor edits on lighting.
Everything should work now~
2020-09-30 20:11:20 -04:00
Kassc Zeravla
bc212c1579 noneuclidean portals
-SC2
*Added a missing table on Chemistry
-SC10, SC6, SC5.
*Added non-euclidean portals to make transition between outpost, caverns and wilderness smooth if not seamless.
-POI Spatial_anomaly.dmm
*Removed blocks that prevent entry to this POI for testing, apparently there is a chance to crash a players client if they ghost over the POI or access the POI with masons/material scanner/x-ray.
I can't seem to crash my own client from this so I will like to get some crash reports from players.
2020-09-29 20:34:31 -04:00
Killian
b18011d6ee Update talon1.dmm 2020-09-29 17:06:49 +01:00
Killian
5b46678b27 Update talon1.dmm 2020-09-29 16:57:53 +01:00
Killian
a639f767c9 talon cleanup/tweaks 2020-09-29 16:47:48 +01:00
Meghan-Rossi
2b6e23bd55 Add more gas to the fuel depot
fixes https://github.com/VOREStation/VOREStation/issues/8830
2020-09-28 18:59:24 +01:00
Novacat
1e396dbf98 Merge pull request #9107 from KillianKirilenko/kk-grubs
Oregrubs
2020-09-28 03:30:44 -04:00
ShadowLarkens
e86c171b37 Fix roundstart location for Site Manager 2020-09-27 15:16:56 -07:00
Killian
6eb808c127 adjust spawn weights 2020-09-27 22:41:04 +01:00
Novacat
e8f7b01ea4 Merge branch 'master' into kk-adminships 2020-09-27 17:02:08 -04:00
Novacat
7561a5cfd6 Merge pull request #8926 from KillianKirilenko/kk-ships
Additional Ships
2020-09-27 17:01:12 -04:00
Razgriz
8ca7798d04 Map tweaks for refactored object pathnames 2020-09-26 15:56:04 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Killian
8c588d5eb6 lootgrubs 2020-09-25 16:02:56 +01:00
Killian
498debf5d3 new crate spawner
adds a new spawner that can spawn a random empty crate, a random crate with loot, or sometimes just nothing.
2020-09-22 12:23:28 +01:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale
NanoUI Goes To Brazil
2020-09-21 14:13:16 -04:00
Killian
4686f8f1cd Merge remote-tracking branch 'upstream/master' into kk-ships 2020-09-20 11:29:29 +01:00
Killian
0aee454db0 ceilings, minor tweaks 2020-09-20 11:27:37 +01:00
ShadowLarkens
23abb48e40 Fix stray nano_module missed in camera conversion 2020-09-19 20:55:21 -07:00
Killian
8198f012d4 wrecked cargogeck for debris field, new decals for movable mack walls 2020-09-20 00:37:58 +01:00
Atermonera
4596d32da1 Makes demonpool loot piles actual loot piles. (#7663) 2020-09-18 23:32:21 -04:00
Novacat
f16b10c033 Merge pull request #8959 from VictorZisthus/OSHApass
Talon and Tether OSHA Pass
2020-09-17 09:39:03 -04:00
Killian
d60f1321b7 Merge remote-tracking branch 'upstream/master' into kk-ships 2020-09-16 10:24:30 +01:00
izac112
bd98fac0f5 Update cryogaia-06-upper.dmm 2020-09-16 01:10:14 +02:00
izac112
fa61b3d501 adds rms to workshop 2020-09-16 00:45:53 +02:00
izac112
9d8f2623de More thingus 2020-09-14 14:09:52 +02:00
izac112
948ca4ad21 Area thingy 2020-09-14 13:15:03 +02:00
izac112
5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Killian
a37c7db48b various adjustments and updates 2020-09-12 15:57:06 +01:00
Novacat
f260261325 Merge pull request #8558 from SweetBlueSylveon/Gutteroffsite
Guttersite under construction
2020-09-12 10:33:25 -04:00
izac112
454bcc02d6 Removes unsued areas and applies strongdmm sanitation. 2020-09-11 17:35:45 +02:00
Cadyn
92a14619b1 General map tweaks.
CD gets cycler and windoor for suit. Pilot perms added to explo doors and gun lockers.
2020-09-10 15:41:21 -07:00
Nadyr
74d85a194b Merge pull request #529 from ExabyteDiscord/dog-does-airlocks
Clear Skies Ahead!
2020-09-10 17:52:34 -04:00
Erik
d56631d73b Fixes access, adds catalogues 2020-09-09 07:58:03 -07:00
Killian
f2e0d9fbb5 mercenary cruiser 2020-09-09 13:03:03 +01:00
Killian
ac1896f712 sanitized vars, added rechargers, replaced some internal walls 2020-09-09 07:37:20 +01:00
Victor Zisthus
29b0ebfa49 A couple more botany things
Added 5 sandstone bricks and an empty utility belt to each botonast locker.
2020-09-09 01:05:19 -04:00
Victor Zisthus
2fb70103a0 Mapmerge 2020-09-08 20:47:48 -04:00
Victor Zisthus
25afb1dbd0 Minor Hydro edits
Added cardboard and plastic to the service disposal/shipping lanes so crates and boxes can be made.

Added spades to the Hydro lockers. Added plant analyzers for Farmbots.
2020-09-08 20:47:11 -04:00
Killian
e29c434c87 almost done, aaaa 2020-09-08 13:00:41 +01:00
Killian
c98a6f8c58 assorted polish & tweaks
decals galore, shield config document, etc.
2020-09-08 08:14:56 +01:00