TDSSS
843587bbb5
Fixed conflicts, now with correct map merge
2019-08-15 16:18:21 +02:00
TDSSS
1353f82ead
Fixed conflicts (hopefully)
2019-08-15 16:05:12 +02:00
variableundefined and GitHub
0539c149ae
Merge pull request #11834 from dovydas12345/Console
...
Adds a ERT shuttle console which is accessible to ERT members
2019-08-14 23:23:37 +08:00
Couls
7c5bdcc83c
Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks
2019-08-13 21:46:32 -04:00
datlo and GitHub
d329f04ae6
Merge branch 'master' into lavalandgolemsintospace
2019-08-11 16:12:28 +02:00
Mark van Alphen
2ae1fc7ac2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# icons/obj/chairs.dmi
2019-08-09 23:41:07 +02:00
Fox McCloud and GitHub
f1899f0050
Merge pull request #11697 from Markolie/tribalhealing
...
Add tribal splints, ash walker tweaks and Lavaland tweaks
2019-08-09 17:22:22 -04:00
Couls
5427c5267c
Merge branch 'master' into unrestricted-airlocks
2019-07-15 18:29:31 -04:00
Mark van Alphen
8c8950bf07
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2019-07-15 20:37:44 +02:00
Mark van Alphen
88fa0d27df
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport
...
# Conflicts:
# paradise.dme
2019-07-15 20:30:54 +02:00
Dovixx
f0024c202f
Adds the console
2019-07-12 19:02:04 +03:00
variableundefined and GitHub
52ae3bb933
Merge pull request #11674 from DoctorDrugs/Additional-Miners
...
Adds additional roundstart miner slots
2019-07-12 18:16:32 +08:00
TDSSS
78c3af74c6
Gave hop long-range fax
2019-07-12 02:16:51 +02:00
Couls
3555a17855
mapmerge
2019-06-30 18:23:40 -04:00
Couls
535486b572
Include subtle white light in the direction of unrestricted access
2019-06-30 17:50:15 -04:00
Couls
2f45067df5
one way unrestricted airlocks!
2019-06-30 15:44:16 -04:00
Mark van Alphen
1294e139e4
Lavaland vendor/defib tweaks
2019-06-14 19:41:51 +02:00
datlo
8894d88a82
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into lavalandgolemsintospace
2019-06-13 13:58:56 +01:00
Mark van Alphen
90a2406ada
Moon Outpost 19 mirror fix
2019-06-12 23:35:01 +02:00
Mark van Alphen
0a344f7593
test_all_maps fix
2019-06-12 21:25:01 +02:00
Mark van Alphen
babe7c1d75
More ash walker tweaks
2019-06-07 20:42:18 +02:00
Mark van Alphen
e0a21759fb
Add tribal splints
2019-06-07 04:06:12 +02:00
Mark van Alphen
f56854292a
Add shuttle chairs (and fix newlines on all maps)
2019-06-07 03:39:24 +02:00
Mark van Alphen
d02165e0f9
Ruin fixes
2019-06-07 02:03:19 +02:00
Mark van Alphen
ba3f65049d
Port over remaining Lavaland ruins
2019-06-07 01:19:55 +02:00
Mark van Alphen
eb9ff99542
Another path fix
2019-06-06 01:36:29 +02:00
Mark van Alphen
2171f97ed7
Path fix
2019-06-06 01:35:58 +02:00
Mark van Alphen
fad735142b
Water tile fixes and other minor fancy turf fixes
2019-06-06 00:09:19 +02:00
Mark van Alphen
0a5806bff6
Fix beach light
2019-06-05 01:21:49 +02:00
DoctorDrugs
8b173a9955
Adds additional roundstart miner slots
...
adds additional roundstart miner slots and all the equipment they need
2019-06-04 01:26:09 -04:00
Mark van Alphen
5f33ae47fa
Singularity on Lavaland improvements
2019-06-03 23:38:18 +02:00
Mark van Alphen
94eb652f15
Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix
2019-06-03 17:39:23 +02:00
Mark van Alphen
650383aad1
ChangeTurf fix, incinerator starts off by default, Syndicate base fix
2019-06-03 05:53:56 +02:00
Mark van Alphen
697bb8eee5
More Lavaland fixes:
...
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
2019-06-02 23:29:50 +02:00
Mark van Alphen
c97506d898
Add coated walls to the turbine in the Syndicate base
2019-06-02 05:45:26 +02:00
Mark van Alphen
3e60237b52
Syndicatre base map fixes
2019-06-02 04:18:10 +02:00
datlo
a8ec4a4528
redesign
2019-06-02 01:44:22 +01:00
Mark van Alphen
279c17a660
Fix Syndie base incinerator
2019-06-02 02:09:05 +02:00
Mark van Alphen
81c325262d
Fix Ash Walkers mining and antag selection, fix Lavaland Syndicate base incinerator buttons and comms agent mask
2019-06-02 01:18:18 +02:00
datlo
03e01ef79b
ruin map to tgm
2019-06-01 23:30:18 +01:00
Mark van Alphen
c9e87f6593
Add more explosive power to Syndicate base, add species specific sprites for explorer equipment (thanks Ionward), fix Drake explosive sound, clarify ash walker/syndicate base personnel flavor text
2019-06-01 21:17:17 +02:00
datlo
aa53893696
mapmergez6
2019-06-01 12:47:05 +01:00
datlo
6b1f143a04
mapmerge
2019-06-01 12:35:14 +01:00
datlo
820daeac91
readd free golem transit area
2019-06-01 12:17:34 +01:00
datlo
ade8aeaf2f
Allow free golems to purchase shuttle board
...
also add a shuttle recalls console to ruin
2019-06-01 11:51:35 +01:00
Mark van Alphen
39945bf317
Add tiny fans to remaining Lavaland airlocks
2019-06-01 01:06:44 +02:00
Mark van Alphen
f60b3fcb5e
Lavaland ruin updates
2019-06-01 00:03:56 +02:00
Mark van Alphen
f7682a2627
Add safety pickaxes to Lavaland
2019-05-31 18:58:57 +02:00
Mark van Alphen
0e91e91479
Lavaland fixes
2019-05-31 18:26:15 +02:00
datlo
32812736ee
Integrate free golems as a lavaland ruin
2019-05-31 09:30:03 +01:00
TDSSS