Commit Graph

154 Commits

Author SHA1 Message Date
KyrahAbattoir e1d8a0fdba Replaced the useless visitor console by the full library console so books can actually be checked out. 2016-03-03 15:51:46 +01:00
KyrahAbattoir 1f76d6bd54 Ministation:
Fixed that one conveyer tile.
Converted the map.
2016-03-02 04:45:18 +01:00
duncathan salt db5c47b6b2 Merge pull request #15598 from Incoming5643/ape_escape_2
Adds the new pun pun to the maps
2016-02-19 04:09:18 -06:00
AnturK ba750e34e9 Repaths 2016-02-18 17:56:43 +01:00
Incoming 2ec1b145fe Adds the new pun pun to the maps 2016-02-18 02:42:19 -05:00
Bjorn Neergaard 1d10561a91 Fix ministation 2016-02-07 17:48:25 -06:00
Bjorn Neergaard 97b7cf50bb Fix crates on other maps 2016-02-07 05:01:53 -06: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
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
Bjorn Neergaard dae73b28e8 Refactor atmos_control into only one computer 2016-01-23 18:56:37 -06:00
Bjorn Neergaard 4c192d705a Rewrite heaters/freezers; port to tgui
They are now one type, thermomachine.
2016-01-22 19:25:35 -06:00
tkdrg 3892326023 Merge pull request #14479 from bgobandit/fixquatro
Fixes Ministation hydroponics tray supply pack.
2016-01-19 18:23:20 -03:00
bgobandit 3355564260 fixes hydrotrays again 2016-01-19 15:04:38 -05:00
Bjorn Neergaard 1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
bgobandit dd7d44c72f fixes ministation hydroponics tray supply pack 2016-01-07 08:17:26 -05:00
Cheridan 7e6648d54f Merge pull request #14363 from swankcookie/mini_toxin
Makes Ministation Toxin Airlocks Heat-Proof (V2)
2016-01-05 11:58:32 -06:00
swankcookie 24c973457e Fireproof, bitches.
Signed-off-by: swankcookie <__X__>
2016-01-03 20:03:42 -06:00
Mike Long e6011aa1f0 Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera. 2016-01-03 07:36:12 -05:00
Mike Long 4434974521 Grammatical fix to Detective's Camera.
Fixes #14232
Also removes description saying 30 photos left, as that number did not change as the number of photos remaining decreased.  It still shows number of photos remaining on examine.
2016-01-01 17:29:56 -05:00
MMMiracles 58b1e007d1 /////// 2015-12-21 13:21:35 -05:00
MMMiracles 012d3d2f7a miniminiministation 2015-12-19 22:49:53 -05:00
Incoming ff58f4b5d3 Adds a single xmas tree to bird and mini 2015-11-30 23:17:38 -05:00
AnturK 7ead90f24b Map Changes 3.0 2015-11-25 14:46:16 +01:00
Firecage b2937bf315 Changes the operating table to be an actual table. 2015-11-08 22:09:35 +02:00
MrPerson 73c0f5d462 Remove tags from some maps
Disc was left completely untouched. Dream was given only a single edit to keep the syndiebomb working. Meta and Bird are also both cleaned up now too. All map-specific custom z's were cleaned too.

Source of these tags is DM being stupid. When you use the "Generate instances based on icon states" option, for some ungodly reason it gives those instances a tag. Which is retarded, tags are supposed to be unique to each object.

I tried searching for legit uses of tag in code and found only a few landmarks and giving mobs a tag. In any event, setting tags on map objects is probably a really bad idea anyway.

Exact regex used to find these so you guys can check my work

; tag = "[^"]*"
#end/middle

(?<=\{)tag = "[^"]*";
#begin

