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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm

Fixed conflicts, fixed race racism money bs

2018-04-27 21:45:13 -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

Arranges lots of things into planes (#5072)

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

spawners

…

temporary_visuials

Adds the Kinetic Accelerator

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

bump_teleporter.dm

…

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

…

glowshroom.dm

…

landmarks.dm

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

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

manifest.dm

…

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

…

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

…