Commit Graph
16 Commits
Author SHA1 Message Date
Arokha Sieyes 6c686e6a2f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
# Conflicts:
#	README.md
#	code/game/jobs/job/job.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/carbon/human/npcs.dm
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/Academy.dmm
#	maps/RandomZLevels/beach.dmm
#	maps/RandomZLevels/blackmarketpackers.dmm
#	maps/RandomZLevels/challenge.dmm
#	maps/RandomZLevels/example.dmm
#	maps/RandomZLevels/jungle.dmm
#	maps/RandomZLevels/listeningpost.dmm
#	maps/RandomZLevels/spacebattle.dmm
#	maps/RandomZLevels/stationCollision.dmm
#	maps/RandomZLevels/wildwest.dmm
#	maps/RandomZLevels/zresearchlabs.dmm
#	maps/northern_star/polaris-1.dmm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
#	maps/submaps/surface_submaps/plains/Boathouse.dmm
#	maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
#	maps/submaps/surface_submaps/wilderness/Boombase.dmm
#	maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
#	maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
#	maps/submaps/surface_submaps/wilderness/Drugden.dmm
#	maps/submaps/surface_submaps/wilderness/Rockybase.dmm
#	maps/submaps/surface_submaps/wilderness/Shack1.dmm
#	maps/virgo/virgo-6.dmm
#	vorestation.dme
2018-04-25 17:23:33 -04:00
Arokha Sieyes f0779da58d Stage 2 tag removal 2018-04-18 17:37:41 -04:00
Arokha Sieyes 238ce2c8d0 VS: Get rid of beach, move wild stuff 2018-01-27 14:10:53 -05:00
Spades d5bcce1806 Resized Beach.dmm 2017-06-26 22:50:49 -04:00
Spades b82e8c12d5 Various updates and small fixes
Map updates, gateway tweak, and a few fixes for some mobs that were
behaving stupidly.
2017-04-09 17:54:09 -04:00
SpadesandGitHub 4db23be7e3 Reactivates Away Gate (#528)
* Added stomach.ogg and stomach tiles for later

* Updated some gateway maps, added new (unfinished) one

* Snowfield progress

* This map is pretty much done!

* Return of the Gateway Maps

* Optimization of various shit.

* Copies a small fix from Polaris

https://github.com/PolarisSS13/Polaris/pull/2414

* Changed vore mob knockdown chance. Map fixes.

* Datraen corrects outstanding issues with away missions, separates certain parts of code into their own procs. (#532)

* Final commit.

- Tried to fix vore mobs not attacking prey once they are disabled.
- Various map fixes to be consistent with fixed gateway setup.
- Gave Markov bad grammar.
- Fixed polar bears not dying.
- Modernized all gateway maps except the clown temple which is still
broken.
2016-09-06 13:36:04 -04:00
Spades 02ba44aa02 Beach.dmm fixes
Map is bigger and the forest spawns now.
2016-05-21 16:32:37 -04:00
Spades 11e9eda4f4 Numerous tweaks and fixes.
- Fixed the teleporter room being labeled wrong. Now "Long-Range
Teleporter". Resolves #136
- Beach now has clutter. Resolves #141
- Beach now has borders. Resolves #142 but creates a new problem by
making the map too small. I'll fix this later.
2016-05-21 13:38:49 -04:00
Spades a720f65110 Simulated terrain should not be used here.
Replaced simulated terrain on beach.dmm
2016-05-21 12:50:05 -04:00
Leshana 2cd88ab4ca Issue #23 - Fixed the Gateway
* Ported gateway compatibilty with runtime z-level loading from old codebase.
* Built a new Gateway room next to EVA on the map.
* Fixed the beach level to not crash.
2016-05-16 00:00:51 -04:00
Leshana a23ef0c9c2 Help Issue #23 by making the beach map loadable. 2016-05-15 16:04:40 -04:00
Arokha Sieyes bb1470955a Have some gateway maps 2016-05-15 14:44:48 -04:00
SkyMarshal 9591c3773e Maploader improvements: Now skips space tiles, properly parses lists, commented and cleaned up.
beach.dmm is now unescapable.
Fixes #3114
2013-06-21 20:14:11 -07:00
Kortgstation@gmail.com 63f7a3ab30 Put the sandals in beach.dmm in crates.
Fixed the plasma walls to use the new types in spacebattle.dmm, as well as removed a shitty spawn point and replacing some misnamed crates. Also added some bananium.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5086 316c924e-a436-60f5-8080-3fe189b3f50e
2012-11-16 10:32:10 +00:00
Kortgstation@gmail.com 863ce4826a The booze vendor on the beach map starts emagged so you don't need to be a bartender to use it.
Deleted an extra airlock in the spacebattle map, made the kitchen/bathroom nicer

Fixed the lighting in the gateway room on the station map

Gave the melee syndies nopush so you can't just dash through mobs of them forever. They're slightly faster as well (though still slower than a maxspeed human).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4928 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-21 06:01:31 +00:00
Kortgstation@gmail.com 4bb0e22624 Fixed palm trees. You can no longer shove them around, and you'll no longer appear standing over the top half of them.
Ticked Academy.dm so the Academy map can actually be played.

Removed desert.dmm and assistantChamber.dmm as they were both unfinished/terrible. One was literally just a z level of sand and bears, the other was a tiny room full of turrets. Neither even had gates.

Added a small, simple beach map and a new area for it (with tanning re-added). Just a place for the crew to relax. Nothing dangerous, nothing notable loot wise.

Updated the away mission fileList.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-17 05:12:39 +00:00