d57d059b8b
makes asteroids more child-friendly
2015-12-22 19:32:27 -05:00
1c1e892ddf
New Away Mission: Research Facility
2015-12-22 17:34:04 -05:00
afe3cdb8ab
Z6 fixes
2015-12-22 07:51:59 -06:00
4599739ab7
Z2 Fixes
2015-12-22 07:51:35 -06:00
39813b88ce
Asteroid station fixes
2015-12-22 01:34:49 -06:00
e896742472
Merge pull request #13825 from MMMiracles/mapedits
...
Map Edits (snowdin, caves, z2, academy, ministation)
2015-12-21 15:45:12 -03:00
58b1e007d1
///////
2015-12-21 13:21:35 -05:00
276c179b07
Merge pull request #13826 from AndrewJacksonThe2nd/tesla_engine_map_changes
...
Puts Tesla engine on the map, tesla gen and singulo gen are equal
2015-12-21 19:25:35 +11:00
5f257aa8fe
Admins with +DEBUG can now Load map files in the _map/templates folder where they (or their ghost) is standing.
2015-12-20 21:21:33 +00:00
67a72501fe
Puts the singulo gen on the platform next to the tesla gen, equal opportunities
2015-12-19 19:51:52 -08:00
012d3d2f7a
miniminiministation
2015-12-19 22:49:53 -05:00
8758ca1a72
various map edits
2015-12-19 22:27:40 -05:00
c0870c1fe5
Maps tesla into all 4 maps that used Singularity engine except Dream.
2015-12-19 19:04:47 -08:00
c236ce0c6a
Replaces the Singularity Engine on Dreamstation with a Tesla Engine
...
Yup, a tesla engine.
2015-12-19 21:51:07 -05:00
9a8e604738
Merge pull request #13773 from KorPhaeron/cheridan_in_space
...
Black Market Ship moved to Z6
2015-12-19 11:54:23 -06:00
5201b77495
Random Ruins
2015-12-19 06:55:50 -06:00
5e7219e373
Merge pull request #13766 from KorPhaeron/meta_update
...
Updates/fixes for Metastation
2015-12-19 07:54:33 -05:00
2b7f89bafa
Merge pull request #13765 from KorPhaeron/into_the_trash
...
Removes space hotel
2015-12-19 07:54:20 -05:00
400c60681f
Merge pull request #13764 from KorPhaeron/box_fix
...
Boxstation fixes
2015-12-19 07:54:05 -05:00
c7dde204fb
Black Market
2015-12-18 12:56:55 -06:00
1dc9a004fd
Metastation
2015-12-18 03:57:47 -06:00
39c9067e94
Removes space hotel
2015-12-18 03:26:09 -06:00
16001f459a
Box fixes
2015-12-18 03:15:44 -06:00
8de9b99182
Deepstrike 2
2015-12-17 23:22:37 -06:00
b6366d82fa
Merge pull request #13318 from MMMiracles/snowiscold
...
New Away Mission: Snow Valley+snow atmos
2015-12-16 21:01:07 -03:00
a996b056e6
Merge pull request #13525 from KorPhaeron/chest_high_walls
...
More sec barricade changes/general cover changes
2015-12-16 20:39:37 -03:00
d2d78c5e2c
Merge pull request #13574 from Strathcona/MiningMap
...
Makes the Mining Asteroid Spikier
2015-12-16 14:34:53 -03:00
cde4df61ae
conFLICTS
2015-12-16 06:26:54 -05:00
55ebaf3bdb
snow stuff i guess
2015-12-15 17:33:34 -05:00
392ca2a505
Merge branch 'master' of https://github.com/tgstation/-tg-station into snowiscold
2015-12-15 16:54:22 -05:00
4ceabf8d06
Old mining station re-added
2015-12-14 21:16:34 -05:00
2c63aa5d94
git -reset --hard is your friend
2015-12-14 09:50:22 -05:00
82aad54c80
step what are you doing there I didn't even touch you
2015-12-14 03:02:49 -05:00
51ef838b0b
Bugfix and a bit of flavor
...
Moves the nuke team spawn area a bit away from the shuttle to solve #12766
Gives the nuke ops a nuclear fission explosive toy
Creates a hidden nuke op memorial easter egg with the extra space created by the move
2015-12-14 02:55:31 -05:00
ff2bc4d022
Merge pull request #13529 from KorPhaeron/tele_ops
...
Ops can't fly to abandoned satellite or derelict
2015-12-13 20:58:40 -06:00
b3d992a832
conflict fix
2015-12-11 16:21:18 -05:00
d61d655076
oh my
2015-12-10 23:14:42 -05:00
3d1593b49f
edits the map
2015-12-10 19:32:12 -05:00
51c16dfa7f
Merge pull request #13510 from WJohn/awaymissionfixesdeux
...
Fixes science lockers in MO19, adds a few real xeno eggs to queen chamber in nest.
2015-12-10 00:00:18 -06:00
db8d3f7857
Ops can't fly to Z3 or Z4
2015-12-09 13:12:03 -06:00
25c86f316d
Barricade changes
2015-12-09 12:06:41 -06:00
cb2b81f80c
thats not suppose to be there
2015-12-08 23:43:59 -05:00
f29336a4f8
Merge pull request #13470 from AnturK/academytwo
...
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06:00
f222dfe36e
mostly final changes, wowzers
2015-12-08 21:20:31 -05:00
0a99776616
Merge pull request #13456 from KorPhaeron/remove_sc
...
Removes station collision from away missions
2015-12-08 11:45:37 -06:00
8efbc0930b
Merge pull request #13453 from KorPhaeron/remove_example
...
Removes example.dmm from away missions
2015-12-08 11:45:21 -06:00
e4b4800aab
Fixes science lockers, adds real eggs to queen chamber in alien hive.
2015-12-08 06:50:00 -05:00
c384aae4c3
more map edits, loot table balancing, bug fixes, also ATV VROOM VROOM
2015-12-08 00:43:53 -05:00
db0f325e10
woops
2015-12-06 14:34:09 -05:00
81f6c450e5
fianl stuff for now, testing!!!!!
2015-12-06 14:32:10 -05:00
MMMiracles
KorPhaeron
tkdrg
Jordie
Remie Richards
AndrewJacksonThe2nd
Nerd Lord
Cheridan
WJohn
KorPhaeron
Strathcona
Incoming5643
Incoming
bgobandit
duncathan salt
WJohn