Commit Graph
2744 Commits
Author SHA1 Message Date
Zuhayr b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
PsiOmega c60a7d2e49 Engine room tweaks.
The engine cooling pump now begins online, as otherwise supermatter delamination will occur.
One of the freezers now begins offline, seems power demand is just too great otherwise.
2014-08-19 21:23:48 +02:00
Ccomp5950 770fb4de4c Merge pull request #6052 from PsiOmegaDelta/Mapping
Fixes #6027
2014-08-19 12:01:14 -05:00
Ccomp5950 7b59b51ecc Merge pull request #6061 from PsiOmegaDelta/ForeSolar
Fixes #6058
2014-08-19 06:22:03 -05:00
PsiOmega 9e5fdcd43f Fixes #6058
Corrects the id_tag of the exterior fore solar airlock.
Replaces EVA airlock sensors with access buttons.
2014-08-19 08:20:58 +02:00
PsiOmega 48531ac2f2 Fixes #6055
The construction preparation area now has a true solar array with the necessary tracking equipment.
2014-08-19 08:11:02 +02:00
PsiOmega 11ce777d9c Fixes #6027
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
PsiOmega 92d7c4eaf0 Merge remote-tracking branch 'upstream/dev' into Map 2014-08-18 06:32:42 +02:00
Graham Lloyd fa17683742 Missed a couple more. 2014-08-17 22:57:04 -04:00
Graham Lloyd e42f107548 Whoever put those specific chairs in, not cool. 2014-08-17 22:52:09 -04:00
PsiOmega e939f73f6d Map cleanup, brig additions.
Removes about a dozen stacked pipes across the map + about a dozen stacked power cables.
Replaces a number of old-type vents which were not showing their start state.
Corrected a number of vents which did not have proper default settings.
Replaces a number of mainframe floor tiles with standard air versions. There should no longer be super-cold areas across the Research outpost.
Ensures proper camera coverage in security, affecting the detectives' office primarily but also the brig corridors which did not account for emergency shutters going down.
Sections in security separated by emergency shutters now have their own air alarms, vents, and scrubbers.
Engine room SMES now has an open cable-end beneath it.
An APC in the brig was missing an open cable-end.
2014-08-17 19:01:28 +02:00
Chinsky 1de0e2cb44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea
Conflicts:
	maps/tgstation2.dmm
