Desolate f7627d2fcb Resolves conflicts.

2018-10-11 05:36:22 -05:00

..

decals

conflicts? apparently?

2018-10-10 18:53:22 +01:00

effect_system

dayum dats defined

2018-10-08 22:48:00 +01:00

spawners

adds the plasma window spawners

2018-10-07 00:15:18 +01:00

temporary_visuals

dayum dats defined

2018-10-08 22:48:00 +01:00

alien_acid.dm

separates alien structures and effects into own files

2018-04-04 23:18:12 +04:00

anomalies.dm

global lists global defined

2018-10-02 15:52:46 -05:00

bump_teleporter.dm

…

effects.dm

Merge remote-tracking branch 'upstream/master' into camera-damage-refactor

2018-07-15 16:31:50 -04:00

forcefields.dm

Fixes math error with mime forcewall

2018-08-31 07:28:42 +08:00

gibs.dm

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

glowshroom.dm

Ports over Timer Subsystem

2018-04-28 20:26:04 -04:00

landmarks.dm

refactors global lists.

2018-10-06 08:02:45 -05:00

manifest.dm

global lists global defined

2018-10-02 15:52:46 -05:00

mines.dm

Fixes a bunch of shown messages

2018-09-29 19:10:10 +01:00

misc.dm

dayum dats defined

2018-10-08 22:48:00 +01:00

overlays.dm

dayum dats defined

2018-10-08 22:48:00 +01:00

portals.dm

global lists global defined

2018-10-02 15:52:46 -05:00

spiders.dm

Fixes #7089 plus other bugs with spider obj attacks

2018-08-28 17:25:12 -07:00

step_triggers.dm

…