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
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
f29336a4f8
Merge pull request #13470 from AnturK/academytwo
...
Academy Fixes & Upgrades.
2015-12-08 22:25:05 -06: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
e91a53760d
Swaps Teacher Room Airlock for wooden
...
Makes Teacher Room APC start with Enviroment channel turned on
2015-12-06 14:14:01 +01:00
82a7763e67
Academy Fixes & Upgrades.
2015-12-05 23:57:42 +01:00
896d682e27
Removes station collision
...
Removes station collision
2015-12-04 17:47:02 -06:00
31b1099874
Removes example.dmm
2015-12-04 17:10:14 -06:00
2624e23b95
mergefix
2015-12-04 16:20:21 -05:00
f97ca7f7c8
im good at what i do
2015-12-04 15:37:53 -05:00
b5dcce5fc1
Merge pull request #13416 from Razharas/InjectFix
...
Fixes injector in incinerator on box
2015-12-04 11:11:46 -03:00
7eab9a3f76
so smooth it burns
2015-12-03 16:12:56 -05:00
113298ba1c
so smooth it burns
2015-12-03 16:05:46 -05:00
c66c206db3
Fixes injector in incinerator on box
2015-12-03 16:41:55 +03:00
6b0976afcb
updates caves.dm to use the actual basalt asteroid flooring, removes plating variant.
2015-12-03 01:00:43 -05:00
11c26fb328
updates to use real basalt tiles, removes the shitty plating ones
2015-12-03 00:57:21 -05:00
e1fe9bb0e5
Merge pull request #13360 from Strathcona/SlimeKiller
...
Modifies the Xeno Kill Chamber to use cold air instead of vacuum [Box]
2015-12-02 17:16:18 -06:00
0eee27ef16
Merge conflict fixed please
2015-12-02 09:35:40 -05:00
da5b7dc818
i hate dreamstation04.dmm
...
Signed-off-by: Swankcookie
2015-12-01 22:02:32 -06:00
3e5e9086c0
fix
2015-12-01 21:52:35 -06:00
d616885241
Merge pull request #13338 from Incoming5643/tis_the_season_for_horrible_manual_placement
...
[Touching all the maps oh god] The reason for the season
2015-12-01 15:15:49 -06:00
ff58f4b5d3
Adds a single xmas tree to bird and mini
2015-11-30 23:17:38 -05:00
c9ee58c120
Merge pull request #13253 from SuperSayu/abstract_holodeck
...
Holodeck Fixes
2015-11-30 21:26:52 -06:00
16303c1c1f
Changes flag name from ABSTRACT to NODECONSTRUCT
...
Removes holo-tables and holo-windows since those typepaths are no longer needed.
Updates Z2 to reflect this. Removes spurious tag tags in Z2.
2015-11-30 20:26:03 -05:00
7c86c0667c
Merge pull request #13316 from KorPhaeron/listening_post
...
Moves Listening Post to Z6, removes it as an away mission
2015-11-30 20:14:14 -05:00
b2ebbdad3a
somehow it happened twice. This never happened before I swear it
2015-11-30 17:37:14 -05:00
3492252afb
somehow a step_x/step_y got in with a tree, weird. Would have been symptomless since they were both 0 but hey, good catch grepper.
2015-11-30 17:13:28 -05:00
591e3dceb5
Adds christmas stuff to asteroid, disc, dream, meta, and box.
...
This means two xmas trees per map, one in/near the bar and the other in/near the chapel. There's also a festivus pole in/near the RD's office. In a few cases a clearing of space in the bar came at the expense of a few chairs, tables, but if there were anything on said tables they've been moved to empty tables nearby.
Also adds a christmas tree to the centcom disembark (thank god that's generic now) and the magic robe compatible santa hat/suit to the wizards den.
Couldn't figure out how to edit bird/mini without it throwing telecomm exceptions at me due to them having special versions of those systems, so no christmas for them this year. There's not much in the way of room anyways.
2015-11-30 16:51:13 -05:00
4f38906dd5
Merge pull request #13311 from KorPhaeron/wild_west
...
Fixes wild west windows
2015-11-30 07:12:05 -06:00
0a4dca7a94
Moves listening post to Z6
2015-11-29 10:42:05 -06:00
6145b9c24f
Revert "Removes listening post as an away mission, adds it to Z6"
...
This reverts commit cbd70ee3ec
2015-11-29 10:35:36 -06:00
cbd70ee3ec
Removes listening post as an away mission, adds it to Z6
2015-11-29 10:34:49 -06:00
38eddb1421
Merge pull request #13179 from AnturK/academy
...
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00
d3d151e380
Fixes windows
2015-11-29 01:54:53 -06:00
a84f2752d6
Merge pull request #13264 from MMMiracles/hologayble
...
fixes the holotable path on stationcollison.dmm
2015-11-28 21:06:28 -06:00
e6ea5b3b5d
This should fix dreamstation, at least I hope it does because if it doesn't I'm fucked.
2015-11-28 15:29:55 -05:00
74a4227d0e
Academy Update Part Two
2015-11-28 18:15:31 +01:00
b14e9133d2
Academy Update
2015-11-28 12:35:41 +01:00
5f4b7b3684
fixes the holotable path
2015-11-27 17:49:31 -05:00
ef122af446
i uh, shit
2015-11-27 16:21:16 -05:00
70265228b6
Should fix conflicts
2015-11-27 16:19:52 -05:00
f55246e5c0
Merge pull request #12987 from AnturK/turrets
...
Removes gun_turret type and makes turret controls buildable
2015-11-27 20:52:59 +00:00
fdede51a09
Merge pull request #12954 from MMMiracles/spookycaves
...
New Away Mission: Caves
2015-11-27 20:11:26 +00:00
54bc865502
Expands Dreamstation maintenance to have more rooms to shove corpses into and do antaggy shit in.
...
Also moves the singularity generator object out of the PA's line of fire, so it's slightly harder to set up. The reason for this should be abundantly clear.
2015-11-27 15:04:00 -05:00
da0ba3659f
Merge pull request #13239 from AnturK/animalbots
...
Simple Animal Bots - Beepsky strikes back.
2015-11-27 17:37:59 +01:00
5f5d8bca95
did you know this is the final change? no.
2015-11-27 01:01:43 -05:00
Cheridan
bgobandit
KorPhaeron
duncathan salt
WJohn
AnturK
MMMiracles
Aranclanos
Razharas
Strathcona
swankcookie
Incoming
Vincent
WJohn
Jordie
Nerd Lord
Remie Richards
phil235