Cadyn 07775449d7 Fixing conflicts

2020-10-05 18:10:53 -07:00

..

alien

Adding CHOMPedit to edited lines and files, with brief descriptions.

2020-08-29 02:28:30 -04:00

chem

…

decals

September 2020 Upstream Merge

2020-09-25 23:07:08 -07:00

map_effects

Update portal.dm

2020-08-28 12:50:18 -04:00

prop

Merge pull request #7585 from Mechoid/OfSnakesAndColumns

2020-09-04 22:13:39 -04:00

spawners

…

temporary_visuals

…

temporary_visuials

…

blockers_yw.dm

VR world update

2020-08-12 21:50:42 -04:00

bump_teleporter.dm

…

effect_system_ch.dm

…

effect_system.dm

Merge pull request #7602 from Cyantime/patch-2

2020-09-01 01:05:03 -04:00

explosion_particles.dm

…

gibs.dm

…

glowshroom.dm

…

item_pickup_ghost.dm

…

landmarks_vr.dm

…

landmarks.dm

…

manifest.dm

…

mines.dm

Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases

2020-08-27 22:28:46 -04:00

misc.dm

…

overlays.dm

…

portals.dm

…

spiders_vr.dm

…

spiders.dm

…

step_triggers.dm

…

zone_divider.dm

…