Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Heroman
bee3c7b9dd
Fixes missing pipe to janitorial closet on asteroid 3
2020-01-12 12:21:16 +10:00
Novacat
24da40a882
Merge pull request #6426 from Heroman3003/dronedroppod
...
Adds new random event: drone drop pod
2020-01-11 01:19:16 -05:00
Heroman
47086d7bf0
Adds new event: drone drop pod
2020-01-11 16:02:12 +10:00
Novacat
ef4e6f3a6e
Merge pull request #6421 from Heroman3003/surfacecryo
...
Readds cryo to surface medical
2020-01-11 00:14:24 -05:00
Heroman
9612d9c2e6
Fixes decals on a single tile
2020-01-11 12:08:26 +10:00
Heroman
efe0d3a5b3
Readds cryo to surface medical
2020-01-11 12:04:41 +10:00
Heroman
4e11d2c26a
Removes and repositions the dispensers
2020-01-11 06:42:59 +10:00
Heroman
0c948f9425
Adds a bunch of wall nanomeds around station
2020-01-11 06:12:12 +10:00
Heroman
fc53e01103
Forgot a donut
2020-01-10 15:09:59 +10:00
Heroman
2a498da70e
A variet of minor mapfixes
2020-01-10 14:52:27 +10:00
Heroman
cd3aac7006
Also implements map adjustments to avoid conflict
2020-01-10 10:11:00 +10:00
Heroman
e72ecf4453
Conflict resolution
2020-01-10 09:50:41 +10:00
Heroman3003
5f05d26eb9
Merge branch 'master' into resleeving_sickness
2020-01-10 09:43:42 +10:00
Heroman
a9c1f48a93
Adds a single cure pill to vault, doubles amount ERT gets, changes taste
2020-01-10 09:31:51 +10:00
Heroman
c693bf558d
Does virgo-side of xenoflora expansion
2020-01-09 08:30:42 +10:00
Hawk_v3
838f5e9418
Merge remote-tracking branch 'upstream/master'
2020-01-06 00:47:53 +00:00
Heroman
9490261230
Adds Kitsuhanan Cure for resleeving sickness
2020-01-06 07:15:13 +10:00
Novacat
df5abbe94c
Merge pull request #6393 from Heroman3003/shuttlepad2
...
Makes supply shuttle landing into full pad
2020-01-03 18:54:14 -05:00
Heroman
88323a1121
Removes genetic mutations, removes cryotubes from resleeving labs
2020-01-04 07:42:57 +10:00
Heroman
16fd960a39
Makes supply shuttle landing into full pad
2020-01-04 05:54:32 +10:00
Heroman
489197990c
Removes Poly's roundstart headset
2020-01-03 12:57:54 +10:00
Hawk_v3
8a0b78c322
Merge remote-tracking branch 'upstream/master'
2020-01-01 15:16:53 +00:00
Novacat
524ef9ee17
Merge pull request #6349 from Novacat/nova-basicfixes
...
Misc Changes and bugfixes
2019-12-31 18:39:10 -05:00
Novacat
3ef9dd9b28
Merge pull request #6362 from Ketrai/superqualityforbartenders
...
makes glasses mass producable
2019-12-31 10:22:24 -05:00
Heroman
65a8bf72a4
Fixes for maints on asteroid 1
2019-12-31 22:14:46 +10:00
Hawk_v3
70711c03e1
Merge remote-tracking branch 'upstream/master'
2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a
Merge pull request #6360 from Ketrai/sharksbranch
...
Adds a new fish, measelsharks!
2019-12-29 15:11:46 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Unknown
83e069fb43
Addition to mothership vault
2019-12-29 11:44:49 -05:00
Novacat
f15bb938c6
Merge pull request #6375 from TheFurryFeline/TFF-Fix_Da_Major_Aylium_Ship
...
[Submap] Abandoned Derelict Areas
2019-12-26 23:54:15 -05:00
Heroman
3b4beb2fe0
Also adds exceptions to mothership
2019-12-27 14:27:34 +10:00
Heroman
80b32984e8
Hides alarms from gateway destination APCs
2019-12-27 14:17:09 +10:00
TheFurryFeline
635e82b1ef
Abandoned Derelict Areas
...
So.... Missle to an APC wipes power out to the whole damn POI. Fixing that.
Changelog Notes:
- Adds a list of areas for the Abandoned Derelict POI and maps them in.
2019-12-26 21:18:15 -05:00
Heroman
2672ab037f
Provides outposts with proper first aid
2019-12-27 06:36:31 +10:00
Heroman
b8aed4686f
More fixes to lack of tiles under doors
2019-12-26 17:34:14 +10:00
Heroman
e75b9c5d78
Minor mapfixes
2019-12-26 16:02:50 +10:00
Heroman
1c814e602e
Readjusts the disposals near bridge to work as intended
2019-12-26 13:08:08 +10:00
TheFurryFeline
16791fa74d
Teleporter Access Fixy
...
Seems Asteroid side's maint access back door was merely bridge access.
Changelog Notes:
- Fixes Teleporter access for asteroid and surface.
2019-12-24 13:40:08 -05:00
Ketrai
61ca61eb7a
fixes some byond magic fuckery
2019-12-22 21:46:45 +01:00
Ketrai
e6021d108d
makes glasses mass producable
2019-12-22 21:15:29 +01:00
Unknown
1eab2a9461
Adds Jetpacks to exploration
2019-12-22 13:44:45 -05:00
Ketrai
0e65a0b8a6
Adds sharks
2019-12-22 17:32:49 +01:00
Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
TheFurryFeline
caa01db01b
Post-Conflict Resolution Resolution.
...
Re-add new Nutrimax
2019-12-19 20:46:10 -05:00
TheFurryFeline
1658258d47
Merge remote-tracking branch 'upstream/master' into TFF-Seed_Vendor-Brig_Version
2019-12-19 20:26:57 -05:00
TheFurryFeline
d16839aa00
Xenoflora Storage Scrubber Fixy
...
- Fixes scrubber console var, allow scrubbing of room via console usage.
2019-12-19 20:03:07 -05:00
TheFurryFeline
5d46a6290d
Brig Safety Lessons
...
Changes the vendors in the brig to not have size changing stuff or syringes.
Changelog Notes:
- Removes syringes from Nutrimax.
- Removes grow/shrink shrooms from seed storages.
Note: Do not merge this until after my prior map PR is merged and I've dealt with the conflicts. This change is so minor that resolutions of said conflicts will be speedy.
2019-12-19 18:51:47 -05:00
TheFurryFeline
6fe3bbc38f
One More Time
...
- Missing air vents, scrubbers, alarms added in again.
- Fixes Security EVA cycling. Also does the same with Telecomms Central Compartment airlock.
- Leftover Asteroid 2 disposals pipe removed. (How long were these here...?)
- Another Janitorial Closet set of vent pumps and scrubbers.
2019-12-19 13:11:40 -05:00
TheFurryFeline
ee466cb638
Real Final Round
...
- Access Fixes to Substations
- - Exploration, Mining, Command given proper access.
- Add scrubber/vent pump to hallway near Fishing Farm.
2019-12-19 03:57:11 -05:00
