Polaris

mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 21:22:40 +00:00

Files

Neerti 00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme

2015-08-23 01:30:46 -04:00

chem

Fixes #10150

2015-07-13 11:44:47 +03:00

decals

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

spawners

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

aliens.dm

Merge branch 'dev' into ofClicksAndCooldowns