Repede b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm

2018-06-02 18:33:44 -04:00

..

alien

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

chem

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

decals

Fix the New() on this interfering with my work!

2018-06-02 11:27:46 -04:00

spawners

See https://github.com/Baystation12/Baystation12/pull/14404.

2017-07-16 16:03:31 -07:00

temporary_visuials

Adds the Kinetic Accelerator

2018-04-24 12:59:23 -04:00

bump_teleporter.dm

Adds Destroys.

2015-04-24 17:11:14 +02:00

effect_system.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

explosion_particles.dm

Works on New Blob

2017-11-29 22:35:01 -05:00

gibs.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

glowshroom.dm

Renamed some files, did some path replacements

2015-02-04 10:48:18 +10:30

item_pickup_ghost.dm

Ports Baystation12 newest item pickup animations. Fancy! (#5302)

2018-05-27 11:54:36 -05:00

landmarks.dm

Update every initialize() proc to return an initialize hint.

2018-02-05 15:50:13 -05:00

manifest.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

mines.dm

POLARIS: Revamp logging to be consistent

2018-03-13 18:20:58 -04:00

misc.dm

Arranges lots of things into planes (#5072)

2018-03-28 12:59:12 -07:00

overlays.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-04-20 09:03:58 -04:00

portals.dm

for(var/bad_code in world)

2018-04-29 17:55:04 -04:00

spiders.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14

2018-04-15 14:19:36 -04:00

step_triggers.dm

Merge pull request #4724 from Anewbe/ghettoChutes

2018-02-06 14:14:30 -05:00

zone_divider.dm

Continues work on the surface map

2017-03-21 16:11:13 -04:00