cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-06 15:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,446 Commits 26 Branches 2 Tags
1bfb442d40cec3aa2677075df862e0d4d136feb7
Commit Graph

826 Commits

Author SHA1 Message Date
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
59082ff21a space dragonnnn 2019-09-11 13:52:33 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -04:00
Fox McCloud
d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Coul
c6c1b1ce36 fix runtime 2019-09-04 22:20:28 -04:00
Coul
2986205dfa another blood fix 2019-09-04 21:32:28 -04:00
variableundefined
5d813dce6c Merge pull request #12157 from Fox-McCloud/simple-mob-update 
TG Simple Mob Update
 2019-09-03 21:50:24 -04:00
Couls
d258c91c7f use qdels instead of initialize hint 2019-08-31 20:34:50 -04:00
Fox McCloud
2b615b7b10 blood drunk update 2019-08-31 18:23:59 -04:00
Fox McCloud
4502b1fead Fixes Blood, Grafitti, and Fungus not Showing Up 2019-08-28 18:05:51 -04:00
Mark van Alphen
ffd73c75ec Merge branch 'master' into slimegenocide 2019-08-27 17:40:20 +02:00
Fox McCloud
727be7d03f WHYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY?! 2019-08-26 18:23:09 -04:00
Couls
dfe9752da7 Merge remote-tracking branch 'upstream/master' into blood-changes 2019-08-25 22:37:25 -04:00
Couls
a42f638b73 spessing 2019-08-25 22:22:05 -04:00
variableundefined
a968dc6a09 Merge pull request #11936 from farie82/antidrop-remove-on-drop 
Dropped anti drop items now lose the antidrop status if not initialized with it
 2019-08-24 10:53:23 -04:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
variableundefined
adc33ef3a0 Merge pull request #11783 from Couls/on-hit-effects 
[READY] Add on-hit effects for lasers and bullet holes for walls from TG
 2019-08-16 07:50:49 +08:00
Couls
7c5bdcc83c Merge remote-tracking branch 'upstream/master' into unrestricted-airlocks 2019-08-13 21:46:32 -04:00
Mark van Alphen
d1ad6aad45 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slimegenocide 
# Conflicts:
#	code/__DEFINES/misc.dm
 2019-08-13 02:32:53 +02:00
Mark van Alphen
521e81e8d2 Improve water handling for slimes, Grey mask/head water protection tweak 2019-08-13 02:26:59 +02:00
variableundefined
2b53fb0ab3 Merge pull request #11392 from Citinited/airlock-spawners 
Airlock spawners 2: Electric Boogaloo
 2019-08-12 13:30:26 +08:00
Mark van Alphen
14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix 
# Conflicts:
#	code/game/objects/effects/step_triggers.dm
 2019-08-09 23:38:49 +02:00
joep van der velden
402d1ef131 No drop items now lose their nodrop if dropped 2019-07-29 00:03:18 +02:00
Mark van Alphen
fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Mark van Alphen
d03f4dcafb Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ruinsport 
# Conflicts:
#	paradise.dme
 2019-07-08 19:36:30 +02:00
Couls
18a452b536 use initialize() and fixes 2019-07-07 05:01:42 -04:00
Couls
dfc5c4fca3 only call update_icon when entering/exiting from a new direction 2019-07-07 03:30:48 -04:00
Couls
fa260b62ff Missed some code 2019-07-07 03:27:50 -04:00
Couls
2470380c40 Blood is now less annoying 2019-07-07 03:21:57 -04:00
Couls
3782dbfc16 Add on-hit effects and bullet holes for walls 2019-07-03 22:17:35 -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
Crazy Lemon
54257fec69 Merge pull request #11688 from Markolie/swarmerfix 
Fix gutlunches not eating and tesla wormhole fix
 2019-06-06 20:13:18 -07:00
Mark van Alphen
dd7da2140b Die of Fate fixes 2019-06-07 02:33:08 +02:00
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
Mark van Alphen
250ca032c4 Tesla wormhole fix 2019-06-06 17:14:34 +02:00
Crazy Lemon
60fa8a0658 Merge pull request #11664 from Markolie/swarmerfix 
Lavaland fixes, Mark V
 2019-06-05 21:06:16 -07:00
Terilia
b281d26ac1 Added Donksoft Sniper to the spawn pool 2019-06-04 13:33:12 +01: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
4c40df0895 Goliath code update 2019-06-02 05:03:38 +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
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
Mark van Alphen
5b14cf120d Make lighting plane master respect client color 2019-05-10 20:34:11 +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
Citinited
d3585beb8b Code cleanup, runtime fixing 2019-05-07 21:59:43 +01:00