Hawk_v3
70711c03e1
Merge remote-tracking branch 'upstream/master'
2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a
Merge pull request #6360 from Ketrai/sharksbranch
...
Adds a new fish, measelsharks!
2019-12-29 15:11:46 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Novacat
f15bb938c6
Merge pull request #6375 from TheFurryFeline/TFF-Fix_Da_Major_Aylium_Ship
...
[Submap] Abandoned Derelict Areas
2019-12-26 23:54:15 -05:00
Heroman
80b32984e8
Hides alarms from gateway destination APCs
2019-12-27 14:17:09 +10:00
TheFurryFeline
635e82b1ef
Abandoned Derelict Areas
...
So.... Missle to an APC wipes power out to the whole damn POI. Fixing that.
Changelog Notes:
- Adds a list of areas for the Abandoned Derelict POI and maps them in.
2019-12-26 21:18:15 -05:00
Ketrai
0e65a0b8a6
Adds sharks
2019-12-22 17:32:49 +01:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
Unknown
bea252546e
Map Fixes
2019-12-06 17:13:37 -05:00
Novacat
e5c7d83aba
Merge pull request #6222 from Novacat/nova-pathfinder
...
Centcom/Tether Ship Changes
2019-12-06 16:06:56 -05:00
Heroman
a8c1da17c6
Fixes snowfield SMES showing up on RCON
2019-11-30 05:26:34 +10:00
Heroman
258281e113
Fixes temperature too
2019-11-28 06:54:30 +10:00
Heroman
84897c0a90
Fixes wrong areas being adjusted
2019-11-28 06:49:14 +10:00
Heroman
4af0b3da48
Fixes snow in snowfield
2019-11-28 04:54:09 +10:00
Hawk_v3
bafec81a0a
Merge Upstream
2019-11-22 23:40:13 +00:00
Unknown
4087263c20
Centcom/Tether Ship Changes
...
- Centcom arrivals changed to south, instead of west.
- Removed outdoor areas from Centcom
- Moved Aronai and Joan's houseboat to admin_use
The goal here was to open up some space at the CentCom Z level for future things down the line, which is why the CC Z level now has a 140x50 chunk of empty space.
In the future (either in this PR, or a future PR) I will be readding an admin ship to the Centcom Z level in that empty space that will functionally serve as the replacement for the old houseboat, as well as using that Z level for other projects.
2019-11-22 12:15:49 -05:00
Unknown
7f87b70c06
Adds the Specops Shuttle Area
2019-11-22 01:58:25 -05:00
Unknown
32795514ff
Should be mostly finished now
2019-11-22 01:18:22 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Unknown
d6a857081a
[WIP] Adds Ninja, Heist, and Keegan's Beach
...
Not finished, still need to add waypoints and proper shuttle consoles.
2019-11-15 20:58:27 -05:00
Novacat
2ee3dcbb27
Merge pull request #6136 from Heroman3003/gateway-faux-fix
...
Switches to an alternative system for gateway map use.
2019-11-15 12:46:55 -05:00
Heroman
a3c037df08
Runs mapmerge
2019-11-14 12:30:52 +10:00
Heroman3003
96fd2bf748
Fixes 3 maps
2019-11-14 12:09:20 +10:00
Heroman
e953a4002b
Attempt at zoo implement
2019-11-14 06:47:37 +10:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Unknown
0f4e946cfe
Compatability
2019-11-01 13:20:37 -04:00
Heroman3003
cfe37161cd
Switches to a different system for gateway map use.
2019-10-30 10:54:27 +10:00
Hawk_v3
c95a447b71
Merge remote-tracking branch 'upstream/master'
2019-10-27 17:58:34 +00:00
Novacat
e5699cdbe6
Merge pull request #6114 from Novacat/nova-basicfixes
...
More DoomP Fixes
2019-10-24 17:56:54 -04:00
Unknown
0f9ead01ef
More DoomP Fixes
...
- Measures taken to prevent the Dark Gygax from wandering
- Turrets now no longer fire on their owners
2019-10-24 17:44:09 -04:00
Hawk_v3
29dd9facf0
Merge remote-tracking branch 'upstream/release'
2019-10-24 21:58:11 +01:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
Rykka
5f4eccf37e
Fix Puzzle Corridor
2019-10-24 14:23:09 -06:00
Novacat
d1e7482ea0
Revert "[DNM] Relocate UD Entrance to SE, fix several POI's"
2019-10-24 16:10:38 -04:00
Novacat
042bc6c544
Merge pull request #6077 from Rykka-Stormheart/shep-dev-v2-pois
...
Aerostat Tweaks
2019-10-24 15:55:22 -04:00
Novacat
58206eeae6
Merge pull request #6111 from Novacat/nova-basicfixes
...
Fixes a few DoomP bugs
2019-10-24 15:43:17 -04:00
Rykka
10ffa30bd6
Run Mapmerge
2019-10-24 13:42:27 -06:00
Novacat
41135a30fd
Update _aerostat.dm
2019-10-24 15:40:17 -04:00
Novacat
36d8c4db9a
Update _aerostat.dm
2019-10-24 15:39:30 -04:00
Rykka
9805a9ad39
Merge remote-tracking branch 'origin/shep-dev-v2-pois' into shep-dev-v2-pois
2019-10-24 13:36:12 -06:00
Rykka
7c663faa86
Fix Aerostat airlock and map changes
2019-10-24 13:35:59 -06:00
Novacat
fc3e983797
Update _aerostat.dm
2019-10-24 15:33:40 -04:00
Novacat
1ce7b22733
Merge pull request #6110 from Rykka-Stormheart/shep-dev-more-UD-tweaks
...
[DNM] Relocate UD Entrance to SE, fix several POI's
2019-10-24 15:26:06 -04:00
Unknown
8b86a293c7
Adds an extra charge to DoomP's reward
2019-10-24 15:21:10 -04:00
Rykka
b56c480276
Fix massive filediff
2019-10-24 13:17:17 -06:00
Rykka
1aa979f09c
Unrevert the revertening
2019-10-24 13:02:29 -06:00
Rykka
928a4f38e7
Revert "Relocate UD Entrance to SE, fix several POI's"
...
This reverts commit 0eca37c658
2019-10-24 13:01:40 -06:00
Unknown
5dfa742e39
Active edge fix maybe?
2019-10-24 14:12:53 -04:00
Rykka
0eca37c658
Relocate UD Entrance to SE, fix several POI's
...
Still having issues with teleporters, will fix next
2019-10-24 12:06:36 -06:00
Unknown
1a0c3a83e6
Expedition Fixes
...
- Removes unnecessary stairs from Virgo 2's Surface
- Swaps many of Virgo 2's POI terrain to Virgo 2 subtype
- Shrinks Doom Patrol POI so that it actually can be picked
- Makes Doom Patrol more difficult, but also increases rewards
- Swaps water on Virgo 2's surface for lava
- Gives all new Virgo 2 POIs their own virgo 2 area so that base turf is set properly.
- Fixes base turf problems with Virgo 4's POIs
- Adds a new Syndicate Beacon subtype, it does not give you objectives.
- Removes spiders from Virgo 2 POIs, replaces with Virgo 2 spawners
- Virgo 2's mobs can actually survive in the atmosphere now
2019-10-24 13:52:22 -04:00