2014-08-16 06:29:55 +04:00
Chinsky 03cdfaf896 Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area. 2014-08-16 05:28:45 +04:00
Raptor1628 41ce3cffab Even more fixes
small fixes, biggest ones are airlock controllers
2014-08-15 15:01:20 -04:00
Raptor1628 75e63e55a4 More Fixes
Changes detective's office to better looking and flowing version, adds a
few more lights in places, updates security job numbers for new spawn
count.
2014-08-15 12:25:56 -04:00
Raptor1628 f1c44601e5 Brig Fixes
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04:00
PsiOmega c38ede7e38 Merge remote-tracking branch 'upstream/dev' into Warn 2014-08-14 10:01:01 +02:00
PsiOmega 6fffe8e077 Merge remote-tracking branch 'upstream/dev' into Brig2 2014-08-14 08:58:59 +02:00
PsiOmega 2b1e49efff Fixes #5985. Because it was such a minor change I also dirtied down the maintenance tunnels even more. 2014-08-13 18:59:05 +02:00
Zuhayr 688cf22a67 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-08-13 17:10:37 +09:30
PsiOmega b56e2d4e72 Adds new brig. Source: https://github.com/Baystation12/Baystation12/pull/5928 2014-08-13 09:37:16 +02:00
PsiOmega 4ce3f11aa3 General map changes
Sneaky second CE-door returned. It's gone now.
Moved disposal-to-space sign in Xenoflora to the disposal unit.
The doors of the emergency storages on the starboard side of the station no longer imply that they are maintenance sections but, indeed, emergency storages.
Added oil, webs, dirt, and clutter randomly about the maintenance tunnels.
2014-08-12 17:01:04 +02:00
Zuhayr beaad5a37b Merged in preferences file changes, changed None to Unset for home system. 2014-08-11 10:38:01 +09:30
Ccomp5950 957a71319c Merge pull request #5888 from PsiOmegaDelta/Engine
Engine room facelift
2014-08-10 17:36:14 -05:00
Chinsky ed2294b9f1 Merge pull request #5932 from PsiOmegaDelta/Sec
Arrival checkpoint access
2014-08-11 01:10:42 +04:00
PsiOmega 9bdd70661e Merge remote-tracking branch 'upstream/dev' into Engine 2014-08-10 16:58:31 +02:00
Chinsky 1b60a61026 Merge pull request #5929 from PsiOmegaDelta/Doors
Less doors in the CE's office
2014-08-10 04:01:49 +04:00
PsiOmega 961111dc44 Windoor at the security arrival checkpoint now has the same requirements as of those in the security brig lobby. 2014-08-09 20:25:59 +02:00
PsiOmega fa4943c98d Makes the engine room comply with the new atmospherics changes. 2014-08-09 12:32:16 +02:00
PsiOmega e7d5583f54 Merge remote-tracking branch 'upstream/dev' into Engine 2014-08-09 12:23:42 +02:00
PsiOmega b9ce6b661e The chief engineer's office no longer has two doors on the same turf (on dev). Removes layer variables from emergency shutters to avoid potential layering issues.
Technically fixes #5913 more than it was fixed before.
2014-08-09 11:49:39 +02:00
PsiOmega 03c225e71f Feedback based changes.
Engine waste is now fully self-contained and "loops" back.
Clears out the engine airlock.
Spreads the vent and scrubber in the engine room apart somewhat.
2014-08-05 09:46:17 +02:00
mwerezak f50a24163b Updates medical equipment power usage
Also adds a couple of cell chargers to engineering workshop and aux tool
storage.
2014-08-04 21:27:19 -04:00
mwerezak 949cdd275b Updates portable pumps and scrubbers 2014-08-04 20:55:45 -04:00
mwerezak 8d04a83e97 Updates gas coolers, upgrading of coolers/heaters 2014-08-03 14:34:31 -04:00
PsiOmega e60f2f7955 The cooling loop filters and pumps are now back in the engine room after feedback. The canisters are still available to atmos techs but are slightly more secured. 2014-08-03 19:55:23 +02:00
mwerezak cb2f68f81e Merge remote-tracking branch 'upstream/dev' into power-net 2014-08-03 01:50:51 -04:00
mwerezak ecdd9b62e9 Omni-devices 2014-08-03 01:38:31 -04:00
mwerezak 3647fa4d7d Adds gas mixing proc and updates gas mixer
Also includes a whole bunch of fixes and updates for atmos machinery
2014-08-02 18:35:57 -04:00
Mloc 457d76f441 Merge pull request #5834 from Zuhayr/hydroponics
Changes dev hydro to use reagent procs.
2014-08-01 15:01:52 +01:00
Zuhayr e298b177db Added flags for Mining and Xenoarch. 2014-08-01 22:40:48 +09:30
Zuhayr 251b44a53c Changed hydro trays, fertilizer and syringes over to use the reagent procs. 2014-07-30 12:24:03 +09:30
PsiOmega 26c5b9efcd Fixes #5824 by ensuring consistent ready button placement. 2014-07-28 23:53:34 +02:00
mwerezak 5a09910b99 Fixes map error 2014-07-28 15:10:25 -04:00
mwerezak 5eaebce87e Merge remote-tracking branch 'upstream/dev' into power-net 2014-07-27 20:25:57 -04:00
PsiOmega 7b2505b599 Misc. changes
Adds access requirement to the cargo mail windoor. Can no longer simply climb inside unless left open.
Flipped a windoor in the security lobby, making withdraw in a reasonable direction.
Kitchen fire alarm.
Replaced some weird reinforced tables with normal instances.
2014-07-27 19:21:34 +02:00
PsiOmega 1eaf606bb2 Merge branch 'dev' into MechInstall 2014-07-27 16:33:23 +02:00
PsiOmega 2c076b4e46 Merge branch 'dev' into MechInstall 2014-07-27 12:52:42 +02:00
PsiOmega 62882c643d Merge branch 'dev' into Bar 2014-07-27 12:48:39 +02:00
PsiOmega 7d540508dc The bar shutters now begin down, to discourage table climbing. 2014-07-27 12:30:57 +02:00