3cf911c0f8
Merge pull request #12596 from Anonus/nutrivend
...
Fixes a few more dreamstation issues
2015-10-23 11:46:33 -04:00
b5120f0276
Merge pull request #12555 from Jordie0608/notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
...
Syndie nuke and closet mapped to shuttle
2015-10-23 12:29:44 +03:00
0dd8027380
rogue line diff fix?
2015-10-23 14:14:19 +11:00
e90213db8e
parts maps to avoid conflicts
2015-10-23 13:45:06 +11:00
d8edc80a3a
Retiles the entire mining zlevel out of spite. It is now brown and purple, aligning as strictly as possible to a specific placement guide.
...
Also fixed an issue on the main station but I forgot what it was already.
2015-10-22 15:11:29 -04:00
5479608013
Merge pull request #12538 from lzimann/asteroid
...
Small fixes to asteroid!
2015-10-22 15:07:49 -04:00
9148f8d0d7
Fixes a few issues, including nuke ops not getting a nuke, a lack of nutrivend, and some airless tiles that didn't show up on roundstart active turfs.
2015-10-22 14:27:08 -04:00
0d67f24e33
Merge branch 'master' of https://github.com/tgstation/-tg-station into notallsyndicatescanaffordanukedonateyourstodayandyoucanhelpaspacestationbedestroyed
...
Conflicts:
_maps/map_files/DiscStation/DiscStation.dmm
2015-10-23 01:01:02 +11:00
a148f87afb
Area Fix
2015-10-21 09:03:55 -04:00
1dee35a5f9
syndie nuke and closet mapped to shuttle
2015-10-21 18:27:29 +11:00
bb8c9899d1
More changes
2015-10-20 21:42:56 -04:00
ccddcdd6dd
Cleaned up some cameras, added back some old loot
2015-10-20 17:32:35 -04:00
aea1ae0cd1
Cameras, pipes, wires.
2015-10-20 17:13:32 -04:00
f972026d0a
Some small fixes. Removed version out of the file.
2015-10-20 16:17:17 -02:00
3f0c55961f
Merge pull request #12434 from freerealestate/master
...
Fixes #12326 : High-capacity power cells on Boxstation having wrong capacity
2015-10-19 14:59:33 +11:00
7ca937981c
Merge pull request #12482 from Strathcona/DiscStationHotfix
...
Discstationhotfix Take two
2015-10-19 14:57:25 +11:00
d0c02a9d88
Merge pull request #12480 from Tokiko1/birdfix2take2
...
Quick birdstation fixes take 2.
2015-10-19 14:57:05 +11:00
5f385dfe4c
Merge pull request #12336 from Steelpoint/Armoury
...
Pre-Rifle Armoury + Lethal Shotgun Ammo
2015-10-19 14:56:52 +11:00
4c33c909ff
Map merge
2015-10-18 23:00:13 -04:00
2082b485d4
I wish people would report issues ffs
2015-10-18 14:21:09 -04:00
5847b8e91c
MergeConf
2015-10-19 02:19:04 +08:00
f572d345dd
Fixes all misplaced areas, woo woo.
2015-10-18 12:25:33 -04:00
6e8c37f221
Removes a single active turf.
...
Remaining active turfs are on the default centcom zlevel, yell at @Jordie about those.
2015-10-18 11:47:33 -04:00
7b9a2e7d82
Fixes a few more alarmed vents, a few missing chairs, and a missing warning line.
...
Also improves department colors again.
2015-10-18 10:44:29 -04:00
885f5ae710
Map merged.
2015-10-18 10:32:15 -04:00
88d583193d
Goddamn it. This should be most of the fixes
2015-10-18 10:23:03 -04:00
c98e89710d
Fixes access with sec cell doors. …
...
Adds a flasher to each sec cell.
Removes a console that blocked a way into cloning.
Adds a button to cloning that opens the door into medbay.
Added a camera to fitness and arts and crafts room.
Adds the missing reagent grinder and plasma sheets to xenobio.
Adds HoS stamp and HoS armor to sec locker.
Adds even more extinguishers.
Adds a few seclites to maint.
Replaced the stunbatton with an unfinished prod in sec maint.
Adds a sink to viro.
Adds a bunch of budget insulated to the powerstation
Removes outdated text.
Fixes roundstart active tiles from shuttle.
Adds a light to the tomb.
2015-10-18 14:28:11 +02:00
2ad2cc83e7
Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen
...
Conflicts:
_maps/map_files/DreamStation/dreamstation04.dmm
2015-10-18 17:27:24 +11:00
8ae5b8bcc7
Merge pull request #12470 from Anonus/podfix
...
Dreamstation Update
2015-10-18 00:30:22 -03:00
0fd9024d93
Adds plant-b-gone to hydroponics, fixes two misplaced areas, an alarmed vent, and an overlapping sink.
...
Also improves area color coding somewhat, which should make certain areas seem less boring.
2015-10-17 23:23:17 -04:00
1043550b47
Merge pull request #12369 from lzimann/asteroidstation
...
Adds the map Asteroid station.
2015-10-17 17:22:45 -04:00
3f9ac0fe68
Asteroid v1.0 - Playable!
2015-10-17 14:37:34 -03:00
3205f81580
readds dreamstation z5 for anonus
2015-10-18 04:03:16 +11:00
8281e505ff
bird and discstation pass, replaces z2 airlocks with poddoors
2015-10-18 01:52:22 +11:00
b88ffb6a8a
Replaces var-edited high cap cells on Boxstation with plus sized versions that have slightly modified icons
...
Renames high cap cell in ninja suit and changes its sprite to reflect its unique capacity
2015-10-17 17:47:59 +13:00
232b9eb77d
Asteroid Station! Supply and escape shuttles fixed.
2015-10-17 00:00:33 -03:00
c5a6e594f7
dreamstation pass
2015-10-16 16:27:51 +11:00
cea729db60
Merge branch 'master' of https://github.com/tgstation/-tg-station into thetitanichadabettersafetyrecordthannanotrasen
2015-10-16 01:14:17 +11:00
39410d355c
ministation pass
2015-10-16 01:01:11 +11:00
3cf1679d11
Merge pull request #12395 from Strathcona/DiscstationUpdate
...
Discstation update [Merge Ready]
2015-10-15 17:00:13 +03:00
3c49e565f0
Merge pull request #12318 from Tokiko1/birdstation_miningbox
...
Birdstation fixes and rebalances.
2015-10-15 16:02:44 +03:00
b919eed9cc
pass for metastation, code improvement
2015-10-15 19:06:53 +11:00
9267aa3e0a
Merge pull request #12370 from Razharas/MapShitFix
...
Makes space transition real cool
2015-10-15 16:07:10 +11:00
5f5c8ac254
Merge pull request #12403 from Anonus/dreamforme
...
Dreamstation Hotfix
2015-10-14 22:24:10 -04:00
247d1faf77
Less windows, more syringes
2015-10-14 20:31:18 -04:00
640ba3ff8f
hey wait this is really easy, huh
2015-10-14 19:30:38 -04:00
ed91b33129
Fixes a couple of bugs, including a rogue APC and a mopless bucket.
2015-10-14 19:10:41 -04:00
16a742a904
Uranium doors that merely look like uranium doors.
2015-10-14 14:23:49 -04:00
f060ce7dbe
Uranium Doors? I dunno man.
2015-10-14 13:35:48 -04:00
8510c2139b
Renames DiscStation to drop version numbers
2015-10-14 12:00:13 -04:00
WJohn