Commit Graph

210 Commits

Author SHA1 Message Date
c0 a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
AnturK 5edc60ed0a Unifies corpse spawners 2016-02-25 18:36:16 +01:00
Steelpoint 2a7a9ed462 MergeConflict+NewStuff 2016-02-21 20:34:04 +08:00
Steelpoint 7963dd154b Merge branch 'master' of https://github.com/tgstation/-tg-station into SyndiShip
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-02-19 01:37:29 +08:00
Steelpoint e799a82e2f FirstFix 2016-02-19 01:30:43 +08:00
AnturK ba750e34e9 Repaths 2016-02-18 17:56:43 +01:00
Buggy123 b8b7ecb290 Added barricades to the old smelter on the asteroid. 2016-02-13 23:42:23 -05:00
Lzimann be1e628589 Fixes artifact rooms spawning in the syndicate listening outpost 2016-02-08 16:17:29 -02:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard 9386602acf tgui cargo console
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
Incoming 98468506a1 The groundhog didn't see his shadow today, so it looks like Christmas will end six weeks early this year. 2016-02-03 02:08:33 -05:00
KorPhaeron 15b713e1be Cayenne is a proper carp 2016-01-30 22:09:42 -06:00
KorPhaeron acc213e602 Fixes CTF Area 2016-01-26 02:40:08 -06:00
duncathan salt 8fd2393dd7 Merge pull request #14890 from KorPhaeron/capture_the_flag_revival
Adds capture the flag to Z2
2016-01-26 00:34:17 -06:00
Bjorn Neergaard 68e1269ea7 Repath thank dispensers; fix ASSteroid station; repath SSU ract 2016-01-25 12:03:13 -06:00
Bjorn Neergaard f3697fc7d6 Repath air alarms 2016-01-25 12:02:58 -06:00
KorPhaeron 01bd94ceb8 Moves CTF further from transit 2016-01-25 00:55:48 -06:00
KorPhaeron b445eee80d CTF Revival 2016-01-25 00:52:25 -06:00
Bjorn Neergaard 99e5764719 Refactor pizza_bomb, tweak pizza_bomb sprites
Thanks to @WJohn for the pizza bomb core sprites, and updated pizza box sprites

Removes the pizza_bomb and replaces it with pizzabox/bomb. Adds a special bomb core
for pizza bombs (a pizza bomb core can be used on pizza boxes and regular bombs, but
regular bomb cores cannotbe used for pizza bombs), and tweaks wire code a little bit.
2016-01-22 19:22:11 -06:00
MMMiracles 8b13e0cfdd i love map conflicts 2016-01-21 01:20:25 -05:00
MMMiracles af5f726089 lodesmapedits 2016-01-21 01:07:06 -05:00
tkdrg 53b215ccdc Merge pull request #14731 from WJohn/activeturfsfix
Fixes active turfs on z6.
2016-01-20 20:35:55 -03:00
WJohn 2a774c23d1 Fixes active turfs on z6. 2016-01-18 22:17:59 -05:00
xxalpha af7059e1f3 Divide beach coast icon into two. 2016-01-17 23:26:43 +00:00
AnturK da283a1230 Fixes listening post syndicate faction 2016-01-16 11:39:43 +01:00
KorPhaeron 307990ebae Pod Safety 2015-12-30 18:30:06 -06:00
Jordie0608 9c1620ca15 readds syndi docking port to z5, fixes scattered missing areas 2015-12-27 20:55:24 +11:00
tkdrg 939a0c1a24 Merge pull request #13910 from KorPhaeron/z2_fix
Various Z2 fixes
2015-12-23 14:47:50 -03:00
KorPhaeron afe3cdb8ab Z6 fixes 2015-12-22 07:51:59 -06:00
KorPhaeron 4599739ab7 Z2 Fixes 2015-12-22 07:51:35 -06:00
MMMiracles 8758ca1a72 various map edits 2015-12-19 22:27:40 -05:00
Cheridan 9a8e604738 Merge pull request #13773 from KorPhaeron/cheridan_in_space
Black Market Ship moved to Z6
2015-12-19 11:54:23 -06:00
KorPhaeron c7dde204fb Black Market 2015-12-18 12:56:55 -06:00
KorPhaeron 8de9b99182 Deepstrike 2 2015-12-17 23:22:37 -06:00
tkdrg d2d78c5e2c Merge pull request #13574 from Strathcona/MiningMap
Makes the Mining Asteroid Spikier
2015-12-16 14:34:53 -03:00
Strathcona 4ceabf8d06 Old mining station re-added 2015-12-14 21:16:34 -05:00
Strathcona 2c63aa5d94 git -reset --hard is your friend 2015-12-14 09:50:22 -05:00
Incoming5643 82aad54c80 step what are you doing there I didn't even touch you 2015-12-14 03:02:49 -05:00
Incoming 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
KorPhaeron db8d3f7857 Ops can't fly to Z3 or Z4 2015-12-09 13:12:03 -06:00
duncathan salt 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
duncathan salt c9ee58c120 Merge pull request #13253 from SuperSayu/abstract_holodeck
Holodeck Fixes
2015-11-30 21:26:52 -06:00
Vincent 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
Incoming 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
KorPhaeron 0a4dca7a94 Moves listening post to Z6 2015-11-29 10:42:05 -06:00
KorPhaeron 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
KorPhaeron cbd70ee3ec Removes listening post as an away mission, adds it to Z6 2015-11-29 10:34:49 -06:00
AnturK 235649c4c6 Map Changes - 2.0 2015-11-26 22:16:44 +01:00
Vincent faf5ddaceb Holodeck refactor and Enchancements
Moves holodeck code to modules/holodeck.  Repaths holodeck structures a little.  Cleans holodeck code and prepares for additional features (multiple holodecks, etc).  Should fix #4828.

Necessary map bugfixen for Asteroid, Disc, Dream, Meta, and TG.
Adds Lounge, Emergency Medical, pet center, and holdout room to the rec holodeck.

All items spawned by the holodeck will do only stamina damage, except when emagged.  This allows emergency medical to be staffed with scalpels and bonesaws and such.  Emergency medical has some functioning equipment but the only drugs available are in the sleeper.
2015-11-15 20:23:23 -05:00
Firecage b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00