Commit Graph

2277 Commits

Author SHA1 Message Date
Loganbacca
dd75f190a0 Made shuttle windows prettier 2014-01-31 21:51:12 +13:00
Loganbacca
60521917a8 Fixed evac shuttle transit layer
Because half an evac shuttle turning up at Centcom doesn't look good on the report.

Also changed the emergency shuttle to unsimulated turf (where the escape pods dock). Breached pods were turning up at the emergency shuttle and depressurizing it.
2014-01-31 20:16:59 +13:00
Loganbacca
431f9e9fbc Little things
Gave engine room airlock camera x-ray upgrade (so AI can see SMES).

Locked engine room core access doors.
2014-01-27 14:54:32 +13:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
2014-01-23 00:05:53 -06:00
Ccomp5950
8f3d61652f Fixed Xeno-Arch Chem-Dispenser
Admin request as well as overwhelming support on a thread.
http://baystation12.net/forums/viewtopic.php?f=5&t=9306

I've seen Admins fix this everytime someone asks so going to just save them the trouble.
2014-01-15 23:10:20 -06:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Igor Golubkov
a0b909926b Fix for broken on spawn chem_dispenser
Remove ~83 minute before RnD chem_dispenser starts recharging.
Fix chem_dispenser logic.

Signed-off-by: Igor Golubkov <bctpe4hbiu@bctpe4hbiu.org>
2014-01-13 00:25:45 +04:00
Loganbacca
2944fed3a1 Supermatter draw layer - fixes #4255
Supermatter draw layer was set to 70. Changed it to 4 so it's still on top of other objects but not UI layers.
2014-01-12 20:35:37 +13:00
Loganbacca
38c0bbd91a Multiple map fixes
Engineering
	* Fixed Engineering EVA Storage area assignment (was just assigned EVA Storage)
	* Reconnected scrubber loop to Atmosia through Engineering Maintenance(north of engineering foyer)
	* Fixed: https://github.com/Baystation12/Baystation12/issues/4254

Dormitories
	* Fixed: https://github.com/Baystation12/Baystation12/issues/4232 and https://github.com/Baystation12/Baystation12/issues/4256
	* Added Cryogenic Storage APC

IA Office
	* Fixed: https://github.com/Baystation12/Baystation12/issues/4250

Bar
	* Moved Bar mail sort junction so deliveries end up in the actual bar.

Virology Quarantine Zone
	* Fixed electrified window wiring
	* Fixed airless plating in window

Prison Wing Rec Room
	* Fixed electrified window wiring
	* Fixed airless plating in window

Security Lobby
	* Fixed electrified window wiring

Telescience
	* Removed unnecessary (duplicate) reinforced windows

Cameras
	* Aft Primary Hallway - renamed duplicates
	* Engine Room Airlock - incorrect name
	* Misc research chamber - removed second camera at north end of room
	* Secure Armory - renamed duplicate
	* Prison Rec Room - attached floating camera to wall
	* Telescience test chamber - renamed from misc test chamber

Also cleaned up a few rogue unconnected air vents, and a couple of lose cables
2014-01-11 01:24:18 +13:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
DJSnapshot
43e00fb009 Fixes for https://github.com/Baystation12/Baystation12/issues/4173 , https://github.com/Baystation12/Baystation12/issues/4168 , https://github.com/Baystation12/Baystation12/issues/4159 , and https://github.com/Baystation12/Baystation12/issues/4038 2014-01-07 11:39:59 -08:00
RavingManiac
fe2c98cf03 Chapel improvements. 2014-01-05 22:22:13 +08:00
DJSnapshot
ea3ede7e06 Fixed Cans on the map. 2014-01-02 17:05:56 -08:00
Zuhayr
bf820a99b6 Fixed robot gib display issue, updated single path on map to new path. 2013-12-29 03:07:20 +10:30
Zuhayr
c522226c95 Reapplied Snapshot's mapfix for misc science. 2013-12-27 18:25:44 +10:30
Miniature
8a99315b71 Fixed tile in sec dormitories being in wrong area
might have been related to issue #4043
2013-12-27 18:20:07 +10:30
Zuhayr
8f09b986e3 Whoops, forgot to cleanmap. 2013-12-26 17:00:43 +10:30
fauxki
43acfd6c76 - Replaces windows on pods and shuttles with the corrent window.
- Put in some potted plants, because they look nice.
- Reworked the engineering dorm a little.
2013-12-25 00:36:49 -08:00
Zuhayr
d783fd5043 Manual binary merge of head icons. 2013-12-22 23:23:25 +10:30
Zuhayr
b9fcd34df3 Merged config and changelog. 2013-12-22 23:11:29 +10:30
RavingManiac
cf6d9190f3 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-12-22 13:42:02 +08:00
Miniature
77f1e9c784 Fixes issue #4062 (Chaplains door to coffins improperly layered) 2013-12-22 07:50:57 +10:30
RavingManiac
72932905e5 Changes to the CentCom medbay and arrivals area. Cryogenic system added. 2013-12-21 16:11:32 +08:00
fauxki
5550c98615 Puts the Gentlemanly Wizard outfit in the wizard wardrobe. 2013-12-20 16:59:56 -08:00
fauxki
10ad3edcde - removes plasma windows from rnd
- removes additional airlock shutters from windows i missed.
2013-12-20 00:23:07 -08:00
fauxki
dbcb4e368d Updates Centcom level of map. Adds in a medbay, security holding area, and updates the bar and escape shuttle. Wizarding den was also edited to look more fancy. Details and images here: http://baystation12.net/forums/viewtopic.php?f=20&t=9361&p=192264#p192264 2013-12-18 18:08:44 -08:00
Zuhayr
18a75b8dfd Added cryo suite to dorms. 2013-12-15 14:16:04 +10:30
Kilakk
dad7f5ea63 Let's try this again.
* I hate map conflicts
2013-12-03 21:46:37 -05:00
Ccomp5950
2fc6c0af7f Mapped in Supermatter Manual / pipes fix.
There were multiple straight pipes going the same direction laying over
each other in the engine room that shouldn't have been there.

