cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 09:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
9097dfcacf5360ac5a86abb183acfb430c6c9499
Paradise/code/game/objects/effects
History
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage 
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
..
decals
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-28 00:16:11 -04:00
effect_system
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
spawners
Depot Fixes & Tweaks (#11677)
2019-09-16 22:55:54 -04:00
temporary_visuals
space dragonnnn
2019-09-11 13:52:33 -04:00
alien_acid.dm
next-we-melt-the-memories-that-are
2019-09-09 16:20:04 -04:00
anomalies.dm
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
bump_teleporter.dm
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
effect_system.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slimegenocide
2019-08-13 02:32:53 +02:00
effects.dm
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
forcefields.dm
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
gibs.dm
…
glowshroom.dm
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-28 00:16:11 -04:00
landmarks.dm
Merge remote-tracking branch 'upstream/master' into universal-damage
2019-09-21 12:40:07 -04:00
manifest.dm
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
mapping_helpers.dm
Include subtle white light in the direction of unrestricted access
2019-06-30 17:50:15 -04:00
mines.dm
Merge pull request #11936 from farie82/antidrop-remove-on-drop
2019-08-24 10:53:23 -04:00
misc.dm
though-our-bodies-be-ravaged
2019-09-15 19:49:52 -04:00
overlays.dm
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
portals.dm
though-this-world-may-be-broken
2019-09-15 05:53:43 -04:00
snowcloud.dm
Kills off Object and Fast Object Processes
2019-04-23 23:53:40 -04:00
spiders.dm
nor-shall-our-souls-falter
2019-09-17 16:06:09 -04:00
step_triggers.dm
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix
2019-08-09 23:38:49 +02:00