cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-08 16:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,310 Commits 26 Branches 2 Tags
e2f7f6f055ee02db492bc56b814785209927ed48
Commit Graph

375 Commits

Author SHA1 Message Date
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
Mark van Alphen
e2ba4436ff Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfspace 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
 2019-06-09 23:29:48 +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
f634b760c2 Make sure the beach can't be pried up 2019-06-06 00:12:35 +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
5f33ae47fa Singularity on Lavaland improvements 2019-06-03 23:38:18 +02:00
Mark van Alphen
950a4cb5dc More portal fixes 2019-06-03 21:57:00 +02:00
Mark van Alphen
cd362d6bad Wormhole jaunter fix (and replace lighting checks with simulated) and disk compartmentalizer fix 2019-06-03 21:44:01 +02:00
Mark van Alphen
76ff047b5d Fix baseturf check 2019-06-03 06:06:26 +02:00
Mark van Alphen
6a4afdd796 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfspace 2019-06-03 05:56:41 +02:00
Mark van Alphen
2c4c378775 ChangeTurf icon fix 2019-06-03 03:25:48 +02:00
Mark van Alphen
1c517166dd Merge branch 'master' into turfspace 2019-06-03 03:22:39 +02:00
Mark van Alphen
1b37f7f89d Add option to remove plating 2019-06-03 02:31:45 +02:00
Mark van Alphen
8822887784 Compile fix and asteroid turf placement fix 2019-06-03 01:21:03 +02:00
Mark van Alphen
2c7e8ec505 Actually make the ancient goliath able to spawn 2019-06-03 00:27:11 +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
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
Mark van Alphen
58427ab097 Make sure engine floors don't expose space, remove separate Lavaland vendor and add more voucher kits 2019-05-31 05:45:37 +02:00
Mark van Alphen
f0734672f3 Lavaland fixes: 
- Survival pod storage being broken when used.
- Wrong wiring on the Syndicate base.
- Added one more oxygen tank to the animal hospital.
- Chasms eating up light atoms.
- Mining satchels not picking up items automatically.
- Releasing the legion/blob mice notifications not having icons.
- Mining gear made orderable at cargo.
 2019-05-31 02:21:37 +02:00
Mark van Alphen
0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-13 22:14:38 +02:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
967ebb6805 Update water plane 2019-05-09 02:21:38 +02:00
Mark van Alphen
2618def9a1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/Delta/delta.dmm
#	_maps/map_files/MetaStation/MetaStation.v41A.II.dmm
#	_maps/map_files/MetaStation/z4.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
#	_maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm
#	_maps/map_files/RandomZLevels/spacebattle.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
#	_maps/map_files/cyberiad/z4.dmm
#	_maps/map_files/cyberiad/z6.dmm
#	_maps/map_files/generic/z5.dmm
#	code/__DEFINES/misc.dm
#	code/__HELPERS/unsorted.dm
#	code/game/objects/structures/lattice.dm
#	code/game/turfs/space/space.dm
#	code/modules/mob/mob.dm
#	code/modules/ruins/ruin_areas.dm
#	paradise.dme
 2019-05-08 21:40:35 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Mark van Alphen
36d251574f Add planetary atmos 2019-04-27 18:52:50 +02:00
Mark van Alphen
4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Mark van Alphen
eed189b175 Asteroid turf slippery/dry fix 2019-04-21 23:24:59 +02:00
Mark van Alphen
211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen
092773132d no_lava fix, make sure simple explosions don't nuke the Syndicate base 2019-04-20 03:09:13 +02:00
Mark van Alphen
6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
CornMyCob
1af7999dbd lighting fix 2019-04-15 20:45:16 +01:00
Fox McCloud
6334114f8c Updates and Fixes Gas Overlays 2019-04-13 01:44:05 -04:00
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Mark van Alphen
391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
Mark van Alphen
877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Mark van Alphen
99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Mark van Alphen
ddd845f01a Improve slot accessory handling 2019-04-03 22:50:34 +02:00
Mark van Alphen
19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
Mark van Alphen
05ad83f27a Fix Bubblegum multiple spawns by moving to a globally initialized list 2019-04-02 20:08:38 +02:00
Mark van Alphen
1619bc048b Lavaland baseturf implementation 2019-03-31 22:07:30 +02:00
Mark van Alphen
1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen
2dca2ad424 Fix temperature issues in caves 2019-03-30 06:02:54 +01:00
Mark van Alphen
7149dd6aad Goliath improvements 2019-03-30 05:20:27 +01:00
Mark van Alphen
c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
Mark van Alphen
f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +01:00
Mark van Alphen
2091a431bb Split mining mob files 2019-03-29 23:55:54 +01:00