5e7219e373
Merge pull request #13766 from KorPhaeron/meta_update
...
Updates/fixes for Metastation
2015-12-19 07:54:33 -05:00
400c60681f
Merge pull request #13764 from KorPhaeron/box_fix
...
Boxstation fixes
2015-12-19 07:54:05 -05:00
1dc9a004fd
Metastation
2015-12-18 03:57:47 -06:00
16001f459a
Box fixes
2015-12-18 03:15:44 -06:00
8de9b99182
Deepstrike 2
2015-12-17 23:22:37 -06: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
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
3d1593b49f
edits the map
2015-12-10 19:32:12 -05: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
c66c206db3
Fixes injector in incinerator on box
2015-12-03 16:41:55 +03: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
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
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
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
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
762568255d
Merge pull request #13102 from bgobandit/newmininggear
...
Various mining additions, fixes, nerfs and buffs (ready for review/merge).
2015-11-26 18:11:26 -06:00
235649c4c6
Map Changes - 2.0
2015-11-26 22:16:44 +01:00
e596033153
Merge pull request #13133 from Strathcona/DiscStationRefresh
...
DiscStation Cargo Update + stuff
2015-11-26 09:41:24 -06:00
a02dfe95d0
New Pods
2015-11-25 13:41:37 -05:00
d8807c6d01
Merge remote-tracking branch 'tgstation/master' into DiscStationRefresh
2015-11-25 09:59:48 -05:00
7ead90f24b
Map Changes 3.0
2015-11-25 14:46:16 +01:00
f3df3379ed
Adds pod consoles to dreamstation.
...
Also adds a maint room by escape for antags, thank me later.
2015-11-24 20:00:28 -05:00
c04d80f5be
Fixes
2015-11-24 08:37:47 -06:00
defc1ca2e9
Early pod launch
2015-11-23 17:45:35 -06:00
51868abf62
Fire Safety
...
added a bunch more fire extinguishers
2015-11-21 13:21:26 -05:00
a9655af5a7
Missed a few Cameras
2015-11-20 10:09:48 -05:00
6adb378e75
DiscStation Cargo Update + stuff
2015-11-20 08:58:01 -05:00
b8248f0b14
Merge pull request #13105 from Tokiko1/birdstationupdate5
...
Birdstation update #5 mining
2015-11-19 21:03:59 -06:00
WJohn
KorPhaeron
KorPhaeron
tkdrg
Strathcona
Incoming5643
Incoming
Cheridan
bgobandit
Razharas
swankcookie
duncathan salt
Vincent
Nerd Lord
Remie Richards
phil235
AnturK