Chinsky
94406a6430
Merge pull request #9694 from PsiOmegaDelta/150605-Meteors
...
Ports /tg/'s meteors.
2015-06-08 14:17:57 +03:00
PsiOmega
fc6de24042
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/materials/material_sheets.dm
code/modules/organs/organ_icon.dm
code/setup.dm
2015-06-07 10:51:41 +02:00
Neerti
2a45114038
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 6/5/2015_bay_merge
...
Conflicts:
.travis.yml
code/controllers/configuration.dm
code/datums/supplypacks.dm
code/game/machinery/bluespacerelay.dm
code/game/machinery/hologram.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
code/game/turfs/simulated/floor.dm
code/game/turfs/simulated/floor_types.dm
code/game/turfs/simulated/walls.dm
code/global.dm
code/modules/clothing/spacesuits/rig/suits/ert.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/research/designs.dm
config/example/config.txt
icons/mob/feet.dmi
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/shoes.dmi
icons/obj/clothing/suits.dmi
icons/obj/rig_modules.dmi
interface/interface.dm
maps/exodus-3.dmm
polaris.dme
2015-06-05 22:11:15 -04:00
PsiOmegaDelta
079b0af6b0
Adds spinning animation for meteors.
2015-06-05 15:55:39 +02:00
Chinsky
e3f64178c8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade
2015-06-05 13:24:03 +03:00
Chinsky
026500ea06
Merge remote-tracking branch 'remotes/upstream/dev' into definecrusade
2015-06-05 11:26:25 +03:00
Chinsky
e5a8eb2dfc
Actually renames 'going' var.
...
Axes speed of light and procs that used it (but were not used by anything). More maths too, and max stack amounts, not used anywhere.
Ticks back stuff that was unticked for faster compile, whoops.
2015-06-05 11:07:24 +03:00
Chinsky
bf53304fec
Splits setup.dm into berjillion of smaller files vaguely named thematically.
...
Also moved __HELPERS and _defines around so defines actually come first.
2015-06-04 21:51:58 +03:00
