cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 10:12:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,015 Commits 26 Branches 2 Tags
fa2ca7c87ccf8a0eeaca1ce2f2c85bfd5eab88ed
Commit Graph

681 Commits

Author SHA1 Message Date
Aurorablade
23666534dc Fixes an oversight in laz injectors 2019-06-14 01:54:07 -04:00
Mark van Alphen
3381aaf287 Anchor ash flora 2019-06-06 02:16:52 +02:00
Mark van Alphen
cdaeb5d59c Fix ancient goliath tentacles and processing computer on Lavaland 2019-06-05 23:14:39 +02:00
Mark van Alphen
a90b23c271 Re-apply Lava staff fix 2019-06-04 03:46:16 +02:00
Mark van Alphen
75fa225155 Remove hood from necropolis chest 2019-06-04 00:38:41 +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
bab051a084 Wormhole jaunter belt fix 2019-06-03 20:15:02 +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
8822887784 Compile fix and asteroid turf placement fix 2019-06-03 01:21:03 +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
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
feb0a1ceec Fix explosive chance 2019-06-01 05:19:11 +02:00
Mark van Alphen
d384c42354 Fix Lavaland swarmers 2019-06-01 05:05:11 +02:00
Mark van Alphen
7ead9e65c0 NODROP the explorer hood 2019-06-01 03:58:06 +02:00
Mark van Alphen
26a7a7a029 Lava staff fixes 2019-05-31 21:57:50 +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
Mark van Alphen
eec0d30e85 Variable fix 2019-05-31 05:47:20 +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
2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
 2019-05-17 17:37:18 +02:00
Fox McCloud
238780cae6 Merge pull request #11511 from Markolie/lighting 
Make the lighting plane master respect client color and other lighting fixes
 2019-05-15 20:42:44 -04:00
Mark van Alphen
330708a578 Fix mining bot mesons 2019-05-15 23:08:24 +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
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
Mark van Alphen
d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-05-04 03:16:38 +02:00
Mark van Alphen
bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
Mark van Alphen
4c99f3913b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-05-03 20:31:41 +02:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Mark van Alphen
40c1a25eb5 Lighting fixes 2019-04-27 01:08:17 +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
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
ccef4d1187 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
 2019-04-24 02:55:32 +02:00
Mark van Alphen
20b9285fc4 Wisp/meson implant fixes 2019-04-24 01:36:56 +02:00
Mark van Alphen
9e9d72d2ae Darkness fixes 2019-04-24 00:47:55 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
variableundefined
03a5ee47b8 Merge pull request #11292 from farie82/puke-refactor 
Refactors puke to make it less lag inducing
 2019-04-23 19:45:01 +08:00
Mark van Alphen
7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
joep van der velden
55282f15d6 less puke related lag 2019-04-12 22:58:11 +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
19b923c999 Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking. 2019-04-03 17:24:55 +02:00
CornMyCob
9f5b3fc796 updates 2019-04-02 20:26:23 +01:00
Mark van Alphen
3f6f4555d7 Minor Lavaland item fixes 2019-04-01 23:51:41 +02:00
Mark van Alphen
f75de97c6e Port over Corn and affected's work on Lavaland 
Co-authored-by: AffectedArc07 <josephcase55@hotmail.com>
Co-authored-by: CornMyCob <xxxxbarryscottxxxx@gmail.com>
 2019-04-01 23:41:32 +02:00
Mark van Alphen
ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00