Placed the Supermatter Engine book on the CE's desk, engineer's table,
and by the rest of the book.  Plenty of copies.
2013-12-01 19:48:13 -06:00
DJSnapshot
a3ac49e545 fixes to misc research area.
Added misc research items back into the chamber.
Fixed names and access on doors in misc research.
2013-11-30 15:14:21 -08:00
Ccomp5950
6398719a1e Dev-freeze: All map fixes
Engineering Storage Vent Pump number 2 is now on.
Misc research vent pump is now on.

Engineering disposals now work
Misc Research misc piping should now be correct.

Mailing packages to the Research director should be good now (bad
disposals piping)
Mailing packages to the CE should be good now (bad disposals piping).

Genetics-Cloning is now wired up
Medical break room has had the wire under the door replaced allowing the
room to be wired up.
2013-11-27 20:21:02 -06:00
Nanai
7a4f11990c Holostools/Stool Replacement
Fixes issue #3323
Adds in a holostool item, replaces all holodeck stools.
2013-11-23 19:22:05 -05:00
Nanai
e58271ac10 Map Fixes!
Fixes issue #3902
2013-11-23 01:12:27 -05:00
Nanai
c977a40b3f Adjusted areas for medbay(Surgery, Patient rooms, genetics cloning, breakroom, psych office) so their APCs work.
Adjusted areas for engineering storage to actually function.
2013-11-17 16:19:13 -05:00
Nanai
808653ed12 Map Fixes IV: Areas Rising
Removed the odd locker room area.

Properly edited dorm areas to individual areas UNDER the sleep area so as to properly reap the benefits of being a dorm.

Added a camera to security dorms.

SMES wiring adjustment.
2013-11-17 15:50:55 -05:00
Nanai
51f4772449 Further map patch!
Engipod fix - Remapped pod dock.

Filter now COMPLETELY fixed.

Issues with disposals possibly fixed.
2013-11-17 15:07:27 -05:00
Nanai
c246533688 Resolved door access to the core!
E-EVA has also had it's access reviewed, and the SMESes.
2013-11-16 14:31:52 -05:00
Nanai
c59e839243 Meters and Power!
Power computers properly wired, 100% for sure!

Meters added after suggestion to engineroom, 4 of them!
2013-11-16 14:22:37 -05:00
Nanai
40695f291e Additional SM bugs(hopefully) quashed
Fixed(?) disposal issues.
Hopeful fix of supply packs, commented out the shard until it's fully functional.

Please report any continuing wonkiness I can't reproduce!
2013-11-16 13:58:30 -05:00
Nanai
9fa87c3265 SM Fix for Dev-Freeze
Fixed:
Clown car closets
Window opacity
Filter errors
Suit in softsuit storage
CE Locked Freezers, default on
Window Opacity
2013-11-16 13:28:57 -05:00
Iamgoofball
60e73bc9ac Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into boozetaketwo 2013-11-05 11:44:37 -08:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Iamgoofball
09926d571c Adds a Telescience Monitor to the room, in case you want to see what's behind those blast doors without unleashing hell itself upon the station. 2013-11-03 22:34:36 -08:00
Iamgoofball
e4a2936e2b Added Telescience! Moves Misc. Research to the spot between the Solars and Xenobio. 2013-11-03 21:49:09 -08:00
Nanai
f0929d0ce3 Telescreen
I hear it helps if you have the screen hooked up to the network.
2013-11-02 13:07:12 -04:00
Nanai
0979838acb Map Fix
Fixed emitter power and core cameras, as well as eliminating a tiny out of place button.
2013-11-02 12:55:26 -04:00
Nanai
6d39734f41 Map fixed.
Issue with map tools caused an unloadable error.
2013-11-02 02:22:58 -04:00
Nanai
0a368c5404 Merge branch 'dev' of https://github.com/Nanai/Baystation12 into dev
Conflicts:
	maps/tgstation2.dmm
2013-11-02 01:44:50 -04:00
Nanai
284d103e06 Merge branch 'dev' of https://github.com/Nanai/Baystation12 into dev
Conflicts:
	maps/tgstation2.dmm
2013-11-02 01:43:50 -04:00
Nanai
ccef5a10b1 Merge branch 'dev' of https://github.com/Nanai/Baystation12 into dev
Conflicts:
	maps/tgstation2.dmm
2013-11-02 00:46:07 -04:00