\{tag = "[^"]*"\}
#solo
2015-10-24 09:07:32 -07:00
Razharas c9041beddc Merge pull request #12585 from kyrahabattoir/ministation-medbay-air
[Ministation]Atmos tweaks
2015-10-24 10:17:56 +03:00
KyrahAbattoir 82bf74396b [Ministation]Atmos tweaks
-Removed orphan scrubber from xenobiology.
-Created separate vent/scrubber networks for each room of the R&D and medical departments.
2015-10-22 14:00:58 +02:00
Jordie0608 1dee35a5f9 syndie nuke and closet mapped to shuttle 2015-10-21 18:27:29 +11:00
Jordie0608 39410d355c ministation pass 2015-10-16 01:01:11 +11:00
phil235 9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
WJohn 52e072ceb3 Merge pull request #12117 from kyrahabattoir/ministation-shuttle-fix-2
Because i'm blind and left a hole in the shuttle.
2015-10-04 06:56:06 -04:00
KyrahAbattoir 881384962c Because i'm blind and left a hole in the shuttle. 2015-10-03 04:50:07 +02:00
MrPerson 2370ec98bb Woops forgot about ministation 2015-10-02 01:49:47 -07:00
KyrahAbattoir 9943b3291a Ministation Atmos fixes:
-Removed all air alarms in main (it doesn't work like that, really) and adjusted areas to match.
-Separated vent/scrubber circuits in 5 areas in engineering.
-Added vents/scrubbers/air alarm in the grow room and rec room (own frequencies because airtight rooms)
-Gave the two bedrooms their own vent frequencies.
2015-09-27 17:27:46 +02:00
Aranclanos 273bd239bc Merge pull request #11954 from kyrahabattoir/ministation-quality-of-life
[Ministation] Quality of life bar update.
2015-09-25 06:14:51 -03:00
KyrahAbattoir de3f595736 [Ministation] The escape shuttle is in the right "area" now and the doors should work again. 2015-09-24 02:49:13 +02:00
KyrahAbattoir 82fa3230e2 Ministation
-Removed Air alarm in EVA and bar maintenance.
-Replaced the old bar sign with the new randomized one.
-Moved the booze o mat in the south wall (it looks like a wall anyway)
-Added the new drinks dispensers and moved the cocktail recipe book.
-Set vents and air alarm frequencies in the bar areas for each room.
-Replaced tables in the chemistry lab by glass tables.
-Moved the telescreen on the proper side of the wall.
2015-09-23 05:53:41 +02:00
Jordie 105c248274 Merge pull request #11885 from kyrahabattoir/ministation-zlevels-fix
Updated the ministation wizard hideout to current boxstation version …
2015-09-22 08:18:44 +10:00
Jordie b30b61c14d Merge pull request #11882 from kyrahabattoir/ministation-mining-suit
[MiniStation] Replaced the Broken mining suit + helmet rack by a mining SSU
2015-09-22 08:18:22 +10:00
KyrahAbattoir 7e61f74e9c Updated the ministation wizard hideout to current boxstation version and corrected the other active turf problems on ministation z2 and ministation itself. 2015-09-19 23:51:15 +02:00
KyrahAbattoir d1ed01c68d Replaced the Broken mining suit + helmet rack by a mining SSU 2015-09-19 21:45:02 +02:00
AnturK 6ab5b88e6c Map changes take three 2015-09-17 17:56:05 +02:00
Aranclanos ee458bb3db Merge pull request #11254 from duncathan/pipecleanup
Pipe code cleanup
2015-09-05 04:12:36 -03:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
duncathan 381139422c Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/components_base.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/ATMOSPHERICS/pipes/manifold.dm
	code/ATMOSPHERICS/pipes/manifold4w.dm
	code/ATMOSPHERICS/pipes/simple.dm
	code/_compile_options.dm
	code/controllers/subsystem/garbage.dm
	code/game/machinery/bots/mulebot.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
	html/changelogs/.all_changelog.yml
2015-09-01 20:29:00 -06:00
xxalpha 94f045b73f Merge remote-tracking branch 'upstream/master' into airlocking
Conflicts:
	_maps/map_files/MetaStation/MetaStation.v41F.dmm
	code/game/objects/structures/door_assembly.dm
2015-08-30 19:53:54 +01:00
c0 97b792bbc3 Changed some circuits paths to reduce copypasta 2015-08-30 16:58:13 +03:00